]> git.proxmox.com Git - mirror_iproute2.git/log
mirror_iproute2.git
5 years agotestsuite: declare dependency between $(TESTS) and generate_nlmsg
Luca Boccassi [Sun, 16 Dec 2018 20:55:38 +0000 (20:55 +0000)]
testsuite: declare dependency between $(TESTS) and generate_nlmsg

Parallel make from the top level directory fails since tests are at the
same time as generate_nlmsg:

$ make check -j4

...

cd testsuite && make && make alltests
echo "Entering iproute2" && cd iproute2 && make configure && cd ..;
Entering iproute2
make -C tools
Removing results dir ...
make[1]: ./tools/generate_nlmsg: Command not found
make[1]: ./tools/generate_nlmsg: Command not found
Makefile:64: recipe for target 'ip/netns/set_nsid_batch.t' failed
make[1]: *** [ip/netns/set_nsid_batch.t] Error 127
make[1]: ./tools/generate_nlmsg: Command not found
make[1]: *** Waiting for unfinished jobs....
Makefile:64: recipe for target 'ip/netns/set_nsid.t' failed
make[1]: *** [ip/netns/set_nsid.t] Error 127
Makefile:64: recipe for target 'ip/link/show_dev_wo_vf_rate.t' failed
make[1]: *** [ip/link/show_dev_wo_vf_rate.t] Error 127
    CC       generate_nlmsg
Makefile:123: recipe for target 'check' failed
make: *** [check] Error 2

Add an explicit dependency in testuite/Makefile's $(TESTS) rule so
that the tool correctly gets compiled before any test runs.

Fixes: 3537633dcf44 ("testsuite: Generate generate_nlmsg when needed")
Signed-off-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
5 years agoMakefile: have check target depend on all
Luca Boccassi [Sun, 16 Dec 2018 20:55:37 +0000 (20:55 +0000)]
Makefile: have check target depend on all

Otherwise it will simply fail immediately from a just-cleaned
workspace:

$ make check -j1
cd testsuite && make && make alltests
echo "Entering iproute2" && cd iproute2 && make configure && cd ..;
Entering iproute2
make -C tools
Makefile:3: ../../config.mk: No such file or directory
make[2]: *** No rule to make target '../../config.mk'.  Stop.

Fixes: 8804a8c0d387 ("Makefile: Add check target")
Signed-off-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
5 years agoman: ss: fix typos about wscale
Masatake YAMATO [Mon, 17 Dec 2018 00:28:09 +0000 (09:28 +0900)]
man: ss: fix typos about wscale

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
5 years agotc: fix xtables incorrect usage of LDFLAGS
Syrone Wong [Wed, 12 Dec 2018 11:35:08 +0000 (19:35 +0800)]
tc: fix xtables incorrect usage of LDFLAGS

The incorrect setting of LDFLAGS causes error below:

> em_ipt.o: In function `em_ipt_print_epot':
> em_ipt.c:(.text.em_ipt_print_epot+0x2e): undefined reference to
> `xtables_init_all'

em_ipt.c gets involved when TC_CONFIG_XT=y, which requires xtables,
while tc/Makefile doesn't pass flags correctly. It adds '-lxtables'
to LDFLAGS instead of LDLIBS.

Fixes: dd296215 ("tc: add em_ipt ematch for calling xtables matches from tc matching context")
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
Acked-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoremove redundant long int
Stephen Hemminger [Mon, 10 Dec 2018 17:21:17 +0000 (09:21 -0800)]
remove redundant long int

Using unsigned long is sufficient no need to be more
verbose and use unsigned long int.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agordma: Fix broken 32-bit compilation
Leon Romanovsky [Tue, 11 Dec 2018 18:14:28 +0000 (20:14 +0200)]
rdma: Fix broken 32-bit compilation

Allow compilation of rdmatool on 32-bits platforms.

rdma
    CC       rdma.o
    CC       utils.o
    CC       dev.o
    CC       link.o
In file included from rdma.h:26:0,
                 from dev.c:12:
dev.c: In function 'dev_caps_tostr':
../include/utils.h:269:38: warning: left shift count >= width of type [-Wshift-count-overflow]
 #define BIT(nr)                 (1UL << (nr))
                                      ^
rdma.h:32:61: note: in expansion of macro 'BIT'
 #define RDMA_BITMAP_ENUM(name, bit_no) RDMA_BITMAP_##name = BIT(bit_no),
                                                             ^~~

Fixes: 40df8263a0f0 ("rdma: Add dev object")
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agofix print_0xhex on 32 bit
Stephen Hemminger [Mon, 10 Dec 2018 22:20:32 +0000 (14:20 -0800)]
fix print_0xhex on 32 bit

The argument to print_0xhex is converted to unsigned long long
so the format string give for normal printout has to be some
variant of %llx. Otherwise, bogus values will be printed on
32 bit platforms.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolib/bpf: fix build warning if no elf
Stephen Hemminger [Mon, 10 Dec 2018 21:50:17 +0000 (13:50 -0800)]
lib/bpf: fix build warning if no elf

Function was not used unlesss HAVE_ELF causing:

bpf.c:105:13: warning: ‘bpf_map_offload_neutral’ defined but not used [-Wunused-function]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoipmacsec: fix warning on 32bit platform
Stephen Hemminger [Mon, 10 Dec 2018 21:47:58 +0000 (13:47 -0800)]
ipmacsec: fix warning on 32bit platform

