From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 11 Aug 2013 19:42:12 +0000 (+0200)
Subject: interfaces: move "mangle" function for bond slaves
X-Git-Tag: 0.7.7~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99704cd9b9fff606a36629d9e4ce3d8957e9da12;p=thirdparty%2Flldpd.git

interfaces: move "mangle" function for bond slaves

This will allow it to be used by other OS.
---

diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c
index 2f362d22..804d5eed 100644
--- a/src/daemon/interfaces-linux.c
+++ b/src/daemon/interfaces-linux.c
@@ -465,38 +465,6 @@ iface_bond_init(struct lldpd *cfg, struct lldpd_hardware *hardware)
 	return 0;
 }
 
-/**
- * Mangle the MAC address to avoid duplicates.
- *
- * With bonds, we have duplicate MAC address on different physical
- * interfaces. We need to alter the source MAC address when we send on
- * an inactive slave. We try to set "local" bit to 1 first. If it is
- * already set to 1, use an unused MAC address instead.
- */
-static void
-iface_mangle_mac(struct lldpd *cfg, char *src_mac)
-{
-#define MAC_UL_ADMINISTERED_BIT_MASK 0x02
-	char arbitrary[] = { 0x00, 0x60, 0x08, 0x69, 0x97, 0xef};
-
-	switch (cfg->g_config.c_bond_slave_src_mac_type) {
-	case LLDP_BOND_SLAVE_SRC_MAC_TYPE_LOCALLY_ADMINISTERED:
-		if (*src_mac & MAC_UL_ADMINISTERED_BIT_MASK) {
-			/* If locally administered bit already set,
-			 * use zero mac
-			 */
-			memset(src_mac, 0, ETHER_ADDR_LEN);
-			return;
-		}
-	case LLDP_BOND_SLAVE_SRC_MAC_TYPE_FIXED:
-		memcpy(src_mac, arbitrary, ETHER_ADDR_LEN);
-		return;
-	case LLDP_BOND_SLAVE_SRC_MAC_TYPE_ZERO:
-		memset(src_mac, 0, ETHER_ADDR_LEN);
-		return;
-	}
-}
-
 static int
 iface_bond_send(struct lldpd *cfg, struct lldpd_hardware *hardware,
     char *buffer, size_t size)
@@ -509,7 +477,7 @@ iface_bond_send(struct lldpd *cfg, struct lldpd_hardware *hardware,
 		    hardware->h_ifname);
 		return 0;
 	}
-	iface_mangle_mac(cfg, buffer + ETHER_ADDR_LEN);
+	interfaces_helper_mangle_mac(cfg, buffer + ETHER_ADDR_LEN);
 	return write(hardware->h_sendfd,
 	    buffer, size);
 }
diff --git a/src/daemon/interfaces.c b/src/daemon/interfaces.c
index 3f80c12d..f1c5fa43 100644
--- a/src/daemon/interfaces.c
+++ b/src/daemon/interfaces.c
@@ -556,3 +556,35 @@ interfaces_helper_physical(struct lldpd *cfg,
 #endif
 	}
 }
+
+/**
+ * Mangle the MAC address to avoid duplicates.
+ *
+ * With bonds, we have duplicate MAC address on different physical
+ * interfaces. We need to alter the source MAC address when we send on
+ * an inactive slave. We try to set "local" bit to 1 first. If it is
+ * already set to 1, use an unused MAC address instead.
+ */
+void
+interfaces_helper_mangle_mac(struct lldpd *cfg, char *src_mac)
+{
+#define MAC_UL_ADMINISTERED_BIT_MASK 0x02
+	char arbitrary[] = { 0x00, 0x60, 0x08, 0x69, 0x97, 0xef};
+
+	switch (cfg->g_config.c_bond_slave_src_mac_type) {
+	case LLDP_BOND_SLAVE_SRC_MAC_TYPE_LOCALLY_ADMINISTERED:
+		if (*src_mac & MAC_UL_ADMINISTERED_BIT_MASK) {
+			/* If locally administered bit already set,
+			 * use zero mac
+			 */
+			memset(src_mac, 0, ETHER_ADDR_LEN);
+			return;
+		}
+	case LLDP_BOND_SLAVE_SRC_MAC_TYPE_FIXED:
+		memcpy(src_mac, arbitrary, ETHER_ADDR_LEN);
+		return;
+	case LLDP_BOND_SLAVE_SRC_MAC_TYPE_ZERO:
+		memset(src_mac, 0, ETHER_ADDR_LEN);
+		return;
+	}
+}
diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h
index 58d86768..da8aea8a 100644
--- a/src/daemon/lldpd.h
+++ b/src/daemon/lldpd.h
@@ -364,6 +364,7 @@ void interfaces_helper_mgmt(struct lldpd *,
 void interfaces_helper_vlan(struct lldpd *,
     struct interfaces_device_list *);
 #endif
+void interfaces_helper_mangle_mac(struct lldpd *, char *);
 
 void interfaces_setup_multicast(struct lldpd *, const char *, int);
 int interfaces_routing_enabled(struct lldpd *);