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

bridge: add oneline option 

Split output of 'bridge link' across multiple lines,
only show the flags if -d is set, and add --oneline option
like ip command.
This commit is contained in:
Stephen Hemminger 2013-03-16 10:18:50 -07:00
parent aa2f1335e9
commit 4cd20da16f
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridge/bridge.c
View File

@ -17,9 +17,11 @@
struct rtnl_handle rth = { .fd = -1 }; struct rtnl_handle rth = { .fd = -1 };
int preferred_family = AF_UNSPEC; int preferred_family = AF_UNSPEC;
int resolve_hosts; int resolve_hosts;
int oneline = 0;
int show_stats; int show_stats;
int show_details; int show_details;
int timestamp; int timestamp;
char * _SL_ = NULL;
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
@ -28,7 +30,8 @@ static void usage(void)
fprintf(stderr, fprintf(stderr,
"Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\n" "Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\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");
exit(-1); exit(-1);
} }
@ -88,6 +91,8 @@ main(int argc, char **argv)
++show_stats; ++show_stats;
} else if (matches(opt, "-details") == 0) { } else if (matches(opt, "-details") == 0) {
++show_details; ++show_details;
} else if (matches(opt, "-oneline") == 0) {
++oneline;
} else if (matches(opt, "-timestamp") == 0) { } else if (matches(opt, "-timestamp") == 0) {
++timestamp; ++timestamp;
} else if (matches(opt, "-family") == 0) { } else if (matches(opt, "-family") == 0) {
@ -114,6 +119,8 @@ main(int argc, char **argv)
argc--; argv++; argc--; argv++;
} }
_SL_ = oneline ? "\\" : "\n" ;
if (rtnl_open(&rth, 0) < 0) if (rtnl_open(&rth, 0) < 0)
exit(1); exit(1);

29
bridge/link.c
View File

@ -169,18 +169,23 @@ int print_linkinfo(const struct sockaddr_nl *who,
if (prtb[IFLA_BRPORT_COST]) if (prtb[IFLA_BRPORT_COST])
fprintf(fp, "cost %u ", fprintf(fp, "cost %u ",
rta_getattr_u32(prtb[IFLA_BRPORT_COST])); rta_getattr_u32(prtb[IFLA_BRPORT_COST]));
if (prtb[IFLA_BRPORT_MODE])
print_onoff(fp, "hairpin", if (show_details) {
rta_getattr_u8(prtb[IFLA_BRPORT_MODE])); fprintf(fp, "%s ", _SL_);
if (prtb[IFLA_BRPORT_GUARD])
print_onoff(fp, "guard", if (prtb[IFLA_BRPORT_MODE])
rta_getattr_u8(prtb[IFLA_BRPORT_GUARD])); print_onoff(fp, "hairpin",
if (prtb[IFLA_BRPORT_PROTECT]) rta_getattr_u8(prtb[IFLA_BRPORT_MODE]));
print_onoff(fp, "root_block", if (prtb[IFLA_BRPORT_GUARD])
rta_getattr_u8(prtb[IFLA_BRPORT_PROTECT])); print_onoff(fp, "guard",
if (prtb[IFLA_BRPORT_FAST_LEAVE]) rta_getattr_u8(prtb[IFLA_BRPORT_GUARD]));
print_onoff(fp, "fastleave", if (prtb[IFLA_BRPORT_PROTECT])
rta_getattr_u8(prtb[IFLA_BRPORT_FAST_LEAVE])); print_onoff(fp, "root_block",
rta_getattr_u8(prtb[IFLA_BRPORT_PROTECT]));
if (prtb[IFLA_BRPORT_FAST_LEAVE])
print_onoff(fp, "fastleave",
rta_getattr_u8(prtb[IFLA_BRPORT_FAST_LEAVE]));
}
} else } else
print_portstate(fp, rta_getattr_u8(tb[IFLA_PROTINFO])); print_portstate(fp, rta_getattr_u8(tb[IFLA_PROTINFO]));
} }