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

Add support for AF_BRIDGE 

This can be useful when displaying neighbour table
This commit is contained in:
Stephen Hemminger 2012-09-17 15:50:27 -07:00
parent 328d482c48
commit 27bca61531
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ip/ip.c
View File

@ -47,7 +47,7 @@ static void usage(void)
" tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm |\n" " tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm |\n"
" netns | l2tp }\n" " netns | l2tp }\n"
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -f[amily] { inet | inet6 | ipx | dnet | link } |\n" " -f[amily] { inet | inet6 | ipx | dnet | bridge | link } |\n"
" -l[oops] { maximum-addr-flush-attempts } |\n" " -l[oops] { maximum-addr-flush-attempts } |\n"
" -o[neline] | -t[imestamp] | -b[atch] [filename] |\n" " -o[neline] | -t[imestamp] | -b[atch] [filename] |\n"
" -rc[vbuf] [size]}\n"); " -rc[vbuf] [size]}\n");
@ -185,6 +185,8 @@ int main(int argc, char **argv)
preferred_family = AF_PACKET; preferred_family = AF_PACKET;
else if (strcmp(argv[1], "ipx") == 0) else if (strcmp(argv[1], "ipx") == 0)
preferred_family = AF_IPX; preferred_family = AF_IPX;
else if (strcmp(argv[1], "bridge") == 0)
preferred_family = AF_BRIDGE;
else if (strcmp(argv[1], "help") == 0) else if (strcmp(argv[1], "help") == 0)
usage(); usage();
else else
@ -199,6 +201,8 @@ int main(int argc, char **argv)
preferred_family = AF_IPX; preferred_family = AF_IPX;
} else if (strcmp(opt, "-D") == 0) { } else if (strcmp(opt, "-D") == 0) {
preferred_family = AF_DECnet; preferred_family = AF_DECnet;
} else if (strcmp(opt, "-B") == 0) {
preferred_family = AF_BRIDGE;
} else if (matches(opt, "-stats") == 0 || } else if (matches(opt, "-stats") == 0 ||
matches(opt, "-statistics") == 0) { matches(opt, "-statistics") == 0) {
++show_stats; ++show_stats;

7
man/man8/ip.8
View File

@ -50,7 +50,7 @@ Zero (0) means loop until all addresses are removed.
.TP .TP
.BR "\-f" , " \-family" .BR "\-f" , " \-family"
followed by protocol family identifier: followed by protocol family identifier:
.BR "inet" , " inet6" .BR "inet" , " inet6" , "bridge" , "ipx" , "dnet"
or or
.BR link , .BR link ,
enforce the protocol family to use. If the option is not present, enforce the protocol family to use. If the option is not present,
@ -76,6 +76,11 @@ shortcut for
shortcut for shortcut for
.BR "\-family inet6" . .BR "\-family inet6" .
.TP
.B \-B
shortcut for
.BR "\-family bridge" .
.TP .TP
.B \-0 .B \-0
shortcut for shortcut for