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

Merge branch 'main' into next 

Conflicts:
	ip/ipneigh.c

Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
David Ahern 2021-10-09 17:47:47 -06:00
parent 763fd793fe 897772a735
commit 8cd517a805
13 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bridge/bridge.c
View File

@ -37,10 +37,10 @@ static void usage(void)
fprintf(stderr, fprintf(stderr,
"Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\n" "Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\n"
" bridge [ -force ] -batch filename\n" " bridge [ -force ] -batch filename\n"
"where OBJECT := { link | fdb | mdb | vlan | monitor }\n" "where OBJECT := { link | fdb | mdb | vlan | monitor }\n"
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] |\n" " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] |\n"
" -o[neline] | -t[imestamp] | -n[etns] name |\n" " -o[neline] | -t[imestamp] | -n[etns] name |\n"
" -c[ompressvlans] -color -p[retty] -j[son] }\n"); " -c[ompressvlans] -color -p[retty] -j[son] }\n");
exit(-1); exit(-1);
} }

2
ip/ipmptcp.c
View File

@ -278,7 +278,7 @@ static int mptcp_addr_dump(void)
return -2; return -2;
} }
close_json_object(); delete_json_obj();
fflush(stdout); fflush(stdout);
return 0; return 0;
} }

4
ip/ipmroute.c
View File

@ -37,8 +37,8 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ip mroute show [ [ to ] PREFIX ] [ from PREFIX ] [ iif DEVICE ]\n" "Usage: ip mroute show [ [ to ] PREFIX ] [ from PREFIX ] [ iif DEVICE ]\n"
" [ table TABLE_ID ]\n" " [ table TABLE_ID ]\n"
"TABLE_ID := [ local | main | default | all | NUMBER ]\n" "TABLE_ID := [ local | main | default | all | NUMBER ]\n"
#if 0 #if 0
"Usage: ip mroute [ add | del ] DESTINATION from SOURCE [ iif DEVICE ] [ oif DEVICE ]\n" "Usage: ip mroute [ add | del ] DESTINATION from SOURCE [ iif DEVICE ] [ oif DEVICE ]\n"
#endif #endif

4
ip/ipneigh.c
View File

@ -50,8 +50,8 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ip neigh { add | del | change | replace }\n" "Usage: ip neigh { add | del | change | replace }\n"
" { ADDR [ lladdr LLADDR ] [ nud STATE ] proxy ADDR }\n" " { ADDR [ lladdr LLADDR ] [ nud STATE ] proxy ADDR }\n"
" [ dev DEV ] [ router ] [ extern_learn ] [ protocol PROTO ]\n" " [ dev DEV ] [ router ] [ extern_learn ] [ protocol PROTO ]\n"
"\n" "\n"
" ip neigh { show | flush } [ proxy ] [ to PREFIX ] [ dev DEV ] [ nud STATE ]\n" " ip neigh { show | flush } [ proxy ] [ to PREFIX ] [ dev DEV ] [ nud STATE ]\n"
" [ vrf NAME ] [ nomaster ]\n" " [ vrf NAME ] [ nomaster ]\n"

12
ip/ipntable.c
View File

@ -47,15 +47,15 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ip ntable change name NAME [ dev DEV ]\n" "Usage: ip ntable change name NAME [ dev DEV ]\n"
" [ thresh1 VAL ] [ thresh2 VAL ] [ thresh3 VAL ] [ gc_int MSEC ]\n" " [ thresh1 VAL ] [ thresh2 VAL ] [ thresh3 VAL ] [ gc_int MSEC ]\n"
" [ PARMS ]\n" " [ PARMS ]\n"
"Usage: ip ntable show [ dev DEV ] [ name NAME ]\n" "Usage: ip ntable show [ dev DEV ] [ name NAME ]\n"
"PARMS := [ base_reachable MSEC ] [ retrans MSEC ] [ gc_stale MSEC ]\n" "PARMS := [ base_reachable MSEC ] [ retrans MSEC ] [ gc_stale MSEC ]\n"
" [ delay_probe MSEC ] [ queue LEN ]\n" " [ delay_probe MSEC ] [ queue LEN ]\n"
" [ app_probes VAL ] [ ucast_probes VAL ] [ mcast_probes VAL ]\n" " [ app_probes VAL ] [ ucast_probes VAL ] [ mcast_probes VAL ]\n"
" [ anycast_delay MSEC ] [ proxy_delay MSEC ] [ proxy_queue LEN ]\n" " [ anycast_delay MSEC ] [ proxy_delay MSEC ] [ proxy_queue LEN ]\n"
" [ locktime MSEC ]\n" " [ locktime MSEC ]\n"
); );
exit(-1); exit(-1);

