From 4ad2ff2f71f7c7c73872219845f30c204f752078 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 9 Nov 2015 11:08:52 -0800
Subject: .

---
 node/Cluster.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'node/Cluster.hpp')

diff --git a/node/Cluster.hpp b/node/Cluster.hpp
index beb5ecdc..63196928 100644
--- a/node/Cluster.hpp
+++ b/node/Cluster.hpp
@@ -34,6 +34,7 @@
 #include <algorithm>
 #include <map>
 #include <utility>
+#include <list>
 
 #include "Constants.hpp"
 #include "../include/ZeroTierOne.h"
@@ -63,7 +64,7 @@
 /**
  * How often to flush outgoing message queues (maximum interval)
  */
-#define ZT_CLUSTER_FLUSH_PERIOD 300
+#define ZT_CLUSTER_FLUSH_PERIOD 250
 
 /**
  * Maximum number of queued outgoing packets per sender address
@@ -73,7 +74,7 @@
 /**
  * Expiration time for send queue entries
  */
-#define ZT_CLUSTER_QUEUE_EXPIRATION 2500
+#define ZT_CLUSTER_QUEUE_EXPIRATION 1500
 
 namespace ZeroTier {
 
@@ -382,7 +383,7 @@ private:
 		bool unite;
 		unsigned char data[ZT_PROTO_MAX_PACKET_LENGTH];
 	};
-	std::multimap<Address,_SQE *> _sendViaClusterQueue; // queue by from peer address
+	std::map< Address,std::list<_SQE> > _sendViaClusterQueue;
 	Mutex _sendViaClusterQueue_m;
 
 	uint64_t _lastFlushed;
-- 
cgit v1.2.3