d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use printb() for boolean flags in ro_opts and actor_state for LACP.

Browse Source
This commit is contained in:
Hiroki Sato 2014-10-05 02:37:01 +00:00
parent 6d47816791
commit 7eb756fab1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=272548
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/ifconfig/iflagg.c
View File

@ -17,6 +17,7 @@ static const char rcsid[] =
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_lagg.h> #include <net/if_lagg.h>
#include <net/ieee8023ad_lacp.h>
#include <net/route.h> #include <net/route.h>
#include <ctype.h> #include <ctype.h>
@ -246,18 +247,9 @@ lagg_status(int s)
putchar('\n'); putchar('\n');
if (verbose) { if (verbose) {
printf("\tlagg options:\n"); printf("\tlagg options:\n");
printf("\t\tuse_flowid: %d\n", printb("\t\tflags", ro.ro_opts, LAGG_OPT_BITS);
(ro.ro_opts & LAGG_OPT_USE_FLOWID) ? 1 : 0); putchar('\n');
printf("\t\tflowid_shift: %d\n", ro.ro_flowid_shift); printf("\t\tflowid_shift: %d\n", ro.ro_flowid_shift);
switch (ra.ra_proto) {
case LAGG_PROTO_LACP:
printf("\t\tlacp_strict: %d\n",
(ro.ro_opts & LAGG_OPT_LACP_STRICT) ? 1 : 0);
printf("\t\tlacp_rxtest: %d\n",
(ro.ro_opts & LAGG_OPT_LACP_RXTEST) ? 1 : 0);
printf("\t\tlacp_txtest: %d\n",
(ro.ro_opts & LAGG_OPT_LACP_TXTEST) ? 1 : 0);
}
printf("\tlagg statistics:\n"); printf("\tlagg statistics:\n");
printf("\t\tactive ports: %d\n", ro.ro_active); printf("\t\tactive ports: %d\n", ro.ro_active);
printf("\t\tflapping: %u\n", ro.ro_flapping); printf("\t\tflapping: %u\n", ro.ro_flapping);
@ -272,7 +264,8 @@ lagg_status(int s)
printf("\tlaggport: %s ", rpbuf[i].rp_portname); printf("\tlaggport: %s ", rpbuf[i].rp_portname);
printb("flags", rpbuf[i].rp_flags, LAGG_PORT_BITS); printb("flags", rpbuf[i].rp_flags, LAGG_PORT_BITS);
if (verbose && ra.ra_proto == LAGG_PROTO_LACP) if (verbose && ra.ra_proto == LAGG_PROTO_LACP)
printf(" state=%X", lp->actor_state); printb(" state", lp->actor_state,
LACP_STATE_BITS);
putchar('\n'); putchar('\n');
if (verbose && ra.ra_proto == LAGG_PROTO_LACP) if (verbose && ra.ra_proto == LAGG_PROTO_LACP)
printf("\t\t%s\n", printf("\t\t%s\n",

2
sys/net/ieee8023ad_lacp.h
View File

@ -75,6 +75,7 @@
"\007DEFAULTED" \ "\007DEFAULTED" \
"\010EXPIRED" "\010EXPIRED"
#ifdef _KERNEL
/* /*
* IEEE802.3 slow protocols * IEEE802.3 slow protocols
* *
@ -336,3 +337,4 @@ lacp_isdistributing(struct lagg_port *lgp)
#define LACP_LAGIDSTR_MAX \ #define LACP_LAGIDSTR_MAX \
(1 + LACP_PARTNERSTR_MAX + 1 + LACP_PARTNERSTR_MAX + 1) (1 + LACP_PARTNERSTR_MAX + 1 + LACP_PARTNERSTR_MAX + 1)
#define LACP_STATESTR_MAX (255) /* XXX */ #define LACP_STATESTR_MAX (255) /* XXX */
#endif /* _KERNEL */