On some 32 bit platforms, the printf was causing warning:
ipmacsec.c: In function ‘getattr_u64’:
ipmacsec.c:655:47: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘unsigned int’ [-Wformat=]
   fprintf(stderr, "invalid attribute length %lu\n",

Resolve by computing length as size_t first.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agouapi: update bpf header
Stephen Hemminger [Mon, 10 Dec 2018 17:22:23 +0000 (09:22 -0800)]
uapi: update bpf header

Changes from 4.20-rc6

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agordma: align uapi headers with 4.20-rc5
Stephen Hemminger [Fri, 7 Dec 2018 17:25:59 +0000 (09:25 -0800)]
rdma: align uapi headers with 4.20-rc5

Upstream headers were updated.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotipc: fix misalignment printout in non-JSON output
Hoang Le [Thu, 6 Dec 2018 01:40:06 +0000 (08:40 +0700)]
tipc: fix misalignment printout in non-JSON output

In the commit 1304f50a5be0ed ("tipc: JSON support for showing nametable"),
introduced misalignment in the columns of the printout in non-JSON mode
compare to the list header. Add one space per column to make alignment
with the list header.

before:
$tipc name show
Type       Lower      Upper      Scope    Port       Node
1         1         1         node    4071367628

after:
$tipc name show
Type       Lower      Upper      Scope    Port       Node
1          1          1          node     4071367628

Reported-by: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip: iplink_can.c: fix json formatting
Martin Jeřábek [Wed, 5 Dec 2018 15:39:20 +0000 (16:39 +0100)]
ip: iplink_can.c: fix json formatting

Previously the CAN state was always printed in human-readable txt format,
resulting in invalid JSON.

Signed-off-by: Martin Jeřábek <martin.jerabek01@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: Add a test for batch processing
Petr Machata [Tue, 4 Dec 2018 16:07:42 +0000 (16:07 +0000)]
testsuite: Add a test for batch processing

Test that when a second or following command in a batch fails, tc
reports it correctly. This is a test for the previous patch.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolibnetlink: Process further iovs on no error
Petr Machata [Tue, 4 Dec 2018 16:07:41 +0000 (16:07 +0000)]
libnetlink: Process further iovs on no error

When no error is reported in the first iov, do not prematurely return,
but process further iovs. This fixes batch processing.

Fixes: c60389e4f9ea ("libnetlink: fix leak and using unused memory on error")
Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoiproute2: Installation errors without libmnl
Emeric Dupont [Mon, 3 Dec 2018 11:13:06 +0000 (12:13 +0100)]
iproute2: Installation errors without libmnl

When performing make install in iproute2 (current git master),
     if $(HAVE_MNL) is not selected, some Makefiles try to call
     install with an empty target, which causes a non-critical make error.

Signed-off-by: Emeric Dupont <emeric.dupont@zii.aero>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agodevlink: don't need to call pkg-config twice
Stephen Hemminger [Tue, 4 Dec 2018 22:19:33 +0000 (14:19 -0800)]
devlink: don't need to call pkg-config twice

pkg-config for libmnl is already done in config.mk

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agol2tp: Fix printing of cookie and peer_cookie values
Andrea Claudi [Fri, 30 Nov 2018 14:34:24 +0000 (15:34 +0100)]
l2tp: Fix printing of cookie and peer_cookie values

print_cookie() invocations miss %s format specifier.
While at it, align printout to the previous lines.

Fixes: 98453b65800f7 ("ip/l2tp: add JSON support")
Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc: add a missing space between rate estimator and backlog
Eric Dumazet [Fri, 30 Nov 2018 13:57:02 +0000 (05:57 -0800)]
tc: add a missing space between rate estimator and backlog

When a rate estimator is active, "tc -s qd" displays
something like :

rate 12616bit 11ppsbacklog 0b 0p requeues 2

instead of :

rate 12616bit 11pps backlog 0b 0p requeues 2

Fixes: 4fcec7f3665b ("tc: jsonify stats2")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agossfilter: Fix for inverted last expression
Phil Sutter [Thu, 29 Nov 2018 12:20:37 +0000 (13:20 +0100)]
ssfilter: Fix for inverted last expression

When fixing for shift/reduce conflicts, possibility to invert the last
expression by prefixing with '!' or 'not' was accidentally removed.

Fix this by allowing for expr to be an inverted expr so that any
reference to it in exprlist accepts the inverted prefix.

Reported-by: Eric Dumazet <edumazet@google.com>
Fixes: b2038cc0b2403 ("ssfilter: Eliminate shift/reduce conflicts")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoss: add support for bytes_sent, bytes_retrans, dsack_dups and reord_seen
Eric Dumazet [Thu, 29 Nov 2018 10:27:54 +0000 (02:27 -0800)]
ss: add support for bytes_sent, bytes_retrans, dsack_dups and reord_seen

Wei Wang added these fields in linux-4.19

Tested:

ss -ti ...

ts sack cubic wscale:8,8 rto:7 rtt:2.678/0.267 mss:1428 pmtu:1500
    rcvmss:536 advmss:1428 cwnd:91 ssthresh:65
(*) bytes_sent:17470606104 bytes_retrans:2856
    bytes_acked:17470483297
    segs_out:12234320 segs_in:622983
    data_segs_out:12234318 send 388.2Mbps lastrcv:986784 lastack:1
    pacing_rate 465.8Mbps delivery_rate 162.7Mbps
    delivered:12234235 delivered_ce:3669056
    busy:986784ms unacked:84 retrans:0/2
(*) dsack_dups:2
    rcv_space:14280 rcv_ssthresh:65535 notsent:2016336 minrtt:0.183

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Wei Wang <weiwan@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Wei Wang <weiwan@google.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoman: ip-route.8: Fix ENCAP references in synopsis
Phil Sutter [Wed, 28 Nov 2018 11:12:32 +0000 (12:12 +0100)]
man: ip-route.8: Fix ENCAP references in synopsis

The different encapsulation types are described in ENCAP_*
non-terminals, but ENCAP definition lists them without the ENCAP_
prefix. Fix this for consistency.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agobridge: make -c match -compressvlans first instead of -color
Roopa Prabhu [Wed, 28 Nov 2018 02:02:52 +0000 (18:02 -0800)]
bridge: make -c match -compressvlans first instead of -color

commit c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
broke previous use of -c to represent compressvlans. This restores
previous use of -c to represent compressvlans. Understand the original
motivation to use -c to represent color consistently everywhere but
there are apps and network interface managers out there that are already
using -c to prepresent compressed vlans.

Fixes: c7c1a1ef51ae ("bridge: colorize output and use JSON print library")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoss: add support for delivered and delivered_ce fields
Eric Dumazet [Mon, 26 Nov 2018 22:29:53 +0000 (14:29 -0800)]
ss: add support for delivered and delivered_ce fields

Kernel support was added in linux-4.18 in commit feb5f2ec6464
("tcp: export packets delivery info")

Tested:

ss -ti
...
ESTAB   0 2270520      [2607:f8b0:8099:e16::]:47646   [2607:f8b0:8099:e18::]:38953
 ts sack cubic wscale:8,8 rto:7 rtt:2.824/0.278 mss:1428
     pmtu:1500 rcvmss:536 advmss:1428 cwnd:89 ssthresh:62 bytes_acked:2097871945
    segs_out:1469144 segs_in:65221 data_segs_out:1469142 send 360.0Mbps lastsnd:2
    lastrcv:99231 lastack:2 pacing_rate 431.9Mbps delivery_rate 246.4Mbps
(*) delivered:1469099 delivered_ce:424799
    busy:99231ms unacked:44 rcv_space:14280 rcv_ssthresh:65535
    notsent:2207688 minrtt:0.228

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoman: rdma: Add reference to rdma-resource.8
Phil Sutter [Mon, 26 Nov 2018 17:58:31 +0000 (18:58 +0100)]
man: rdma: Add reference to rdma-resource.8

All rdma-related man pages list each other in SEE ALSO section, only
rdma-resource.8 is missing. Add it for the sake of consistency.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agobpf: initialise map symbol before retrieving and comparing its type
Quentin Monnet [Tue, 20 Nov 2018 01:26:27 +0000 (01:26 +0000)]
bpf: initialise map symbol before retrieving and comparing its type

In order to compare BPF map symbol type correctly in regard to the
latest LLVM, commit 7a04dd84a7f9 ("bpf: check map symbol type properly
with newer llvm compiler") compares map symbol type to both NOTYPE and
OBJECT. To do so, it first retrieves the type from "sym.st_info" and
stores it into a temporary variable.

However, the type is collected from the symbol "sym" before this latter
symbol is actually updated. gelf_getsym() is called after that and
updates "sym", and when comparison with OBJECT or NOTYPE happens it is
done on the type of the symbol collected in the previous passage of the
loop (or on an uninitialised symbol on the first passage). This may
eventually break map collection from the ELF file.

Fix this by assigning the type to the temporary variable only after the
call to gelf_getsym().

Fixes: 7a04dd84a7f9 ("bpf: check map symbol type properly with newer llvm compiler")
Reported-by: Ron Philip <ron.philip@netronome.com>
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jiong Wang <jiong.wang@netronome.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoipnetns: parse nsid as a signed integer
Nicolas Dichtel [Wed, 21 Nov 2018 09:44:27 +0000 (10:44 +0100)]
ipnetns: parse nsid as a signed integer

Don't confuse the user, nsid is a signed integer, this kind of command
should return an error: 'ip netns set foo 0xffffffff'.

Also, a valid value is a positive value. To let the kernel chooses a value,
the keyword 'auto' must be used.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agordma: make local functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:40 +0000 (14:36 -0800)]
rdma: make local functions static

Several functions only used inside utils.c

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/pedit: use structure initialization
Stephen Hemminger [Thu, 15 Nov 2018 22:36:39 +0000 (14:36 -0800)]
tc/pedit: use structure initialization

The pedit callback structure table should be iniatialized using
structure initialization to avoid structure changes problems.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/action: make variables static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:38 +0000 (14:36 -0800)]
tc/action: make variables static

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/meta: make meta_table static and const
Stephen Hemminger [Thu, 15 Nov 2018 22:36:37 +0000 (14:36 -0800)]
tc/meta: make meta_table static and const

