|
 |
4aca6e |
From 6eda4d7ea7eda19e7a67b0ae0892993fff9bd573 Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 28 Feb 2017 16:12:02 +0100
|
|
|
4aca6e |
Subject: [PATCH] iplink: bridge_slave: export read-only values
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1417289
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 3069539fb8efd
|
|
|
4aca6e |
Conflicts: Changed context due to other backports in that area.
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 3069539fb8efd8353d46a6be1a501f77871888ca
|
|
|
4aca6e |
Author: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
Date: Tue Feb 16 16:08:51 2016 +0100
|
|
|
4aca6e |
|
|
|
4aca6e |
iplink: bridge_slave: export read-only values
|
|
|
4aca6e |
|
|
|
4aca6e |
Export all the read-only values that get returned about a bridge port
|
|
|
4aca6e |
such as the timers, the ids, designated_port and cost,
|
|
|
4aca6e |
topology_change_ack and config_pending. For the bridge ids the
|
|
|
4aca6e |
br_dump_bridge_id function is exported from iplink_bridge.
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
ip/ip_common.h | 2 ++
|
|
|
4aca6e |
ip/iplink_bridge.c | 3 +--
|
|
|
4aca6e |
ip/iplink_bridge_slave.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
4aca6e |
3 files changed, 72 insertions(+), 2 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/ip/ip_common.h b/ip/ip_common.h
|
|
|
4aca6e |
index 286f61f..abab49d 100644
|
|
|
4aca6e |
--- a/ip/ip_common.h
|
|
|
4aca6e |
+++ b/ip/ip_common.h
|
|
|
4aca6e |
@@ -89,6 +89,8 @@ struct link_util
|
|
|
4aca6e |
struct link_util *get_link_kind(const char *kind);
|
|
|
4aca6e |
struct link_util *get_link_slave_kind(const char *slave_kind);
|
|
|
4aca6e |
|
|
|
4aca6e |
+void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len);
|
|
|
4aca6e |
+
|
|
|
4aca6e |
#ifndef INFINITY_LIFE_TIME
|
|
|
4aca6e |
#define INFINITY_LIFE_TIME 0xFFFFFFFFU
|
|
|
4aca6e |
#endif
|
|
|
4aca6e |
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
|
|
|
4aca6e |
index 2c8f351..7cec078 100644
|
|
|
4aca6e |
--- a/ip/iplink_bridge.c
|
|
|
4aca6e |
+++ b/ip/iplink_bridge.c
|
|
|
4aca6e |
@@ -57,8 +57,7 @@ static void explain(void)
|
|
|
4aca6e |
print_explain(stderr);
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
-static void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf,
|
|
|
4aca6e |
- size_t len)
|
|
|
4aca6e |
+void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len)
|
|
|
4aca6e |
{
|
|
|
4aca6e |
char eaddr[32];
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
|
|
|
4aca6e |
index 3538176..3ec2bba 100644
|
|
|
4aca6e |
--- a/ip/iplink_bridge_slave.c
|
|
|
4aca6e |
+++ b/ip/iplink_bridge_slave.c
|
|
|
4aca6e |
@@ -103,6 +103,75 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
|
|
|
4aca6e |
print_onoff(f, "flood",
|
|
|
4aca6e |
rta_getattr_u8(tb[IFLA_BRPORT_UNICAST_FLOOD]));
|
|
|
4aca6e |
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_ID])
|
|
|
4aca6e |
+ fprintf(f, "port_id 0x%x ",
|
|
|
4aca6e |
+ rta_getattr_u16(tb[IFLA_BRPORT_ID]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_NO])
|
|
|
4aca6e |
+ fprintf(f, "port_no 0x%x ",
|
|
|
4aca6e |
+ rta_getattr_u16(tb[IFLA_BRPORT_NO]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_DESIGNATED_PORT])
|
|
|
4aca6e |
+ fprintf(f, "designated_port %u ",
|
|
|
4aca6e |
+ rta_getattr_u16(tb[IFLA_BRPORT_DESIGNATED_PORT]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_DESIGNATED_COST])
|
|
|
4aca6e |
+ fprintf(f, "designated_cost %u ",
|
|
|
4aca6e |
+ rta_getattr_u16(tb[IFLA_BRPORT_DESIGNATED_COST]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_BRIDGE_ID]) {
|
|
|
4aca6e |
+ char bridge_id[32];
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ br_dump_bridge_id(RTA_DATA(tb[IFLA_BRPORT_BRIDGE_ID]),
|
|
|
4aca6e |
+ bridge_id, sizeof(bridge_id));
|
|
|
4aca6e |
+ fprintf(f, "designated_bridge %s ", bridge_id);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_ROOT_ID]) {
|
|
|
4aca6e |
+ char root_id[32];
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ br_dump_bridge_id(RTA_DATA(tb[IFLA_BRPORT_ROOT_ID]),
|
|
|
4aca6e |
+ root_id, sizeof(root_id));
|
|
|
4aca6e |
+ fprintf(f, "designated_root %s ", root_id);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_HOLD_TIMER]) {
|
|
|
4aca6e |
+ struct timeval tv;
|
|
|
4aca6e |
+ __u64 htimer;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ htimer = rta_getattr_u64(tb[IFLA_BRPORT_HOLD_TIMER]);
|
|
|
4aca6e |
+ __jiffies_to_tv(&tv, htimer);
|
|
|
4aca6e |
+ fprintf(f, "hold_timer %4i.%.2i ", (int)tv.tv_sec,
|
|
|
4aca6e |
+ (int)tv.tv_usec/10000);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_MESSAGE_AGE_TIMER]) {
|
|
|
4aca6e |
+ struct timeval tv;
|
|
|
4aca6e |
+ __u64 agetimer;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ agetimer = rta_getattr_u64(tb[IFLA_BRPORT_MESSAGE_AGE_TIMER]);
|
|
|
4aca6e |
+ __jiffies_to_tv(&tv, agetimer);
|
|
|
4aca6e |
+ fprintf(f, "message_age_timer %4i.%.2i ", (int)tv.tv_sec,
|
|
|
4aca6e |
+ (int)tv.tv_usec/10000);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_FORWARD_DELAY_TIMER]) {
|
|
|
4aca6e |
+ struct timeval tv;
|
|
|
4aca6e |
+ __u64 fwdtimer;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ fwdtimer = rta_getattr_u64(tb[IFLA_BRPORT_FORWARD_DELAY_TIMER]);
|
|
|
4aca6e |
+ __jiffies_to_tv(&tv, fwdtimer);
|
|
|
4aca6e |
+ fprintf(f, "forward_delay_timer %4i.%.2i ", (int)tv.tv_sec,
|
|
|
4aca6e |
+ (int)tv.tv_usec/10000);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_TOPOLOGY_CHANGE_ACK])
|
|
|
4aca6e |
+ fprintf(f, "topology_change_ack %u ",
|
|
|
4aca6e |
+ rta_getattr_u8(tb[IFLA_BRPORT_TOPOLOGY_CHANGE_ACK]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_CONFIG_PENDING])
|
|
|
4aca6e |
+ fprintf(f, "config_pending %u ",
|
|
|
4aca6e |
+ rta_getattr_u8(tb[IFLA_BRPORT_CONFIG_PENDING]));
|
|
|
4aca6e |
if (tb[IFLA_BRPORT_PROXYARP])
|
|
|
4aca6e |
print_onoff(f, "proxy_arp",
|
|
|
4aca6e |
rta_getattr_u8(tb[IFLA_BRPORT_PROXYARP]));
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|