From 57516cfbe6f1b00cdd52ece9e861a8f6189232bf Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Fri, 13 Nov 2020 21:01:55 -0500
Subject: [PATCH] revert queue... not quite what we need

---
 service/OneService.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/service/OneService.cpp b/service/OneService.cpp
index f94b3af63..aef2584f7 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -529,7 +529,6 @@ public:
 		ZT_VirtualNetworkConfig config; // memcpy() of raw config from core
 		std::vector<InetAddress> managedIps;
 		std::map< InetAddress, SharedPtr<ManagedRoute> > managedRoutes;
-		std::list< InetAddress > routeSyncQueue;
 		NetworkSettings settings;
 	};
 	std::map<uint64_t,NetworkState> _nets;
@@ -918,21 +917,6 @@ public:
 					OSUtils::cleanDirectory((_homePath + ZT_PATH_SEPARATOR_S "peers.d").c_str(),now - 2592000000LL); // delete older than 30 days
 				}
 
-				// Check to see if we have to sync any managed routes, and if so do it every 100ms to
-				// avoid route dependency problems.
-				{
-					Mutex::Lock nl(_nets_m);
-					for(std::map<uint64_t,NetworkState>::iterator n(_nets.begin());n!=_nets.end();++n) {
-						if (!n->second.routeSyncQueue.empty()) {
-							std::map< InetAddress, SharedPtr<ManagedRoute> >::const_iterator mr(n->second.managedRoutes.find(n->second.routeSyncQueue.front()));
-							if (mr != n->second.managedRoutes.end())
-								mr->second->sync();
-							n->second.routeSyncQueue.pop_front();
-							dl = now + 100;
-						}
-					}
-				}
-
 				const unsigned long delay = (dl > now) ? (unsigned long)(dl - now) : 500;
 				clockShouldBe = now + (int64_t)delay;
 				_phy.poll(delay);
@@ -2018,11 +2002,11 @@ public:
 			// that do not yet have routes in the system.
 			for(std::map< InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes.begin());r!=n.managedRoutes.end();++r) {
 				if (!r->second->via())
-					n.routeSyncQueue.push_back(r->first);
+					n->second->sync();
 			}
 			for(std::map< InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes.begin());r!=n.managedRoutes.end();++r) {
 				if (r->second->via())
-					n.routeSyncQueue.push_back(r->first);
+					n->second->sync();
 			}
 		}