The mapping table is only used by em_meta.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/util: make local functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:36 +0000 (14:36 -0800)]
tc/util: make local functions static

The tc util library parse/print has functions only used locally
(and some dead code removed).

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/ematch: make local functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:35 +0000 (14:36 -0800)]
tc/ematch: make local functions static

The print handling is only used in tc/m_ematch.c

Remove unused function to print_ematch_tree.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/pedit: make functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:34 +0000 (14:36 -0800)]
tc/pedit: make functions static

The parse and pack functions are only used by the pedit routines.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoss: make local variables static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:33 +0000 (14:36 -0800)]
ss: make local variables static

Several variables only used in this code.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/police: make print_police static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:32 +0000 (14:36 -0800)]
tc/police: make print_police static

print_police function only used by m_police.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc/class: make filter variables static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:31 +0000 (14:36 -0800)]
tc/class: make filter variables static

Only used in this file.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotipc: make cmd_find static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:30 +0000 (14:36 -0800)]
tipc: make cmd_find static

Function only used in one file.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc: drop unused name_to_id function
Stephen Hemminger [Thu, 15 Nov 2018 22:36:29 +0000 (14:36 -0800)]
tc: drop unused name_to_id function

Not used in current code.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoipxfrm: make local functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:28 +0000 (14:36 -0800)]
ipxfrm: make local functions static

