matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/shemminger/iproute2

This commit is contained in:
Stephen Hemminger 2018-11-19 11:40:37 -08:00
parent 133db49b49 05d978e085
commit 57ddc275f5
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ip/iproute_lwtunnel.c
View File

@ -860,7 +860,7 @@ static int parse_encap_ila(struct rtattr *rta, size_t len,
argc--; argv++; argc--; argv++;
if (rta_addattr64(rta, 1024, ILA_ATTR_LOCATOR, locator)) if (rta_addattr64(rta, len, ILA_ATTR_LOCATOR, locator))
return -1; return -1;
while (argc > 0) { while (argc > 0) {
@ -874,7 +874,7 @@ static int parse_encap_ila(struct rtattr *rta, size_t len,
invarg("\"csum-mode\" value is invalid\n", invarg("\"csum-mode\" value is invalid\n",
*argv); *argv);
ret = rta_addattr8(rta, 1024, ILA_ATTR_CSUM_MODE, ret = rta_addattr8(rta, len, ILA_ATTR_CSUM_MODE,
(__u8)csum_mode); (__u8)csum_mode);
argc--; argv++; argc--; argv++;
@ -888,7 +888,7 @@ static int parse_encap_ila(struct rtattr *rta, size_t len,
invarg("\"ident-type\" value is invalid\n", invarg("\"ident-type\" value is invalid\n",
*argv); *argv);
ret = rta_addattr8(rta, 1024, ILA_ATTR_IDENT_TYPE, ret = rta_addattr8(rta, len, ILA_ATTR_IDENT_TYPE,
(__u8)ident_type); (__u8)ident_type);
argc--; argv++; argc--; argv++;
@ -902,7 +902,7 @@ static int parse_encap_ila(struct rtattr *rta, size_t len,
invarg("\"hook-type\" value is invalid\n", invarg("\"hook-type\" value is invalid\n",
*argv); *argv);
ret = rta_addattr8(rta, 1024, ILA_ATTR_HOOK_TYPE, ret = rta_addattr8(rta, len, ILA_ATTR_HOOK_TYPE,
(__u8)hook_type); (__u8)hook_type);
argc--; argv++; argc--; argv++;
@ -1034,7 +1034,7 @@ static int parse_encap_bpf(struct rtattr *rta, size_t len, int *argcp,
if (get_unsigned(&headroom, *argv, 0) || headroom == 0) if (get_unsigned(&headroom, *argv, 0) || headroom == 0)
invarg("headroom is invalid\n", *argv); invarg("headroom is invalid\n", *argv);
if (!headroom_set) if (!headroom_set)
rta_addattr32(rta, 1024, LWT_BPF_XMIT_HEADROOM, rta_addattr32(rta, len, LWT_BPF_XMIT_HEADROOM,
headroom); headroom);
headroom_set = 1; headroom_set = 1;
} else if (strcmp(*argv, "help") == 0) { } else if (strcmp(*argv, "help") == 0) {
@ -1075,7 +1075,7 @@ int lwt_parse_encap(struct rtattr *rta, size_t len, int *argcp, char ***argvp)
exit(-1); exit(-1);
} }
nest = rta_nest(rta, 1024, RTA_ENCAP); nest = rta_nest(rta, len, RTA_ENCAP);
switch (type) { switch (type) {
case LWTUNNEL_ENCAP_MPLS: case LWTUNNEL_ENCAP_MPLS:
ret = parse_encap_mpls(rta, len, &argc, &argv); ret = parse_encap_mpls(rta, len, &argc, &argv);
@ -1108,7 +1108,7 @@ int lwt_parse_encap(struct rtattr *rta, size_t len, int *argcp, char ***argvp)
rta_nest_end(rta, nest); rta_nest_end(rta, nest);
ret = rta_addattr16(rta, 1024, RTA_ENCAP_TYPE, type); ret = rta_addattr16(rta, len, RTA_ENCAP_TYPE, type);
*argcp = argc; *argcp = argc;
*argvp = argv; *argvp = argv;

9
man/man8/ip-route.8.in
View File

@ -589,6 +589,15 @@ argument lists:
route reflecting its relative bandwidth or quality. route reflecting its relative bandwidth or quality.
.in -8 .in -8
The internal buffer used in iproute2 limits the maximum number of nexthops that
may be specified in one go. If only
.I ADDRESS
is given, the current buffer size allows for 144 IPv6 nexthops and 253 IPv4
ones. For IPv4, this effectively limits the number of nexthops possible per
route. With IPv6, further nexthops may be appended to the same route via
.B "ip route append"
command.
.TP .TP
.BI scope " SCOPE_VAL" .BI scope " SCOPE_VAL"
the scope of the destinations covered by the route prefix. the scope of the destinations covered by the route prefix.

6
testsuite/Makefile
View File

@ -85,11 +85,11 @@ endif
TC="$$i/tc/tc" IP="$$i/ip/ip" SS=$$i/misc/ss DEV="$(DEV)" IPVER="$@" SNAME="$$i" \ TC="$$i/tc/tc" IP="$$i/ip/ip" SS=$$i/misc/ss DEV="$(DEV)" IPVER="$@" SNAME="$$i" \
ERRF="$(RESULTS_DIR)/$@.$$o.err" $(PREFIX) tests/$@ > $(RESULTS_DIR)/$@.$$o.out; \ ERRF="$(RESULTS_DIR)/$@.$$o.err" $(PREFIX) tests/$@ > $(RESULTS_DIR)/$@.$$o.out; \
if [ "$$?" = "127" ]; then \ if [ "$$?" = "127" ]; then \
echo "SKIPPED"; \ echo "\e[1;35mSKIPPED\e[0m"; \
elif [ -e "$(RESULTS_DIR)/$@.$$o.err" ]; then \ elif [ -e "$(RESULTS_DIR)/$@.$$o.err" ]; then \
echo "FAILED"; \ echo "\e[0;31mFAILED\e[0m"; \
else \ else \
echo "PASS"; \ echo "\e[0;32mPASS\e[0m"; \
fi; \ fi; \
rm "$$TMP_ERR" "$$TMP_OUT"; \ rm "$$TMP_ERR" "$$TMP_OUT"; \
sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \ sudo dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \