Add thread PTR that gets passed through the entire ZT core call stack and then passed to handler functions resulting from a call.

1 files changed, 27 insertions, 27 deletions

diff --git a/node/Topology.cpp b/node/Topology.cpp
index 21547cd2..a1d37332 100644
--- a/node/Topology.cpp
+++ b/node/Topology.cpp
@@ -55,19 +55,19 @@ namespace ZeroTier {
 #define ZT_DEFAULT_WORLD_LENGTH 634
 static const unsigned char ZT_DEFAULT_WORLD[ZT_DEFAULT_WORLD_LENGTH] = {0x01,0x00,0x00,0x00,0x00,0x08,0xea,0xc9,0x0a,0x00,0x00,0x01,0x52,0x3c,0x32,0x50,0x1a,0xb8,0xb3,0x88,0xa4,0x69,0x22,0x14,0x91,0xaa,0x9a,0xcd,0x66,0xcc,0x76,0x4c,0xde,0xfd,0x56,0x03,0x9f,0x10,0x67,0xae,0x15,0xe6,0x9c,0x6f,0xb4,0x2d,0x7b,0x55,0x33,0x0e,0x3f,0xda,0xac,0x52,0x9c,0x07,0x92,0xfd,0x73,0x40,0xa6,0xaa,0x21,0xab,0xa8,0xa4,0x89,0xfd,0xae,0xa4,0x4a,0x39,0xbf,0x2d,0x00,0x65,0x9a,0xc9,0xc8,0x18,0xeb,0x4a,0xf7,0x86,0xa8,0x40,0xd6,0x52,0xea,0xae,0x9e,0x7a,0xbf,0x4c,0x97,0x66,0xab,0x2d,0x6f,0xaf,0xc9,0x2b,0x3a,0xff,0xed,0xd6,0x30,0x3e,0xc4,0x6a,0x65,0xf2,0xbd,0x83,0x52,0xf5,0x40,0xe9,0xcc,0x0d,0x6e,0x89,0x3f,0x9a,0xa0,0xb8,0xdf,0x42,0xd2,0x2f,0x84,0xe6,0x03,0x26,0x0f,0xa8,0xe3,0xcc,0x05,0x05,0x03,0xef,0x12,0x80,0x0d,0xce,0x3e,0xb6,0x58,0x3b,0x1f,0xa8,0xad,0xc7,0x25,0xf9,0x43,0x71,0xa7,0x5c,0x9a,0xc7,0xe1,0xa3,0xb8,0x88,0xd0,0x71,0x6c,0x94,0x99,0x73,0x41,0x0b,0x1b,0x48,0x84,0x02,0x9d,0x21,0x90,0x39,0xf3,0x00,0x01,0xf0,0x92,0x2a,0x98,0xe3,0xb3,0x4e,0xbc,0xbf,0xf3,0x33,0x26,0x9d,0xc2,0x65,0xd7,0xa0,0x20,0xaa,0xb6,0x9d,0x72,0xbe,0x4d,0x4a,0xcc,0x9c,0x8c,0x92,0x94,0x78,0x57,0x71,0x25,0x6c,0xd1,0xd9,0x42,0xa9,0x0d,0x1b,0xd1,0xd2,0xdc,0xa3,0xea,0x84,0xef,0x7d,0x85,0xaf,0xe6,0x61,0x1f,0xb4,0x3f,0xf0,0xb7,0x41,0x26,0xd9,0x0a,0x6e,0x00,0x0c,0x04,0xbc,0xa6,0x5e,0xb1,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x7d,0x00,0x01,0x27,0x09,0x04,0x9a,0x42,0xc5,0x21,0x27,0x09,0x06,0x2c,0x0f,0xf8,0x50,0x01,0x54,0x01,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x27,0x09,0x04,0x9f,0xcb,0x61,0xab,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x54,0x60,0x01,0x27,0x09,0x04,0xa9,0x39,0x8f,0x68,0x27,0x09,0x06,0x26,0x07,0xf0,0xd0,0x1d,0x01,0x00,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x27,0x09,0x04,0x6b,0xaa,0xc5,0x0e,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x02,0x00,0xe0,0x01,0x27,0x09,0x04,0x80,0xc7,0xc5,0xd9,0x27,0x09,0x06,0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xb7,0x40,0x01,0x27,0x09,0x88,0x41,0x40,0x8a,0x2e,0x00,0xbb,0x1d,0x31,0xf2,0xc3,0x23,0xe2,0x64,0xe9,0xe6,0x41,0x72,0xc1,0xa7,0x4f,0x77,0x89,0x95,0x55,0xed,0x10,0x75,0x1c,0xd5,0x6e,0x86,0x40,0x5c,0xde,0x11,0x8d,0x02,0xdf,0xfe,0x55,0x5d,0x46,0x2c,0xcf,0x6a,0x85,0xb5,0x63,0x1c,0x12,0x35,0x0c,0x8d,0x5d,0xc4,0x09,0xba,0x10,0xb9,0x02,0x5d,0x0f,0x44,0x5c,0xf4,0x49,0xd9,0x2b,0x1c,0x00,0x0c,0x04,0x2d,0x20,0xc6,0x82,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x64,0x00,0x81,0xc3,0x54,0x00,0x00,0xff,0xfe,0x18,0x1d,0x61,0x27,0x09,0x04,0x2e,0x65,0xa0,0xf9,0x27,0x09,0x06,0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x6a,0x30,0x01,0x27,0x09,0x04,0x6b,0xbf,0x2e,0xd2,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x68,0x00,0x83,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x27,0x09,0x04,0x2d,0x20,0xf6,0xb3,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x58,0x00,0x8b,0xf8,0x54,0x00,0x00,0xff,0xfe,0x15,0xb3,0x9a,0x27,0x09,0x04,0x2d,0x20,0xf8,0x57,0x27,0x09,0x06,0x20,0x01,0x19,0xf0,0x70,0x00,0x9b,0xc9,0x54,0x00,0x00,0xff,0xfe,0x15,0xc4,0xf5,0x27,0x09,0x04,0x9f,0xcb,0x02,0x9a,0x27,0x09,0x06,0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x26,0x70,0x01,0x27,0x09};
 
-Topology::Topology(const RuntimeEnvironment *renv) :
+Topology::Topology(const RuntimeEnvironment *renv,void *tPtr) :
 	RR(renv),
 	_trustedPathCount(0),
 	_amRoot(false)
 {
 	try {
 		World cachedPlanet;
-		std::string buf(RR->node->dataStoreGet("planet"));
+		std::string buf(RR->node->dataStoreGet(tPtr,"planet"));
 		if (buf.length() > 0) {
 			Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> dswtmp(buf.data(),(unsigned int)buf.length());
 			cachedPlanet.deserialize(dswtmp,0);
 		}
-		addWorld(cachedPlanet,false);
+		addWorld(tPtr,cachedPlanet,false);
 	} catch ( ... ) {}
 
 	World defaultPlanet;
@@ -75,10 +75,10 @@ Topology::Topology(const RuntimeEnvironment *renv) :
 		Buffer<ZT_DEFAULT_WORLD_LENGTH> wtmp(ZT_DEFAULT_WORLD,ZT_DEFAULT_WORLD_LENGTH);
 		defaultPlanet.deserialize(wtmp,0); // throws on error, which would indicate a bad static variable up top
 	}
-	addWorld(defaultPlanet,false);
+	addWorld(tPtr,defaultPlanet,false);
 }
 
-SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &peer)
+SharedPtr<Peer> Topology::addPeer(void *tPtr,const SharedPtr<Peer> &peer)
 {
 #ifdef ZT_TRACE
 	if ((!peer)||(peer->address() == RR->identity.address())) {
@@ -98,12 +98,12 @@ SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &peer)
 		np = hp;
 	}
 
-	saveIdentity(np->identity());
+	saveIdentity(tPtr,np->identity());
 
 	return np;
 }
 
-SharedPtr<Peer> Topology::getPeer(const Address &zta)
+SharedPtr<Peer> Topology::getPeer(void *tPtr,const Address &zta)
 {
 	if (zta == RR->identity.address()) {
 		TRACE("BUG: ignored attempt to getPeer() for self, returned NULL");
@@ -118,7 +118,7 @@ SharedPtr<Peer> Topology::getPeer(const Address &zta)
 	}
 
 	try {
-		Identity id(_getIdentity(zta));
+		Identity id(_getIdentity(tPtr,zta));
 		if (id) {
 			SharedPtr<Peer> np(new Peer(RR,RR->identity,id));
 			{
@@ -134,7 +134,7 @@ SharedPtr<Peer> Topology::getPeer(const Address &zta)
 	return SharedPtr<Peer>();
 }
 
-Identity Topology::getIdentity(const Address &zta)
+Identity Topology::getIdentity(void *tPtr,const Address &zta)
 {
 	if (zta == RR->identity.address()) {
 		return RR->identity;
@@ -144,15 +144,15 @@ Identity Topology::getIdentity(const Address &zta)
 		if (ap)
 			return (*ap)->identity();
 	}
-	return _getIdentity(zta);
+	return _getIdentity(tPtr,zta);
 }
 
-void Topology::saveIdentity(const Identity &id)
+void Topology::saveIdentity(void *tPtr,const Identity &id)
 {
 	if (id) {
 		char p[128];
 		Utils::snprintf(p,sizeof(p),"iddb.d/%.10llx",(unsigned long long)id.address().toInt());
-		RR->node->dataStorePut(p,id.toString(false),false);
+		RR->node->dataStorePut(tPtr,p,id.toString(false),false);
 	}
 }
 
@@ -264,7 +264,7 @@ bool Topology::isProhibitedEndpoint(const Address &ztaddr,const InetAddress &ipa
 	return false;
 }
 
-bool Topology::addWorld(const World &newWorld,bool alwaysAcceptNew)
+bool Topology::addWorld(void *tPtr,const World &newWorld,bool alwaysAcceptNew)
 {
 	if ((newWorld.type() != World::TYPE_PLANET)&&(newWorld.type() != World::TYPE_MOON))
 		return false;
@@ -328,29 +328,29 @@ bool Topology::addWorld(const World &newWorld,bool alwaysAcceptNew)
 	try {
 		Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> dswtmp;
 		existing->serialize(dswtmp,false);
-		RR->node->dataStorePut(savePath,dswtmp.data(),dswtmp.size(),false);
+		RR->node->dataStorePut(tPtr,savePath,dswtmp.data(),dswtmp.size(),false);
 	} catch ( ... ) {
-		RR->node->dataStoreDelete(savePath);
+		RR->node->dataStoreDelete(tPtr,savePath);
 	}
 
-	_memoizeUpstreams();
+	_memoizeUpstreams(tPtr);
 
 	return true;
 }
 
-void Topology::addMoon(const uint64_t id,const Address &seed)
+void Topology::addMoon(void *tPtr,const uint64_t id,const Address &seed)
 {
 	char savePath[64];
 	Utils::snprintf(savePath,sizeof(savePath),"moons.d/%.16llx.moon",id);
 
 	try {
-		std::string moonBin(RR->node->dataStoreGet(savePath));
+		std::string moonBin(RR->node->dataStoreGet(tPtr,savePath));
 		if (moonBin.length() > 1) {
 			Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH> wtmp(moonBin.data(),(unsigned int)moonBin.length());
 			World w;
 			w.deserialize(wtmp);
 			if ((w.type() == World::TYPE_MOON)&&(w.id() == id)) {
-				addWorld(w,true);
+				addWorld(tPtr,w,true);
 				return;
 			}
 		}
@@ -363,7 +363,7 @@ void Topology::addMoon(const uint64_t id,const Address &seed)
 	}
 }
 
-void Topology::removeMoon(const uint64_t id)
+void Topology::removeMoon(void *tPtr,const uint64_t id)
 {
 	Mutex::Lock _l1(_upstreams_m);
 	Mutex::Lock _l2(_peers_m);
@@ -375,7 +375,7 @@ void Topology::removeMoon(const uint64_t id)
 		} else {
 			char savePath[64];
 			Utils::snprintf(savePath,sizeof(savePath),"moons.d/%.16llx.moon",id);
-			RR->node->dataStoreDelete(savePath);
+			RR->node->dataStoreDelete(tPtr,savePath);
 		}
 	}
 	_moons.swap(nm);
@@ -387,7 +387,7 @@ void Topology::removeMoon(const uint64_t id)
 	}
 	_moonSeeds.swap(cm);
 
-	_memoizeUpstreams();
+	_memoizeUpstreams(tPtr);
 }
 
 void Topology::clean(uint64_t now)