Make functions only used in ipxfrm.c static.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoipmonitor: make local variable static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:27 +0000 (14:36 -0800)]
ipmonitor: make local variable static

prefix_banner only used in one file.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip: make flag names const/static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:26 +0000 (14:36 -0800)]
ip: make flag names const/static

The table of filter flags is only used in ipaddress

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agobridge: make local variables static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:25 +0000 (14:36 -0800)]
bridge: make local variables static

enable_color and set_color_palette only used here.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agogenl: remove dead code
Stephen Hemminger [Thu, 15 Nov 2018 22:36:24 +0000 (14:36 -0800)]
genl: remove dead code

The function genl_ctrl_resolve_family is defined but never used
in current code.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolibnetlnk: unused and local functions cleanup
Stephen Hemminger [Thu, 15 Nov 2018 22:36:23 +0000 (14:36 -0800)]
libnetlnk: unused and local functions cleanup

rntl_talk_extack and parse_rtattr_index not used in current code.
rtnl_dump_filter_l is only used in this file.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolib/ll_map: make local function static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:22 +0000 (14:36 -0800)]
lib/ll_map: make local function static

ll_idx_a2n is only used in ll_map.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolib/color: make local functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:21 +0000 (14:36 -0800)]
lib/color: make local functions static

color_enable etc, only used here.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolib/utils: make local functions static
Stephen Hemminger [Thu, 15 Nov 2018 22:36:20 +0000 (14:36 -0800)]
lib/utils: make local functions static

Some of the print/parsing is only used internally.
Drop unused get_s8/get_s16.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agolib/ll_addr: whitespace and indent cleanup
Stephen Hemminger [Thu, 15 Nov 2018 22:36:19 +0000 (14:36 -0800)]
lib/ll_addr: whitespace and indent cleanup

Run old ll_addr through kernel Lindent.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoMerge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/shemminger/iproute2
Stephen Hemminger [Mon, 19 Nov 2018 19:40:37 +0000 (11:40 -0800)]
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/shemminger/iproute2

5 years agoip-address: Fix filtering by negated address flags
Phil Sutter [Thu, 15 Nov 2018 13:28:59 +0000 (14:28 +0100)]
ip-address: Fix filtering by negated address flags

When disabling a flag, one needs to AND with the inverse not the flag
itself. Otherwise specifying for instance 'home -nodad' will effectively
clear the flags variable.

While being at it, simplify the code a bit by merging common parts of
negated and non-negated case branches. Also allow for the "special
cases" to be inverted, too.

Fixes: f73ac674d0abf ("ip: change flag names to an array")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: drop old kernel configs
Stephen Hemminger [Mon, 19 Nov 2018 19:37:08 +0000 (11:37 -0800)]
testsuite: drop old kernel configs

The testsuite directory had several ancient kernel configs.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip-route: Fix nexthop encap parsing
Phil Sutter [Tue, 13 Nov 2018 12:39:04 +0000 (13:39 +0100)]
ip-route: Fix nexthop encap parsing

When parsing nexthop parameters, a buffer of 4k bytes is provided. Yet,
in lwt_parse_encap() and some functions called by it, buffer size was
assumed to be 1k despite the actual size was provided. This led to
spurious buffer size errors if the buffer was filled by previous nexthop
parameters to exceed that 1k boundary.

Fixes: 1e5293056a02c ("lwtunnel: Add encapsulation support to ip route")
Fixes: 5866bddd9aa9e ("ila: Add support for ILA lwtunnels")
Fixes: ed67f83806538 ("ila: Support for checksum neutral translation")
Fixes: 86905c8f057c0 ("ila: support for configuring identifier and hook types")
Fixes: b15f440e78373 ("lwt: BPF support for LWT")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: colorize test result output
Stephen Hemminger [Mon, 12 Nov 2018 16:39:32 +0000 (08:39 -0800)]
testsuite: colorize test result output

When running testsuite it is easy as a human to miss failure.
Add symbol colorizing to SKIPED/PASS/FAIL output.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoman: ip-route.8: Document nexthop limit
Phil Sutter [Tue, 13 Nov 2018 15:55:13 +0000 (16:55 +0100)]
man: ip-route.8: Document nexthop limit