2
ip/iproute.c
View File

@ -83,7 +83,7 @@ static void usage(void)
" [ ttl-propagate { enabled | disabled } ]\n" " [ ttl-propagate { enabled | disabled } ]\n"
"INFO_SPEC := { NH | nhid ID } OPTIONS FLAGS [ nexthop NH ]...\n" "INFO_SPEC := { NH | nhid ID } OPTIONS FLAGS [ nexthop NH ]...\n"
"NH := [ encap ENCAPTYPE ENCAPHDR ] [ via [ FAMILY ] ADDRESS ]\n" "NH := [ encap ENCAPTYPE ENCAPHDR ] [ via [ FAMILY ] ADDRESS ]\n"
" [ dev STRING ] [ weight NUMBER ] NHFLAGS\n" " [ dev STRING ] [ weight NUMBER ] NHFLAGS\n"
"FAMILY := [ inet | inet6 | mpls | bridge | link ]\n" "FAMILY := [ inet | inet6 | mpls | bridge | link ]\n"
"OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ] [ as [ to ] ADDRESS ]\n" "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ] [ as [ to ] ADDRESS ]\n"
" [ rtt TIME ] [ rttvar TIME ] [ reordering NUMBER ]\n" " [ rtt TIME ] [ rttvar TIME ] [ reordering NUMBER ]\n"

8
ip/ipseg6.c
View File

@ -34,10 +34,10 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ip sr { COMMAND | help }\n" "Usage: ip sr { COMMAND | help }\n"
" ip sr hmac show\n" " ip sr hmac show\n"
" ip sr hmac set KEYID ALGO\n" " ip sr hmac set KEYID ALGO\n"
" ip sr tunsrc show\n" " ip sr tunsrc show\n"
" ip sr tunsrc set ADDRESS\n" " ip sr tunsrc set ADDRESS\n"
"where ALGO := { sha1 | sha256 }\n"); "where ALGO := { sha1 | sha256 }\n");
exit(-1); exit(-1);
} }

22
ip/iptunnel.c
View File

@ -34,18 +34,18 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ip tunnel { add | change | del | show | prl | 6rd } [ NAME ]\n" "Usage: ip tunnel { add | change | del | show | prl | 6rd } [ NAME ]\n"
" [ mode { gre | ipip | isatap | sit | vti } ]\n" " [ mode { gre | ipip | isatap | sit | vti } ]\n"
" [ remote ADDR ] [ local ADDR ]\n" " [ remote ADDR ] [ local ADDR ]\n"
" [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
" [ prl-default ADDR ] [ prl-nodefault ADDR ] [ prl-delete ADDR ]\n" " [ prl-default ADDR ] [ prl-nodefault ADDR ] [ prl-delete ADDR ]\n"
" [ 6rd-prefix ADDR ] [ 6rd-relay_prefix ADDR ] [ 6rd-reset ]\n" " [ 6rd-prefix ADDR ] [ 6rd-relay_prefix ADDR ] [ 6rd-reset ]\n"
" [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n" " [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n"
"\n" "\n"
"Where: NAME := STRING\n" "Where: NAME := STRING\n"
" ADDR := { IP_ADDRESS | any }\n" " ADDR := { IP_ADDRESS | any }\n"
" TOS := { STRING | 00..ff | inherit | inherit/STRING | inherit/00..ff }\n" " TOS := { STRING | 00..ff | inherit | inherit/STRING | inherit/00..ff }\n"
" TTL := { 1..255 | inherit }\n" " TTL := { 1..255 | inherit }\n"
" KEY := { DOTTED_QUAD | NUMBER }\n"); " KEY := { DOTTED_QUAD | NUMBER }\n");
exit(-1); exit(-1);
} }

