iplink: bridge_slave: export read-only values

Export all the read-only values that get returned about a bridge port
such as the timers, the ids, designated_port and cost,
topology_change_ack and config_pending. For the bridge ids the
br_dump_bridge_id function is exported from iplink_bridge.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

diff --git a/ip/ip_common.h b/ip/ip_common.h
index 9a846df348fe2ca82ef17eeb4f2513d5d45052cf..815487a07b8a52777ccd79fcb80a81270f9469f6 100644 (file)
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -87,6 +87,8 @@ struct link_util
 struct link_util *get_link_kind(const char *kind);
 struct link_util *get_link_slave_kind(const char *slave_kind);
 
+void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len);
+
 #ifndef        INFINITY_LIFE_TIME
 #define     INFINITY_LIFE_TIME      0xFFFFFFFFU
 #endif

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index 1b666f0adef48ca697d689348236467379e9641c..79f15eff7c396eeca18435fb55ab3cdd4e452be4 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -60,8 +60,7 @@ static void explain(void)
        print_explain(stderr);
 }
 
-static void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf,
-                             size_t len)
+void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len)
 {
        char eaddr[32];
 

diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
index 4593872ecd84d36ae056a2fe2915151cdcc99f5f..c58f55294261adc5ce8d3227172d4324c6d32a42 100644 (file)
--- a/ip/iplink_bridge_slave.c
+++ b/ip/iplink_bridge_slave.c
@@ -98,6 +98,76 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
        if (tb[IFLA_BRPORT_UNICAST_FLOOD])
                print_onoff(f, "flood",
                        rta_getattr_u8(tb[IFLA_BRPORT_UNICAST_FLOOD]));
+
+       if (tb[IFLA_BRPORT_ID])
+               fprintf(f, "port_id 0x%x ",
+                       rta_getattr_u16(tb[IFLA_BRPORT_ID]));
+
+       if (tb[IFLA_BRPORT_NO])
+               fprintf(f, "port_no 0x%x ",
+                       rta_getattr_u16(tb[IFLA_BRPORT_NO]));
+
+       if (tb[IFLA_BRPORT_DESIGNATED_PORT])
+               fprintf(f, "designated_port %u ",
+                       rta_getattr_u16(tb[IFLA_BRPORT_DESIGNATED_PORT]));
+
+       if (tb[IFLA_BRPORT_DESIGNATED_COST])
+               fprintf(f, "designated_cost %u ",
+                       rta_getattr_u16(tb[IFLA_BRPORT_DESIGNATED_COST]));
+
+       if (tb[IFLA_BRPORT_BRIDGE_ID]) {
+               char bridge_id[32];
+
+               br_dump_bridge_id(RTA_DATA(tb[IFLA_BRPORT_BRIDGE_ID]),
+                                 bridge_id, sizeof(bridge_id));
+               fprintf(f, "designated_bridge %s ", bridge_id);
+       }
+
+       if (tb[IFLA_BRPORT_ROOT_ID]) {
+               char root_id[32];
+
+               br_dump_bridge_id(RTA_DATA(tb[IFLA_BRPORT_ROOT_ID]),
+                                 root_id, sizeof(root_id));
+               fprintf(f, "designated_root %s ", root_id);
+       }
+
+       if (tb[IFLA_BRPORT_HOLD_TIMER]) {
+               struct timeval tv;
+               __u64 htimer;
+
+               htimer = rta_getattr_u64(tb[IFLA_BRPORT_HOLD_TIMER]);
+               __jiffies_to_tv(&tv, htimer);
+               fprintf(f, "hold_timer %4i.%.2i ", (int)tv.tv_sec,
+                       (int)tv.tv_usec/10000);
+       }
+
+       if (tb[IFLA_BRPORT_MESSAGE_AGE_TIMER]) {
+               struct timeval tv;
+               __u64 agetimer;
+
+               agetimer = rta_getattr_u64(tb[IFLA_BRPORT_MESSAGE_AGE_TIMER]);
+               __jiffies_to_tv(&tv, agetimer);
+               fprintf(f, "message_age_timer %4i.%.2i ", (int)tv.tv_sec,
+                       (int)tv.tv_usec/10000);
+       }
+
+       if (tb[IFLA_BRPORT_FORWARD_DELAY_TIMER]) {
+               struct timeval tv;
+               __u64 fwdtimer;
+
+               fwdtimer = rta_getattr_u64(tb[IFLA_BRPORT_FORWARD_DELAY_TIMER]);
+               __jiffies_to_tv(&tv, fwdtimer);
+               fprintf(f, "forward_delay_timer %4i.%.2i ", (int)tv.tv_sec,
+                       (int)tv.tv_usec/10000);
+       }
+
+       if (tb[IFLA_BRPORT_TOPOLOGY_CHANGE_ACK])
+               fprintf(f, "topology_change_ack %u ",
+                       rta_getattr_u8(tb[IFLA_BRPORT_TOPOLOGY_CHANGE_ACK]));
+
+       if (tb[IFLA_BRPORT_CONFIG_PENDING])
+               fprintf(f, "config_pending %u ",
+                       rta_getattr_u8(tb[IFLA_BRPORT_CONFIG_PENDING]));
 }
 
 static void bridge_slave_parse_on_off(char *arg_name, char *arg_val,