Browse Source

detach tunnles from poll

pull/102/head
orignal 10 years ago
parent
commit
2ab597be20
  1. 6
      Tunnel.cpp
  2. 5
      TunnelPool.cpp
  3. 3
      TunnelPool.h

6
Tunnel.cpp

@ -297,7 +297,11 @@ namespace tunnel
void Tunnels::DeleteTunnelPool (TunnelPool * pool) void Tunnels::DeleteTunnelPool (TunnelPool * pool)
{ {
if (pool) pool->SetDeleted (); if (pool)
{
pool->DetachTunnels ();
pool->SetDeleted ();
}
} }
void Tunnels::AddTransitTunnel (TransitTunnel * tunnel) void Tunnels::AddTransitTunnel (TransitTunnel * tunnel)

5
TunnelPool.cpp

@ -17,6 +17,11 @@ namespace tunnel
} }
TunnelPool::~TunnelPool () TunnelPool::~TunnelPool ()
{
DetachTunnels ();
}
void TunnelPool::DetachTunnels ()
{ {
{ {
std::unique_lock<std::mutex> l(m_InboundTunnelsMutex); std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);

3
TunnelPool.h

@ -49,7 +49,8 @@ namespace tunnel
void ProcessDeliveryStatus (I2NPMessage * msg); void ProcessDeliveryStatus (I2NPMessage * msg);
bool IsDeleted () const { return m_IsDeleted; }; bool IsDeleted () const { return m_IsDeleted; };
void SetDeleted () { m_IsDeleted = true; } void SetDeleted () { m_IsDeleted = true; };
void DetachTunnels ();
private: private:

Loading…
Cancel
Save