Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-27 11:17:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix sam crash on exit and datagram crash with no outbound tunnel

Browse source
This commit is contained in:
Jeff Becker 2016-12-18 12:56:34 -05:00
parent 042adb5e34
commit 965896b932
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
SAM.cpp
View file

@ -710,11 +710,6 @@ namespace client
{
PumpBacklog();
}
SAMSession::~SAMSession ()
{
i2p::client::context.DeleteLocalDestination (localDestination);
}
void SAMSession::AcceptI2P(std::shared_ptr<i2p::stream::Stream> stream)
{
@ -767,18 +762,19 @@ namespace client
void SAMSession::CloseStreams ()
{
m_BacklogPumper.cancel();
localDestination->GetService().post([&] () {
std::lock_guard<std::mutex> lock(m_SocketsMutex);
for (auto& sock : m_Sockets) {
sock->CloseStream();
}
for(auto & stream : m_Backlog) {
stream->Close();
}
// XXX: should this be done inside locked parts?
m_Sockets.clear();
m_Backlog.clear();
});
std::lock_guard<std::mutex> lock(m_SocketsMutex);
for (auto& sock : m_Sockets) {
sock->CloseStream();
}
for(auto & stream : m_Backlog) {
stream->Close();
}
m_Sockets.clear();
m_Backlog.clear();
i2p::client::context.DeleteLocalDestination (localDestination);
});
}
SAMBridge::SAMBridge (const std::string& address, int port):