From 44af828aa42b129ccef5bec5d752ccb41d0828cf Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Thu, 12 Nov 2020 22:21:43 -0500
Subject: [PATCH] Tweak multicast settings to prevent failures due to TX queue
 overflow.

---
 node/Constants.hpp   | 2 +-
 node/Multicaster.cpp | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/node/Constants.hpp b/node/Constants.hpp
index 6cd4aa709..3445e2613 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -224,7 +224,7 @@
 /**
  * How often Topology::clean() and Network::clean() and similar are called, in ms
  */
-#define ZT_HOUSEKEEPING_PERIOD 60000
+#define ZT_HOUSEKEEPING_PERIOD 30000
 
 /**
  * Delay between WHOIS retries in ms
diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp
index 8556acc67..4856b88ee 100644
--- a/node/Multicaster.cpp
+++ b/node/Multicaster.cpp
@@ -262,9 +262,8 @@ void Multicaster::send(
 				}
 			}
 		} else {
-			if (gs.txQueue.size() >= ZT_TX_QUEUE_SIZE) {
-				RR->t->outgoingNetworkFrameDropped(tPtr,network,src,mg.mac(),etherType,0,len,"multicast TX queue is full");
-				return;
+			while (gs.txQueue.size() >= ZT_TX_QUEUE_SIZE) {
+				gs.txQueue.pop_front();
 			}
 
 			const unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;