From 6693149f3e2d1557f007ace99987694a34ebe6f8 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 1 Oct 2015 13:34:12 -0700
Subject: [PATCH] Send COM with MULTICAST_GATHER for future use.

---
 node/Multicaster.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp
index 07792737a..420a00ff4 100644
--- a/node/Multicaster.cpp
+++ b/node/Multicaster.cpp
@@ -237,12 +237,25 @@ void Multicaster::send(
 			if (sn) {
 				TRACE(">>MC upstream GATHER up to %u for group %.16llx/%s",gatherLimit,nwid,mg.toString().c_str());
 
+				const CertificateOfMembership *com = (CertificateOfMembership *)0;
+				if (sn->needsOurNetworkMembershipCertificate(nwid,now,true)) {
+					SharedPtr<Network> nw = RR->node->network(nwid);
+					SharedPtr<NetworkConfig> nconf;
+					if (nw) {
+						nconf = nw->config2();
+						if (nconf)
+							com = &(nconf->com());
+					}
+				}
+
 				Packet outp(sn->address(),RR->identity.address(),Packet::VERB_MULTICAST_GATHER);
 				outp.append(nwid);
-				outp.append((uint8_t)0);
+				outp.append((uint8_t)(com ? 0x01 : 0x00));
 				mg.mac().appendTo(outp);
 				outp.append((uint32_t)mg.adi());
 				outp.append((uint32_t)gatherLimit);
+				if (com)
+					com->serialize(outp);
 				outp.armor(sn->key(),true);
 				sn->send(RR,outp.data(),outp.size(),now);
 			}