some cleanup

evmarkov · Dec 10, 2014 · c8e3405 · c8e3405
1 parent a2d69a8
commit c8e3405
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/I2NPProtocol.cpp b/I2NPProtocol.cpp
@@ -161,7 +161,7 @@ namespace i2p
 			buf[32] = 1; // 1 tag
 			rnd.GenerateBlock (buf + 33, 32); // tag
 			if (pool)
-				pool->GetGarlicDestination ().SubmitSessionKey (buf, buf + 33); // introduce new key-tag to garlic engine
+				pool->GetLocalDestination ().SubmitSessionKey (buf, buf + 33); // introduce new key-tag to garlic engine
 			else
 				LogPrint ("Destination for encrypteed reply not specified");
 			buf += 65;
@@ -563,7 +563,7 @@ namespace i2p
 				case eI2NPGarlic:
 					LogPrint ("Garlic");
 					if (msg->from && msg->from->GetTunnelPool ())
-						msg->from->GetTunnelPool ()->GetGarlicDestination ().ProcessGarlicMessage (msg);
+						msg->from->GetTunnelPool ()->GetLocalDestination ().ProcessGarlicMessage (msg);
 					else
 						i2p::context.ProcessGarlicMessage (msg); 
 				break;

diff --git a/Tunnel.cpp b/Tunnel.cpp
@@ -221,7 +221,7 @@ namespace tunnel
 		m_PendingTunnels.clear ();*/
 
 		for (auto& it: m_Pools)
-			delete it.second;
+			delete it;
 		m_Pools.clear ();
 	}	
 
@@ -291,7 +291,7 @@ namespace tunnel
 	{
 		auto pool = new TunnelPool (localDestination, numInboundHops, numOutboundHops);
 		std::unique_lock<std::mutex> l(m_PoolsMutex);
-		m_Pools[pool->GetIdentHash ()] = pool;
+		m_Pools.push_back (pool);
 		return pool;
 	}	
 
@@ -300,7 +300,10 @@ namespace tunnel
 		if (pool)
 		{	
 			StopTunnelPool (pool);
-			m_Pools.erase (pool->GetLocalDestination ().GetIdentHash ());
+			{
+				std::unique_lock<std::mutex> l(m_PoolsMutex);
+				m_Pools.remove (pool);
+			}	
 			for (auto it: m_PendingTunnels)
 				if (it.second->GetTunnelPool () == pool)
 					it.second->SetTunnelPool (nullptr);
@@ -551,7 +554,7 @@ namespace tunnel
 		std::unique_lock<std::mutex> l(m_PoolsMutex);
 		for (auto it: m_Pools)
 		{	
-			TunnelPool * pool = it.second;
+			TunnelPool * pool = it;
 			if (pool->IsActive ())
 			{	
 				pool->CreateTunnels ();

diff --git a/Tunnel.h b/Tunnel.h
@@ -157,7 +157,7 @@ namespace tunnel
 			std::mutex m_TransitTunnelsMutex;
 			std::map<uint32_t, TransitTunnel *> m_TransitTunnels;
 			std::mutex m_PoolsMutex;
-			std::map<i2p::data::IdentHash, TunnelPool *> m_Pools;
+			std::list<TunnelPool *> m_Pools;
 			TunnelPool * m_ExploratoryPool;
 			i2p::util::Queue<I2NPMessage> m_Queue;
 

diff --git a/TunnelPool.h b/TunnelPool.h
@@ -30,9 +30,8 @@ namespace tunnel
 			~TunnelPool ();
 
 			const uint8_t * GetEncryptionPrivateKey () const { return m_LocalDestination.GetEncryptionPrivateKey (); };
-			const uint8_t * GetEncryptionPublicKey () const { return m_LocalDestination.GetEncryptionPublicKey (); };
-			const i2p::data::LocalDestination& GetLocalDestination () const { return m_LocalDestination; };			
-			i2p::garlic::GarlicDestination& GetGarlicDestination () const { return m_LocalDestination; };	
+			const uint8_t * GetEncryptionPublicKey () const { return m_LocalDestination.GetEncryptionPublicKey (); };		
+			i2p::garlic::GarlicDestination& GetLocalDestination () const { return m_LocalDestination; };	
 			bool IsExploratory () const { return GetIdentHash () == i2p::context.GetIdentHash (); };		
 
 			void CreateTunnels ();