proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-18 22:00:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5433656705
mirror_iproute2/ip
History
Serhey Popovych 5433656705 ip: Use single variable to represent -pretty 
After commit a233caa0aa ("json: make pretty printing optional") I get
following build failure:

    LINK     rtmon
    ../lib/libutil.a(json_print.o): In function `new_json_obj':
    json_print.c:(.text+0x35): undefined reference to `show_pretty'
    collect2: error: ld returned 1 exit status
    make[1]: *** [rtmon] Error 1
    make: *** [all] Error 2

It is caused by missing show_pretty variable in rtmon.

On the other hand tc/tc.c there are two distinct variables and single
matches() call that handles -pretty option thus setting show_pretty
will never happen. Note that since commit 44dcfe8201 ("Change
formatting of u32 back to default") show_pretty is used in tc/f_u32.c
so this is first place where -pretty introduced.

Furthermore other utilities like misc/ifstat.c and misc/nstat.c define
pretty variable, however only for their own purposes. They both support
JSON output and thus depend show_pretty in new_json_obj().

Assuming above use common variable to represent -pretty option, define
it in utils.c and declare in utils.h that is commonly used. Replace
show_pretty with pretty.

Fixes: a233caa0aa ("json: make pretty printing optional")
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
2018-02-16 08:13:36 -08:00
..
.gitignore Another .gitignore file. 2006-08-08 12:11:23 -07:00
ifcfg ifcfg/rtpr: convert to POSIX shell 2018-01-10 08:26:09 -08:00
ila_common.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
ip6tunnel.c iptunnel/ip6tunnel: Use netlink to walk through tunnels list 2018-02-07 16:15:42 -08:00
ip_common.h ip: Consolidate ip, xdp and lwtunnel parse/dump prototypes in ip_common.h 2018-02-02 14:55:12 -08:00
ip.c ip: Use single variable to represent -pretty 2018-02-16 08:13:36 -08:00
ipaddress.c ip: Introduce get_rtnl_link_stats_rta() to get link statistics 2018-02-07 16:15:28 -08:00
ipaddrlabel.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
ipfou.c ip fou: pass family attribute as u8 2018-01-09 07:58:37 -08:00
ipila.c ila: fix formatting of help message 2017-11-24 09:21:43 -08:00
ipl2tp.c ipl2tp: Use get_addr_rta() 2018-01-25 09:31:25 -08:00
iplink_bond_slave.c ip: iplink_bond_slave.c: add json output support (info_slave_data) 2017-08-17 18:02:40 -07:00
iplink_bond.c iplink: Use ll_name_to_index() instead of if_nametoindex() 2018-01-23 14:50:59 -08:00
iplink_bridge_slave.c ip: Use print_0xhex() where appropriate 2018-02-09 08:05:30 -08:00
iplink_bridge.c iplink: Use ll_name_to_index() instead of if_nametoindex() 2018-01-23 14:50:59 -08:00
iplink_can.c Merge branch 'master' into net-next 2017-08-21 17:37:15 -07:00
iplink_dummy.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_geneve.c utils: Introduce and use inet_prefix_reset() 2018-02-14 09:00:26 -08:00
iplink_hsr.c ip: iplink_hsr.c: add json output support 2017-08-17 18:02:40 -07:00
iplink_ifb.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_ipoib.c ip: iplink_ipoib.c: add json output support 2017-08-17 18:02:41 -07:00
iplink_ipvlan.c ip/ipvlan: enhance ability to add mode flags to existing modes 2017-11-01 22:17:01 +01:00
iplink_macvlan.c ip: link_macvlan.c: add json output support 2017-08-17 18:02:41 -07:00
iplink_netdevsim.c ip: link: add support for netdevsim device type 2018-01-02 20:46:19 -08:00
iplink_nlmon.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_team.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_vcan.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_vlan.c treewide: Use addattr_nest()/addattr_nest_end() to handle nested attributes 2018-02-02 15:01:09 -08:00
iplink_vrf.c lib/libnetlink: update rtnl_talk to support malloc buff at run time 2017-10-26 12:29:29 +02:00
iplink_vxcan.c treewide: Use addattr_nest()/addattr_nest_end() to handle nested attributes 2018-02-02 15:01:09 -08:00
iplink_vxlan.c utils: Introduce and use inet_prefix_reset() 2018-02-14 09:00:26 -08:00
iplink_xdp.c ip: Consolidate ip, xdp and lwtunnel parse/dump prototypes in ip_common.h 2018-02-02 14:55:12 -08:00
iplink_xstats.c add missing iplink_xstats.c 2017-02-20 08:53:40 -08:00
iplink.c treewide: Use addattr_nest()/addattr_nest_end() to handle nested attributes 2018-02-02 15:01:09 -08:00
ipmacsec.c ip: Minor cleanups 2018-02-02 14:58:26 -08:00
ipmaddr.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
ipmonitor.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
ipmroute.c ipmroute: Use inet_addr_match_rta() 2018-01-25 09:31:22 -08:00
ipneigh.c ipneigh: Use inet_addr_match_rta() 2018-01-25 09:31:24 -08:00
ipnetconf.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
ipnetns.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
ipntable.c lib/libnetlink: update rtnl_talk to support malloc buff at run time 2017-10-26 12:29:29 +02:00
ipprefix.c netlink route attribute cleanup 2017-02-24 08:56:38 -08:00
iproute_lwtunnel.c iproute: implement JSON and color output 2018-02-10 08:20:39 -08:00
iproute.c iproute: implement JSON and color output 2018-02-10 08:20:39 -08:00
iprule.c iprule: Use inet_addr_match_rta() 2018-01-25 09:31:21 -08:00
ipseg6.c ip: Get rid of inet_get_addr() 2018-01-21 09:38:26 -08:00
iptoken.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
iptunnel.c iptunnel/ip6tunnel: Use netlink to walk through tunnels list 2018-02-07 16:15:42 -08:00
iptuntap.c tuntap: Use netlink to walk through tuntap list 2018-02-07 16:15:47 -08:00
ipvrf.c Convert harmful calls to strncpy() to strlcpy() 2017-09-01 12:10:54 -07:00
ipxfrm.c ipxfrm: Replace STRBUF_CAT macro with strlcat() 2017-09-01 12:10:54 -07:00
link_gre6.c gre/gre6: Unify local/remote endpoint address parsing 2018-02-14 09:01:03 -08:00
link_gre.c gre/gre6: Unify local/remote endpoint address parsing 2018-02-14 09:01:03 -08:00
link_ip6tnl.c iptnl/ip6tnl: Unify local/remote endpoint and 6rd address parsing 2018-02-14 09:01:07 -08:00
link_iptnl.c iptnl/ip6tnl: Unify local/remote endpoint and 6rd address parsing 2018-02-14 09:01:07 -08:00
link_veth.c treewide: Use addattr_nest()/addattr_nest_end() to handle nested attributes 2018-02-02 15:01:09 -08:00
link_vti6.c vti/vti6: Unify local/remote endpoint address parsing 2018-02-14 09:00:46 -08:00
link_vti.c vti/vti6: Unify local/remote endpoint address parsing 2018-02-14 09:00:46 -08:00
Makefile ip: link: add support for netdevsim device type 2018-01-02 20:46:19 -08:00
routef mark shell scripts +x 2018-01-10 08:23:49 -08:00
routel mark shell scripts +x 2018-01-10 08:23:49 -08:00
rtm_map.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
rtmon.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
rtpr ifcfg/rtpr: convert to POSIX shell 2018-01-10 08:26:09 -08:00
static-syms.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
tcp_metrics.c tcp_metric: Use get_addr_rta() 2018-01-25 09:31:27 -08:00
tunnel.c iptunnel/ip6tunnel: Use netlink to walk through tunnels list 2018-02-07 16:15:42 -08:00
tunnel.h iptunnel/ip6tunnel: Use netlink to walk through tunnels list 2018-02-07 16:15:42 -08:00
xfrm_monitor.c netlink route attribute cleanup 2017-02-24 08:56:38 -08:00
xfrm_policy.c Merge branch 'master' into net-next 2017-11-09 09:45:17 +09:00
xfrm_state.c Merge branch 'master' into net-next 2017-11-09 09:45:17 +09:00
xfrm.h ip: Fix compilation break on old systems 2017-11-13 10:07:25 -08:00