8
ip/iptuntap.c
View File

@ -42,11 +42,11 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ip tuntap { add | del | show | list | lst | help } [ dev PHYS_DEV ]\n" "Usage: ip tuntap { add | del | show | list | lst | help } [ dev PHYS_DEV ]\n"
" [ mode { tun | tap } ] [ user USER ] [ group GROUP ]\n" " [ mode { tun | tap } ] [ user USER ] [ group GROUP ]\n"
" [ one_queue ] [ pi ] [ vnet_hdr ] [ multi_queue ] [ name NAME ]\n" " [ one_queue ] [ pi ] [ vnet_hdr ] [ multi_queue ] [ name NAME ]\n"
"\n" "\n"
"Where: USER := { STRING | NUMBER }\n" "Where: USER := { STRING | NUMBER }\n"
" GROUP := { STRING | NUMBER }\n"); " GROUP := { STRING | NUMBER }\n");
exit(-1); exit(-1);
} }

2
ip/rtmon.c
View File

@ -65,7 +65,7 @@ static void usage(void)
fprintf(stderr, fprintf(stderr,
"Usage: rtmon [ OPTIONS ] file FILE [ all | LISTofOBJECTS ]\n" "Usage: rtmon [ OPTIONS ] file FILE [ all | LISTofOBJECTS ]\n"
"OPTIONS := { -f[amily] { inet | inet6 | link | help } |\n" "OPTIONS := { -f[amily] { inet | inet6 | link | help } |\n"
" -4 | -6 | -0 | -V[ersion] }\n" " -4 | -6 | -0 | -V[ersion] }\n"
"LISTofOBJECTS := [ link ] [ address ] [ route ]\n"); "LISTofOBJECTS := [ link ] [ address ] [ route ]\n");
exit(-1); exit(-1);
} }

5
lib/bpf_legacy.c
View File

@ -533,9 +533,12 @@ static int bpf_mnt_check_target(const char *target)
int ret; int ret;
ret = mkdir(target, S_IRWXU); ret = mkdir(target, S_IRWXU);
if (ret && errno != EEXIST) if (ret) {
if (errno == EEXIST)
return 0;
fprintf(stderr, "mkdir %s failed: %s\n", target, fprintf(stderr, "mkdir %s failed: %s\n", target,
strerror(errno)); strerror(errno));
}
return ret; return ret;
} }

22
misc/nstat.c
View File

@ -547,17 +547,17 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: nstat [OPTION] [ PATTERN [ PATTERN ] ]\n" "Usage: nstat [OPTION] [ PATTERN [ PATTERN ] ]\n"
" -h, --help this message\n" " -h, --help this message\n"
" -a, --ignore ignore history\n" " -a, --ignore ignore history\n"
" -d, --scan=SECS sample every statistics every SECS\n" " -d, --scan=SECS sample every statistics every SECS\n"
" -j, --json format output in JSON\n" " -j, --json format output in JSON\n"
" -n, --nooutput do history only\n" " -n, --nooutput do history only\n"
" -p, --pretty pretty print\n" " -p, --pretty pretty print\n"
" -r, --reset reset history\n" " -r, --reset reset history\n"
" -s, --noupdate don't update history\n" " -s, --noupdate don't update history\n"
" -t, --interval=SECS report average over the last SECS\n" " -t, --interval=SECS report average over the last SECS\n"
" -V, --version output version information\n" " -V, --version output version information\n"
" -z, --zeros show entries with zero activity\n"); " -z, --zeros show entries with zero activity\n");
exit(-1); exit(-1);
} }

2
tc/f_flower.c
View File

@ -725,7 +725,7 @@ static int flower_parse_port(char *str, __u8 ip_proto,
if (min && max) { if (min && max) {
__be16 min_port_type, max_port_type; __be16 min_port_type, max_port_type;
if (max <= min) { if (ntohs(max) <= ntohs(min)) {
fprintf(stderr, "max value should be greater than min value\n"); fprintf(stderr, "max value should be greater than min value\n");
return -1; return -1;
} }