e1lama/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-07 06:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete all streams upon deletion of a local destination

Browse Source
This commit is contained in:
orignal
2014-09-24 17:51:21 -04:00
parent 393d4bc231
commit ec624c89b2
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HTTPServer.cpp
View File

@@ -505,6 +505,7 @@ namespace util
{ {
m_Stream->Close (); m_Stream->Close ();
DeleteStream (m_Stream); DeleteStream (m_Stream);
m_Stream = nullptr;
} }
m_Socket->close (); m_Socket->close ();
delete this; delete this;

4
SAM.cpp
View File

@@ -18,7 +18,7 @@ namespace stream
if (m_Stream) if (m_Stream)
{ {
m_Stream->Close (); m_Stream->Close ();
delete m_Stream; DeleteStream (m_Stream);
} }
} }
@@ -27,7 +27,7 @@ namespace stream
if (m_Stream) if (m_Stream)
{ {
m_Stream->Close (); m_Stream->Close ();
delete m_Stream; DeleteStream (m_Stream);
m_Stream = nullptr; m_Stream = nullptr;
} }
delete this; delete this;

4
Streaming.cpp
View File

@@ -38,6 +38,7 @@ namespace stream
Stream::~Stream () Stream::~Stream ()
{ {
Close ();
m_ReceiveTimer.cancel (); m_ReceiveTimer.cancel ();
m_ResendTimer.cancel (); m_ResendTimer.cancel ();
while (!m_ReceiveQueue.empty ()) while (!m_ReceiveQueue.empty ())
@@ -561,7 +562,8 @@ namespace stream
StreamingDestination::~StreamingDestination () StreamingDestination::~StreamingDestination ()
{ {
// TODO: delete streams for (auto it: m_Streams)
delete it.second;
if (m_Pool) if (m_Pool)
i2p::tunnel::tunnels.DeleteTunnelPool (m_Pool); i2p::tunnel::tunnels.DeleteTunnelPool (m_Pool);
delete m_LeaseSet; delete m_LeaseSet;