Add a note to 'nexthop' description stating the maximum number of
nexthops per command and pointing at 'append' command as a workaround.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: ss: Fix spacing in expected output for ssfilter.t
Stefano Brivio [Sat, 10 Nov 2018 09:21:59 +0000 (10:21 +0100)]
testsuite: ss: Fix spacing in expected output for ssfilter.t

Since commit 00240899ec0b ("ss: Actually print left delimiter for
columns") changes spacing in ss output, we also need to adjust for that in
the ss filter test.

Fixes: 00240899ec0b ("ss: Actually print left delimiter for columns")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: correctly use CC macros for generate_nlmsg
Luca Boccassi [Fri, 9 Nov 2018 16:31:36 +0000 (16:31 +0000)]
testsuite: correctly use CC macros for generate_nlmsg

It's $(QUIET_CC)$(CC) not $(QUIET_CC), copy-paste error. CI does
verbose build so it slipped through.

Fixes: 6e7d347aabbb ("testsuite: build generate_nlmsg with QUIET_CC")
Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agouapi: sctp header change
Stephen Hemminger [Fri, 9 Nov 2018 16:18:26 +0000 (08:18 -0800)]
uapi: sctp header change

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc: f_u32: allow skip_hw and skip_sw flags to be last
Jakub Kicinski [Tue, 6 Nov 2018 03:23:27 +0000 (19:23 -0800)]
tc: f_u32: allow skip_hw and skip_sw flags to be last

u32 uses NEXT_ARG() incorrectly when parsing skip_hw and skip_sw
flags.  NEXT_ARG() ensures there is another argument on the command
line, and is used in handling <keyword> <value> syntax to move past
<keyword> and ensure there is a <value> to read.

Commit 5e5b3008d1fb ("tc: f_u32: Add support for skip_hw and skip_sw
flags") seems to have copy pasted the handling from the previous
command - "police", which needs an extra parameter and is kind of
special due to the use of parse_police() helper.

The combination of NEXT_ARG() and continue worked fine as long as
skip_sw/skip_hw wasn't last, e.g.:

$ tc filter add dev dummy0 ingress prio 101 protocol ipv6 \
    u32 match ip6 priority 0xa0 0xe0 skip_hw action pass

But would fail if it was last:

$ tc filter add dev dummy0 ingress prio 101 protocol ipv6 \
    u32 match ip6 priority 0xa0 0xe0 flowid :1 skip_hw
Command line is not complete. Try option "help"

Remove the NEXT_ARG()s and the continues, and let the argc--; argv++;
at the end of the loop do its job.

Fixes: 5e5b3008d1fb ("tc: f_u32: Add support for skip_hw and skip_sw flags")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoPass CPPFLAGS to the compiler
Luca Boccassi [Fri, 2 Nov 2018 12:35:44 +0000 (12:35 +0000)]
Pass CPPFLAGS to the compiler

When building Debian packages pre-processor flags are passed via
CPPFLAGS, as the convention indicates. Specifically, the hardening
-D_FORTIFY_SOURCE=2 flag is used.
Pass CPPFLAGS to all calls of QUIET_CC together with CFLAGS.

Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: build generate_nlmsg with QUIET_CC
Luca Boccassi [Fri, 2 Nov 2018 12:35:43 +0000 (12:35 +0000)]
testsuite: build generate_nlmsg with QUIET_CC

Follow the standard pattern, and respect user's verbosity setting.

Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agodevlink: Add missing region option to devlink man page
Alex Vesker [Thu, 8 Nov 2018 09:14:13 +0000 (11:14 +0200)]
devlink: Add missing region option to devlink man page

The region field was not added to the devlink man page.

Fixes: 8b4fbf0bed8e6 ("devlink: Add support for devlink-region access")
Signed-off-by: Alex Vesker <valex@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoFix warning in tc-skbprio.8 manpage
Luca Boccassi [Fri, 2 Nov 2018 15:27:31 +0000 (15:27 +0000)]
Fix warning in tc-skbprio.8 manpage

". If" gets interpreted as a macro, so move the period to the previous
line:

  33: warning: macro `If' not defined

Fixes: 141b55f8544e ("Add SKB Priority qdisc support in tc(8)")
Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoman: ss.8: break and indent long line
Luca Boccassi [Fri, 2 Nov 2018 13:27:48 +0000 (13:27 +0000)]
man: ss.8: break and indent long line

Fixes groff warning:
  ss.8 92: warning [p 2, 2.8i]: can't break line

And makes the line also more readable.

Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agobridge: fdb: remove redundant dev string in show output
Roopa Prabhu [Wed, 7 Nov 2018 23:14:09 +0000 (15:14 -0800)]
bridge: fdb: remove redundant dev string in show output

After commit 4abb8c723a64 ("bridge: fdb: Fix for missing
keywords in non-JSON output"), I am seeing a double print for dev
in bridge fdb show. eg:
"44:38:39:00:6a:82 dev dev bridge vlan 1 master bridge permanent"

this patch removes the redundant print.

Fixes: 4abb8c723a64 ("bridge: fdb: Fix for missing keywords in non-JSON output")
CC: Phil Sutter <phil@nwl.cc>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoInclude bsd/string.h only in include/utils.h
Luca Boccassi [Thu, 1 Nov 2018 22:25:27 +0000 (22:25 +0000)]
Include bsd/string.h only in include/utils.h

This is simpler and cleaner, and avoids having to include the header
from every file where the functions are used. The prototypes of the
internal implementation are in this header, so utils.h will have to be
included anyway for those.

Fixes: 508f3c231efb ("Use libbsd for strlcpy if available")
Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agouapi: update headers to 4.20-rc1
Stephen Hemminger [Mon, 5 Nov 2018 16:37:41 +0000 (08:37 -0800)]
uapi: update headers to 4.20-rc1

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agordma: Refresh help section of resource information
Leon Romanovsky [Thu, 1 Nov 2018 08:35:05 +0000 (10:35 +0200)]
rdma: Refresh help section of resource information

After commit 4060e4c0d257 ("rdma: Add PD resource tracking
information"), the resource information shows PDs and MRs,
but help pages didn't fully reflect it.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip rule: Require at least one argument for add
David Ahern [Tue, 30 Oct 2018 20:59:05 +0000 (13:59 -0700)]
ip rule: Require at least one argument for add

'ip rule add' with no additional arguments just adds another rule
for the main table - which exists by default. Require at least
1 argument similar to delete.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip rule: Honor filter arguments on flush
David Ahern [Tue, 30 Oct 2018 20:58:56 +0000 (13:58 -0700)]
ip rule: Honor filter arguments on flush

'ip ru flush' currently removes all rules with priority > 0 regardless
of any other command line arguments passed in. Update flush_rule to
call filter_nlmsg to determine if the rule should be flushed or not.
This enables rule flushing such as 'ip ru flush table 1001' and
'ip ru flush pref 99'.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoUse libbsd for strlcpy if available
Luca Boccassi [Wed, 31 Oct 2018 18:00:11 +0000 (18:00 +0000)]
Use libbsd for strlcpy if available

If libc does not provide strlcpy check for libbsd with pkg-config to
avoid relying on inline version.

Signed-off-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agobpf: check map symbol type properly with newer llvm compiler
Yonghong Song [Mon, 29 Oct 2018 22:32:03 +0000 (15:32 -0700)]
bpf: check map symbol type properly with newer llvm compiler

With llvm 7.0 or earlier, the map symbol type is STT_NOTYPE.
  -bash-4.4$ cat t.c
  __attribute__((section("maps"))) int g;
  -bash-4.4$ clang -target bpf -O2 -c t.c
  -bash-4.4$ readelf -s t.o

  Symbol table '.symtab' contains 2 entries:
     Num:    Value          Size Type    Bind   Vis      Ndx Name
       0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND
       1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    3 g

The following llvm commit enables BPF target to generate
proper symbol type and size.
  commit bf6ec206615b9718869d48b4e5400d0c6e3638dd
  Author: Yonghong Song <yhs@fb.com>
  Date:   Wed Sep 19 16:04:13 2018 +0000

      [bpf] Symbol sizes and types in object file

      Clang-compiled object files currently don't include the symbol sizes and
      types.  Some tools however need that information.  For example, ctfconvert
      uses that information to generate FreeBSD's CTF representation from ELF
      files.
      With this patch, symbol sizes and types are included in object files.

Signed-off-by: Paul Chaignon <paul.chaignon@orange.com>
Reported-by: Yutaro Hayakawa <yhayakawa3720@gmail.com>
Hence, for llvm 8.0.0 (currently trunk), symbol type will be not NOTYPE, but OBJECT.
  -bash-4.4$ clang -target bpf -O2 -c t.c
  -bash-4.4$ readelf -s t.o

  Symbol table '.symtab' contains 3 entries:
     Num:    Value          Size Type    Bind   Vis      Ndx Name
       0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND
       1: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS t.c
       2: 0000000000000000     4 OBJECT  GLOBAL DEFAULT    3 g

This patch makes sure bpf library accepts both NOTYPE and OBJECT types
of global map symbols.

Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoss: Actually print left delimiter for columns
Stefano Brivio [Mon, 29 Oct 2018 22:04:25 +0000 (23:04 +0100)]
ss: Actually print left delimiter for columns

While rendering columns, we use a local variable to keep track of the
field currently being printed, without touching current_field, which is
used for buffering.

Use the right pointer to access the left delimiter for the current column,
instead of always printing the left delimiter for the last buffered field,
which is usually an empty string.

This fixes an issue especially visible on narrow terminals, where some
columns might be displayed without separation.

Reported-by: YoyPa <yoann.p.public@gmail.com>
Fixes: 691bd854bf4a ("ss: Buffer raw fields first, then render them as a table")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Tested-by: YoyPa <yoann.p.public@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agobridge: fix vlan show stats formatting
Tobias Jungel [Fri, 26 Oct 2018 21:51:03 +0000 (23:51 +0200)]
bridge: fix vlan show stats formatting

The output of -statistics vlan show was broken previous change for json
output. This aligns the format to vlan show.

v2: fixed too greedy deletion that caused a -Wmaybe-uninitialized

Signed-off-by: Tobias Jungel <tobias.jungel@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoutils.h: provide fallback CLOCK_TAI definition
Peter Korsgaard [Sat, 27 Oct 2018 15:31:02 +0000 (17:31 +0200)]
utils.h: provide fallback CLOCK_TAI definition

q_{etf,taprio}.c uses CLOCK_TAI, which isn't exposed by glibc < 2.21 or
uClibc, breaking the build. Provide a fallback definition like it is done
for IPPROTO_MPLS and others.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoMerge branch 'iproute2-master' into iproute2-next
David Ahern [Tue, 23 Oct 2018 17:55:09 +0000 (10:55 -0700)]
Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>
5 years agoip/geneve: fix ttl inherit behavior
Hangbin Liu [Mon, 22 Oct 2018 07:46:18 +0000 (15:46 +0800)]
ip/geneve: fix ttl inherit behavior

Currently when we add geneve with "ttl inherit", we only set ttl to 0, which
is actually use whatever default value instead of inherit the inner protocol's
ttl value.

To make a difference with ttl inherit and ttl == 0, we add an attribute
IFLA_GENEVE_TTL_INHERIT in kernel commit 52d0d404d39dd ("geneve: add ttl
inherit support"). Now let's use "ttl inherit" to inherit the inner
protocol's ttl, and use "ttl auto" to means "use whatever default value",
the same behavior with ttl == 0.

v2:
1) remove IFLA_GENEVE_TTL_INHERIT defination in if_link.h as it's already
   updated.
2) Still use addattr8() so we can enable/disable ttl inherit, as Michal
   suggested.

v3: Update man page

Reported-by: Jianlin Shi <jishi@redhat.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
5 years agov4.19.0
Stephen Hemminger [Tue, 23 Oct 2018 17:14:57 +0000 (10:14 -0700)]
v4.19.0

5 years agotc: htb: Print default value in hex
Phil Sutter [Tue, 23 Oct 2018 10:36:24 +0000 (12:36 +0200)]
tc: htb: Print default value in hex

Value of 'default' is assumed to be hexadecimal when parsing, so
consequently it should be printed in hex as well. This is a regression
introduced when adding JSON output.

As requested, also change JSON output to print the value as hex string.

Fixes: f354fa6aa5ff0 ("tc: jsonify htb qdisc")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc: Remove pointless assignments in batch()
Phil Sutter [Thu, 18 Oct 2018 13:48:48 +0000 (15:48 +0200)]
tc: Remove pointless assignments in batch()

All these assignments are later overwritten without reading in between,
so just drop them.

Fixes: 485d0c6001c4a ("tc: Add batchsize feature for filter and actions")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotipc: Drop unused variable 'genl'
Phil Sutter [Thu, 18 Oct 2018 13:48:09 +0000 (15:48 +0200)]
tipc: Drop unused variable 'genl'

Although initialized by call to libmnl, the variable is used only in a
call to sizeof(). Drop it and call sizeof with its type instead.

Fixes: f043759dd4928 ("tipc: add new TIPC configuration tool")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip-route: Fix parse_encap_seg6() srh parsing
Phil Sutter [Thu, 18 Oct 2018 13:44:14 +0000 (15:44 +0200)]
ip-route: Fix parse_encap_seg6() srh parsing

In case caller did not specify 'segs' parameter, parse_srh() would read
garbage while iterating over 'segbuf'. Avoid this by initializing
'segbuf' to an empty string.

Fixes: e8493916a8ede ("iproute: add support for SR-IPv6 lwtunnel encapsulation")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agordma: Don't pass garbage to rd_check_is_filtered()
Phil Sutter [Thu, 18 Oct 2018 12:35:50 +0000 (14:35 +0200)]
rdma: Don't pass garbage to rd_check_is_filtered()

Variables 'src_port' and 'dst_port' are initialized only if attributes
RDMA_NLDEV_ATTR_RES_SRC_ADDR or RDMA_NLDEV_ATTR_RES_DST_ADDR are
present. Make sure to pass them over to rd_check_is_filtered() only if
that is the case.

Fixes: 9a362cc71a455 ("rdma: Add CM_ID resource tracking information")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip-route: Fix for memleak in error path
Phil Sutter [Thu, 18 Oct 2018 12:30:31 +0000 (14:30 +0200)]
ip-route: Fix for memleak in error path

If call to rta_addattr_l() failed, parse_encap_seg6() would leak memory.
Fix this by making sure calls to free() are not skipped.

Fixes: bd59e5b1517b0 ("ip-route: Fix segfault with many nexthops")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agordma: Fix for ineffective check in add_filter()
Phil Sutter [Thu, 18 Oct 2018 11:41:54 +0000 (13:41 +0200)]
rdma: Fix for ineffective check in add_filter()

With 'name' field defined as array in struct filters, it will always
contain a value irrespective of whether a name was assigned or not.

Fix this by turning the field into a const char pointer.

Fixes: 1174be72d1b4c ("rdma: Add filtering infrastructure")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agodevlink: Fix error reporting in cmd_resource_set()
Phil Sutter [Thu, 18 Oct 2018 11:28:23 +0000 (13:28 +0200)]
devlink: Fix error reporting in cmd_resource_set()

resource_path_parse() returns either zero or a negative error code,
hence the negated value must be passed to strerror().

Fixes: 8cd644095842a ("devlink: Add support for devlink resource abstraction")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotestsuite: Fix make check when need build generate_nlmsg
Petr Vorel [Tue, 25 Sep 2018 12:49:56 +0000 (14:49 +0200)]
testsuite: Fix make check when need build generate_nlmsg

make check from top level Makefile defines several flags which break
building generate_nlmsg:

$ make check
make -C tools
gcc  -Wall -Wstrict-prototypes  -Wmissing-prototypes -Wmissing-declarations -Wold-style-definition -Wformat=2 -O2 -I../include -I../include/uapi -DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib\" -DCONFDIR=\"/etc/iproute2\" -DNETNS_RUN_DIR=\"/var/run/netns\" -DNETNS_ETC_DIR=\"/etc/netns\" -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE  -DHAVE_SETNS -DHAVE_SELINUX -DHAVE_ELF -DHAVE_LIBMNL -I/usr/include/libmnl -DNEED_STRLCPY -DHAVE_LIBCAP ../lib/libutil.a ../lib/libnetlink.a -lselinux -lelf -lmnl -lcap  -I../../include -include../../include/uapi/linux/netlink.h -o generate_nlmsg generate_nlmsg.c ../../lib/libnetlink.c -lmnl
gcc: error: ../lib/libutil.a: No such file or directory
gcc: error: ../lib/libnetlink.a: No such file or directory
make[2]: *** [Makefile:5: generate_nlmsg] Error 1
make[1]: *** [Makefile:40: generate_nlmsg] Error 2

To fix it reset CFLAGS in sub Makefile and remove LDLIBS entirely (as
required -lmnl flag was specified in 5dc2204c ("testsuite: add libmnl").

Fixes: 8804a8c0 ("Makefile: Add check target")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoiplink: Remove flags argument from iplink_get
David Ahern [Fri, 19 Oct 2018 19:55:44 +0000 (12:55 -0700)]
iplink: Remove flags argument from iplink_get

iplink_get has 1 caller and the flags arg is 0, so just remove it.

Signed-off-by: David Ahern <dsahern@gmail.com>
5 years agoTree wide: Drop sockaddr_nl arg
David Ahern [Fri, 19 Oct 2018 20:42:36 +0000 (13:42 -0700)]
Tree wide: Drop sockaddr_nl arg

No function, filter, or print function uses the sockaddr_nl arg,
so just drop it.

Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoMerge branch 'iproute2-master' into iproute2-next
David Ahern [Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)]
Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>
5 years agoutil: spelling fix
Stephen Hemminger [Thu, 18 Oct 2018 20:23:38 +0000 (13:23 -0700)]
util: spelling fix

5 years agotipc: spelling fix
Stephen Hemminger [Thu, 18 Oct 2018 20:23:30 +0000 (13:23 -0700)]
tipc: spelling fix

5 years agoip: spelling fixes
Stephen Hemminger [Thu, 18 Oct 2018 20:23:11 +0000 (13:23 -0700)]
ip: spelling fixes

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agotc: spelling fixes
Stephen Hemminger [Thu, 18 Oct 2018 20:22:51 +0000 (13:22 -0700)]
tc: spelling fixes

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoconfig: spelling fixes
Stephen Hemminger [Thu, 18 Oct 2018 20:22:25 +0000 (13:22 -0700)]
config: spelling fixes

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoexamples: fix spelling errors
Stephen Hemminger [Thu, 18 Oct 2018 20:18:56 +0000 (13:18 -0700)]
examples: fix spelling errors

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agodoc/man: spelling fixes
Stephen Hemminger [Thu, 18 Oct 2018 20:15:45 +0000 (13:15 -0700)]
doc/man: spelling fixes

Use ispell and codespell to find/fix spelling errors in documentation
and man pages.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoip-addrlabel: Fix printing of label value
Phil Sutter [Mon, 15 Oct 2018 20:20:58 +0000 (22:20 +0200)]
ip-addrlabel: Fix printing of label value

Passing the return value of RTA_DATA() to rta_getattr_u32() is wrong
since that function will call RTA_DATA() by itself already.

Fixes: a7ad1c8a6845d ("ipaddrlabel: add json support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
5 years agoutils: fix get_rtnl_link_stats_rta stats parsing
Lorenzo Bianconi [Wed, 10 Oct 2018 15:00:58 +0000 (17:00 +0200)]
utils: fix get_rtnl_link_stats_rta stats parsing

iproute2 walks through the list of available tunnels using netlink
protocol in order to get device info instead of reading
them from proc filesystem. However the kernel reports device statistics
using IFLA_INET6_STATS/IFLA_INET6_ICMP6STATS attributes nested in
IFLA_PROTINFO one but iproutes expects these info in
IFLA_STATS64/IFLA_STATS attributes.
The issue can be triggered with the following reproducer:

$ip link add ip6d0 type ip6tnl mode ip6ip6 local 1111::1 remote 2222::1
$ip -6 -d -s tunnel show ip6d0
ip6d0: ipv6/ipv6 remote 2222::1 local 1111::1 encaplimit 4 hoplimit 64
tclass 0x00 flowlabel 0x00000 (flowinfo 0x00000000)
Dump terminated

Fix the issue introducing IFLA_INET6_STATS attribute parsing

Fixes: 3e953938717f ("iptunnel/ip6tunnel: Use netlink to walk through
tunnels list")

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
5 years agouapi: add snmp header file
Lorenzo Bianconi [Wed, 10 Oct 2018 15:00:57 +0000 (17:00 +0200)]
uapi: add snmp header file

Introduce snmp header file. It will be used in subsequent patch in
order to parse device statistics reported in
IFLA_INET6_STATS/IFLA_INET6_ICMP6STATS netlink attributes

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>