@@ -415,11 +415,11 @@ void Topology::clean(uint64_t now)
 	}
 }
 
-Identity Topology::_getIdentity(const Address &zta)
+Identity Topology::_getIdentity(void *tPtr,const Address &zta)
 {
 	char p[128];
 	Utils::snprintf(p,sizeof(p),"iddb.d/%.10llx",(unsigned long long)zta.toInt());
-	std::string ids(RR->node->dataStoreGet(p));
+	std::string ids(RR->node->dataStoreGet(tPtr,p));
 	if (ids.length() > 0) {
 		try {
 			return Identity(ids);
@@ -428,7 +428,7 @@ Identity Topology::_getIdentity(const Address &zta)
 	return Identity();
 }
 
-void Topology::_memoizeUpstreams()
+void Topology::_memoizeUpstreams(void *tPtr)
 {
 	// assumes _upstreams_m and _peers_m are locked
 	_upstreamAddresses.clear();
@@ -442,7 +442,7 @@ void Topology::_memoizeUpstreams()
 			SharedPtr<Peer> &hp = _peers[i->identity.address()];
 			if (!hp) {
 				hp = new Peer(RR,RR->identity,i->identity);
-				saveIdentity(i->identity);
+				saveIdentity(tPtr,i->identity);
 			}
 		}
 	}
@@ -456,7 +456,7 @@ void Topology::_memoizeUpstreams()
 				SharedPtr<Peer> &hp = _peers[i->identity.address()];
 				if (!hp) {
 					hp = new Peer(RR,RR->identity,i->identity);
-					saveIdentity(i->identity);
+					saveIdentity(tPtr,i->identity);
 				}
 			}
 		}