New function stp_set_bridge_id() to change the bridge ID of a running STP.

diff --git a/include/stp.h b/include/stp.h
index 3305e60c46650ef9631d1febf5fa6e845e7775f6..5e09c2f167a898d7bde7b824810482d5103a27b7 100644 (file)
--- a/include/stp.h
+++ b/include/stp.h
@@ -62,6 +62,7 @@ struct stp *stp_create(const char *name, stp_identifier bridge_id,
                        void *aux);
 void stp_destroy(struct stp *);
 void stp_tick(struct stp *, int elapsed);
+void stp_set_bridge_id(struct stp *, stp_identifier bridge_id);
 void stp_set_bridge_priority(struct stp *, uint16_t new_priority);
 
 /* STP properties. */

diff --git a/lib/stp.c b/lib/stp.c
index 8b50584c09e8760ee987644a82ca94341861d1bf..f61aa0dedc5aae988b4d77bd495e3d43f447e928 100644 (file)
--- a/lib/stp.c
+++ b/lib/stp.c
@@ -298,27 +298,42 @@ stp_tick(struct stp *stp, int elapsed)
     }
 }
 
-void
-stp_set_bridge_priority(struct stp *stp, uint16_t new_priority)
+static void
+set_bridge_id(struct stp *stp, stp_identifier new_bridge_id)
 {
-    stp_identifier new_bridge_id;
-    bool root;
-    struct stp_port *p;
-
-    new_bridge_id = ((stp->bridge_id & UINT64_C(0xffffffffffff))
-                     | ((uint64_t) new_priority << 48));
-    root = stp_is_root_bridge(stp);
-    FOR_EACH_ENABLED_PORT (p, stp) {
-        if (stp_is_designated_port(p)) {
-            p->designated_bridge = new_bridge_id;
+    if (new_bridge_id != stp->bridge_id) {
+        bool root;
+        struct stp_port *p;
+
+        root = stp_is_root_bridge(stp);
+        FOR_EACH_ENABLED_PORT (p, stp) {
+            if (stp_is_designated_port(p)) {
+                p->designated_bridge = new_bridge_id;
+            }
+        }
+        stp->bridge_id = new_bridge_id;
+        stp_configuration_update(stp);
+        stp_port_state_selection(stp);
+        if (stp_is_root_bridge(stp) && !root) {
+            stp_become_root_bridge(stp);
         }
     }
-    stp->bridge_id = new_bridge_id;
-    stp_configuration_update(stp);
-    stp_port_state_selection(stp);
-    if (stp_is_root_bridge(stp) && !root) {
-        stp_become_root_bridge(stp);
-    }
+}
+
+void
+stp_set_bridge_id(struct stp *stp, stp_identifier bridge_id)
+{
+    const uint64_t mac_bits = (UINT64_C(1) << 48) - 1;
+    const uint64_t pri_bits = ~mac_bits;
+    set_bridge_id(stp, (stp->bridge_id & pri_bits) | (bridge_id & mac_bits));
+}
+
+void
+stp_set_bridge_priority(struct stp *stp, uint16_t new_priority)
+{
+    const uint64_t mac_bits = (UINT64_C(1) << 48) - 1;
+    set_bridge_id(stp, ((stp->bridge_id & mac_bits)
+                        | ((uint64_t) new_priority << 48)));
 }
 
 /* Returns the name given to 'stp' in the call to stp_create(). */