From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vlad Yasevich Subject: [PATCH iproute2 2/2] bridge: Add support for printing bridge port attributes Date: Wed, 13 Mar 2013 16:36:34 -0400 Message-ID: <1363206994-18599-3-git-send-email-vyasevic@redhat.com> References: <1363206994-18599-1-git-send-email-vyasevic@redhat.com> Cc: shemminger@vyatta.com, john.r.fastabend@intel.com To: netdev@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:3846 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933244Ab3CMUgm (ORCPT ); Wed, 13 Mar 2013 16:36:42 -0400 In-Reply-To: <1363206994-18599-1-git-send-email-vyasevic@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: Output new nested bridge port attributes. Signed-off-by: Vlad Yasevich --- bridge/link.c | 71 +++++++++++++++++++++++++++++++++++++++++++++---- include/libnetlink.h | 2 + lib/libnetlink.c | 13 ++++++++- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/bridge/link.c b/bridge/link.c index 72f2a02..48b98f2 100644 --- a/bridge/link.c +++ b/bridge/link.c @@ -65,6 +65,8 @@ static const char *oper_states[] = { "TESTING", "DORMANT", "UP" }; +static const char *hw_mode[] = {"VEB", "VEPA"}; + static void print_operstate(FILE *f, __u8 state) { if (state >= sizeof(oper_states)/sizeof(oper_states[0])) @@ -73,6 +75,28 @@ static void print_operstate(FILE *f, __u8 state) fprintf(f, "state %s ", oper_states[state]); } +static void print_portstate(FILE *f, __u8 state) +{ + if (state <= BR_STATE_BLOCKING) + fprintf(f, "state %s ", port_states[state]); + else + fprintf(f, "state (%d) ", state); +} + +static void print_portflag(FILE *f, char *flag, __u8 val) +{ + if (val) + fprintf(f, "%s ", flag); +} + +static void print_hwmode(FILE *f, __u16 mode) +{ + if (mode >= sizeof(hw_mode)/sizeof(hw_mode[0])) + fprintf(f, "HW mode %#hx ", mode); + else + fprintf(f, "HW mode %s ", hw_mode[mode]); +} + int print_linkinfo(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) { @@ -94,7 +118,7 @@ int print_linkinfo(const struct sockaddr_nl *who, if (filter_index && filter_index != ifi->ifi_index) return 0; - parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); + parse_rtattr_flags(tb, IFLA_MAX, IFLA_RTA(ifi), len, NLA_F_NESTED); if (tb[IFLA_IFNAME] == NULL) { fprintf(stderr, "BUG: nil ifname\n"); @@ -131,13 +155,48 @@ int print_linkinfo(const struct sockaddr_nl *who, if_indextoname(rta_getattr_u32(tb[IFLA_MASTER]), b1)); if (tb[IFLA_PROTINFO]) { - __u8 state = rta_getattr_u8(tb[IFLA_PROTINFO]); - if (state <= BR_STATE_BLOCKING) - fprintf(fp, "state %s", port_states[state]); - else - fprintf(fp, "state (%d)", state); + if (tb[IFLA_PROTINFO]->rta_type & NLA_F_NESTED) { + struct rtattr *prtb[IFLA_BRPORT_MAX+1]; + + parse_rtattr_nested(prtb, IFLA_BRPORT_MAX, + tb[IFLA_PROTINFO]); + + if (prtb[IFLA_BRPORT_STATE]) + print_portstate(fp, + rta_getattr_u8(prtb[IFLA_BRPORT_STATE])); + if (prtb[IFLA_BRPORT_PRIORITY]) + fprintf(fp, "priority %hu ", + rta_getattr_u16(prtb[IFLA_BRPORT_PRIORITY])); + if (prtb[IFLA_BRPORT_COST]) + fprintf(fp, "cost %u ", + rta_getattr_u32(prtb[IFLA_BRPORT_COST])); + if (prtb[IFLA_BRPORT_MODE]) + print_portflag(fp, "hairpin mode", + rta_getattr_u8(prtb[IFLA_BRPORT_MODE])); + if (prtb[IFLA_BRPORT_GUARD]) + print_portflag(fp, "bpdu guard", + rta_getattr_u8(prtb[IFLA_BRPORT_GUARD])); + if (prtb[IFLA_BRPORT_PROTECT]) + print_portflag(fp, "root block", + rta_getattr_u8(prtb[IFLA_BRPORT_PROTECT])); + if (prtb[IFLA_BRPORT_FAST_LEAVE]) + print_portflag(fp, "multicast fast leave", + rta_getattr_u8(prtb[IFLA_BRPORT_FAST_LEAVE])); + } else + print_portstate(fp, rta_getattr_u8(tb[IFLA_PROTINFO])); } + if (tb[IFLA_AF_SPEC]) { + /* This is reported by HW devices that have some bridging + * capabilities. + */ + struct rtattr *aftb[IFLA_BRIDGE_MAX+1]; + + parse_rtattr_nested(aftb, IFLA_BRIDGE_MAX, tb[IFLA_AF_SPEC]); + + if (tb[IFLA_BRIDGE_MODE]) + print_hwmode(fp, rta_getattr_u16(tb[IFLA_BRIDGE_MODE])); + } fprintf(fp, "\n"); fflush(fp); diff --git a/include/libnetlink.h b/include/libnetlink.h index 8d15ee5..ec3d657 100644 --- a/include/libnetlink.h +++ b/include/libnetlink.h @@ -65,6 +65,8 @@ extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data); extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, const void *data, int alen); extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len); +extern int parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr *rta, + int len, unsigned short flags); extern int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len); extern int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rta, int len); diff --git a/lib/libnetlink.c b/lib/libnetlink.c index 67f046f..f262959 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -658,10 +658,19 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type, int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len) { + return parse_rtattr_flags(tb, max, rta, len, 0); +} + +int parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr *rta, + int len, unsigned short flags) +{ + unsigned short type; + memset(tb, 0, sizeof(struct rtattr *) * (max + 1)); while (RTA_OK(rta, len)) { - if ((rta->rta_type <= max) && (!tb[rta->rta_type])) - tb[rta->rta_type] = rta; + type = rta->rta_type & ~flags; + if ((type <= max) && (!tb[type])) + tb[type] = rta; rta = RTA_NEXT(rta,len); } if (len) -- 1.7.7.6