bridge: add support for isolated option

[mirror_iproute2.git] / ip / iplink_bridge_slave.c

diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
index 80272b0941104dbfaca01e8a0457b60231d6de88..5a6e4855978170c61e97ce76eaa02d8df470b7a2 100644 (file)
--- a/ip/iplink_bridge_slave.c
+++ b/ip/iplink_bridge_slave.c
@@ -37,6 +37,10 @@ static void print_explain(FILE *f)
                "                        [ mcast_router MULTICAST_ROUTER ]\n"
                "                        [ mcast_fast_leave {on | off} ]\n"
                "                        [ mcast_flood {on | off} ]\n"
+               "                        [ group_fwd_mask MASK ]\n"
+               "                        [ neigh_suppress {on | off} ]\n"
+               "                        [ vlan_tunnel {on | off} ]\n"
+               "                        [ isolated {on | off} ]\n"
        );
 }
 
@@ -53,6 +57,12 @@ static const char *port_states[] = {
        [BR_STATE_BLOCKING] = "blocking",
 };
 
+static const char *fwd_mask_tbl[16] = {
+       [0]     = "stp",
+       [2]     = "lacp",
+       [14]    = "lldp"
+};
+
 static void print_portstate(FILE *f, __u8 state)
 {
        if (state <= BR_STATE_BLOCKING)
@@ -72,21 +82,6 @@ static void _print_onoff(FILE *f, char *json_flag, char *flag, __u8 val)
                fprintf(f, "%s %s ", flag, val ? "on" : "off");
 }
 
-static void _print_hex(FILE *f,
-                      const char *json_attr,
-                      const char *attr,
-                      __u16 val)
-{
-       if (is_json_context()) {
-               SPRINT_BUF(b1);
-
-               snprintf(b1, sizeof(b1), "0x%x", val);
-               print_string(PRINT_JSON, json_attr, NULL, b1);
-       } else {
-               fprintf(f, "%s 0x%x ", attr, val);
-       }
-}
-
 static void _print_timer(FILE *f, const char *attr, struct rtattr *timer)
 {
        struct timeval tv;
@@ -104,6 +99,28 @@ static void _print_timer(FILE *f, const char *attr, struct rtattr *timer)
        }
 }
 
+static void _bitmask2str(__u16 bitmask, char *dst, size_t dst_size,
+                        const char **tbl)
+{
+       int len, i;
+
+       for (i = 0, len = 0; bitmask; i++, bitmask >>= 1) {
+               if (bitmask & 0x1) {
+                       if (tbl[i])
+                               len += snprintf(dst + len, dst_size - len, "%s,",
+                                               tbl[i]);
+                       else
+                               len += snprintf(dst + len, dst_size - len, "0x%x,",
+                                               (1 << i));
+               }
+       }
+
+       if (!len)
+               snprintf(dst, dst_size, "0x0");
+       else
+               dst[len - 1] = 0;
+}
+
 static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
                                   struct rtattr *tb[])
 {
@@ -150,11 +167,11 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
                             rta_getattr_u8(tb[IFLA_BRPORT_UNICAST_FLOOD]));
 
        if (tb[IFLA_BRPORT_ID])
-               _print_hex(f, "id", "port_id",
-                          rta_getattr_u16(tb[IFLA_BRPORT_ID]));
+               print_0xhex(PRINT_ANY, "id", "port_id 0x%x ",
+                           rta_getattr_u16(tb[IFLA_BRPORT_ID]));
 
        if (tb[IFLA_BRPORT_NO])
-               _print_hex(f, "no", "port_no",
+               print_0xhex(PRINT_ANY, "no", "port_no 0x%x ",
                           rta_getattr_u16(tb[IFLA_BRPORT_NO]));
 
        if (tb[IFLA_BRPORT_DESIGNATED_PORT])
@@ -238,6 +255,30 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
        if (tb[IFLA_BRPORT_MCAST_FLOOD])
                _print_onoff(f, "mcast_flood", "mcast_flood",
                             rta_getattr_u8(tb[IFLA_BRPORT_MCAST_FLOOD]));
+
+       if (tb[IFLA_BRPORT_NEIGH_SUPPRESS])
+               _print_onoff(f, "neigh_suppress", "neigh_suppress",
+                            rta_getattr_u8(tb[IFLA_BRPORT_NEIGH_SUPPRESS]));
+
+       if (tb[IFLA_BRPORT_GROUP_FWD_MASK]) {
+               char convbuf[256];
+               __u16 fwd_mask;
+
+               fwd_mask = rta_getattr_u16(tb[IFLA_BRPORT_GROUP_FWD_MASK]);
+               print_0xhex(PRINT_ANY, "group_fwd_mask",
+                           "group_fwd_mask 0x%x ", fwd_mask);
+               _bitmask2str(fwd_mask, convbuf, sizeof(convbuf), fwd_mask_tbl);
+               print_string(PRINT_ANY, "group_fwd_mask_str",
+                            "group_fwd_mask_str %s ", convbuf);
+       }
+
+       if (tb[IFLA_BRPORT_VLAN_TUNNEL])
+               _print_onoff(f, "vlan_tunnel", "vlan_tunnel",
+                            rta_getattr_u8(tb[IFLA_BRPORT_VLAN_TUNNEL]));
+
+       if (tb[IFLA_BRPORT_ISOLATED])
+               _print_onoff(f, "isolated", "isolated",
+                            rta_getattr_u8(tb[IFLA_BRPORT_ISOLATED]));
 }
 
 static void bridge_slave_parse_on_off(char *arg_name, char *arg_val,
@@ -328,6 +369,25 @@ static int bridge_slave_parse_opt(struct link_util *lu, int argc, char **argv,
                        NEXT_ARG();
                        bridge_slave_parse_on_off("mcast_fast_leave", *argv, n,
                                                  IFLA_BRPORT_FAST_LEAVE);
+               } else if (matches(*argv, "neigh_suppress") == 0) {
+                       NEXT_ARG();
+                       bridge_slave_parse_on_off("neigh_suppress", *argv, n,
+                                                 IFLA_BRPORT_NEIGH_SUPPRESS);
+               } else if (matches(*argv, "group_fwd_mask") == 0) {
+                       __u16 mask;
+
+                       NEXT_ARG();
+                       if (get_u16(&mask, *argv, 0))
+                               invarg("invalid group_fwd_mask", *argv);
+                       addattr16(n, 1024, IFLA_BRPORT_GROUP_FWD_MASK, mask);
+               } else if (matches(*argv, "vlan_tunnel") == 0) {
+                       NEXT_ARG();
+                       bridge_slave_parse_on_off("vlan_tunnel", *argv, n,
+                                                 IFLA_BRPORT_VLAN_TUNNEL);
+               } else if (matches(*argv, "isolated") == 0) {
+                       NEXT_ARG();
+                       bridge_slave_parse_on_off("isolated", *argv, n,
+                                                 IFLA_BRPORT_ISOLATED);
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;