master: obey vlans

When we support multiple vlans, we must issue announce to all supported vlans. Same applies to sync/follow-up. This changes state-master.c to do the sending several times. Initially I changed msg.c (for the announce message only), this saved the repeated call to msg_pack_announce() but by doing it at state-master level I have simpler code and layer consistency (doing sync/fup at msg.c level would be a mess). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

master: obey vlans
When we support multiple vlans, we must issue announce to all supported vlans. Same applies to sync/follow-up. This changes state-master.c to do the sending several times. Initially I changed msg.c (for the announce message only), this saved the repeated call to msg_pack_announce() but by doing it at state-master level I have simpler code and layer consistency (doing sync/fup at msg.c level would be a mess). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
3b985b02 · Alessandro Rubini · 80ab8482 · 3b985b02
Commit 3b985b02 authored Nov 13, 2014 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 56 additions and 2 deletions

state-master.c proto-standard/state-master.c +56 -2

No files found.
--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -9,6 +9,57 @@
 #include <ppsi/ppsi.h>
 #include "common-fun.h"

+/* Local functions that build to nothing when Kconfig selects 0/1 vlans */
+static int pp_master_issue_announce(struct pp_instance *ppi)
+{
+	int i, vlan = 0;
+
+	if (CONFIG_VLAN_ARRAY_SIZE && ppi->nvlans == 1)
+		vlan = ppi->vlans[0];
+
+	if (CONFIG_VLAN_ARRAY_SIZE <= 1 || ppi->nvlans <= 1) {
+		ppi->peer_vid = vlan;
+		return msg_issue_announce(ppi);
+	}
+
+	/*
+	 * If Kconfig selected 0/1 vlans, this code is not built.
+	 * If we have several vlans, we replace peer_vid and proceed;
+	 */
+	for (i = 0; i < ppi->nvlans; i++) {
+		ppi->peer_vid = ppi->vlans[i];
+		msg_issue_announce(ppi);
+		/* ignore errors: each vlan is separate */
+	}
+	return 0;
+}
+
+static int pp_master_issue_sync_followup(struct pp_instance *ppi)
+{
+	int i, vlan = 0;
+
+	if (CONFIG_VLAN_ARRAY_SIZE && ppi->nvlans == 1)
+		vlan = ppi->vlans[0];
+
+	if (CONFIG_VLAN_ARRAY_SIZE <= 1 || ppi->nvlans <= 1) {
+		ppi->peer_vid = vlan;
+		return msg_issue_sync_followup(ppi);
+	}
+
+	/*
+	 * If Kconfig selected 0/1 vlans, this code is not built.
+	 * If we have several vlans, we replace peer_vid and proceed;
+	 */
+	for (i = 0; i < ppi->nvlans; i++) {
+		ppi->peer_vid = ppi->vlans[i];
+		msg_issue_sync_followup(ppi);
+		/* ignore errors: each vlan is separate */
+	}
+	return 0;
+}
+
+
+/* The real state function, relying on the two above for sending */
 int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 {
 	int msgtype, d1, d2;
@@ -20,7 +71,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 				DSPOR(ppi)->logAnnounceInterval);

 		/* Send an announce immediately, when becomes master */
-		if ((e = msg_issue_announce(ppi)) < 0)
+		if ((e = pp_master_issue_announce(ppi)) < 0)
 			goto out;
 	}

@@ -28,12 +79,15 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		/* Restart the timeout for next time */
 		pp_timeout_rand(ppi, PP_TO_SYNC, DSPOR(ppi)->logSyncInterval);

-		if ((e = msg_issue_sync_followup(ppi) < 0))
+		if ((e = pp_master_issue_sync_followup(ppi) < 0))
 			goto out;

 	}

 	if (pp_timeout_z(ppi, PP_TO_ANN_INTERVAL)) {
+		if ((e = pp_master_issue_announce(ppi) < 0))
+			goto out;
+
 		/* Restart the timeout for next time */
 		pp_timeout_rand(ppi, PP_TO_ANN_INTERVAL,
 				DSPOR(ppi)->logAnnounceInterval);