Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-24 01:46:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fixed crash on termination

Browse source
This commit is contained in:
orignal 2014-09-22 13:28:46 -04:00
parent cdaa72e664
commit 81a7253e0f
2 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
NTCPSession.cpp
View file

@ -35,6 +35,9 @@ namespace ntcp
delete m_DHKeysPair; delete m_DHKeysPair;
if (m_NextMessage) if (m_NextMessage)
i2p::DeleteI2NPMessage (m_NextMessage); i2p::DeleteI2NPMessage (m_NextMessage);
for (auto it :m_DelayedMessages)
i2p::DeleteI2NPMessage (it);
m_DelayedMessages.clear ();
} }
void NTCPSession::CreateAESKey (uint8_t * pubKey, uint8_t * aesKey) void NTCPSession::CreateAESKey (uint8_t * pubKey, uint8_t * aesKey)
@ -144,7 +147,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Couldn't send Phase 1 message: ", ecode.message ()); LogPrint ("Couldn't send Phase 1 message: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -160,7 +164,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Phase 1 read error: ", ecode.message ()); LogPrint ("Phase 1 read error: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -215,7 +220,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Couldn't send Phase 2 message: ", ecode.message ()); LogPrint ("Couldn't send Phase 2 message: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -231,10 +237,13 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Phase 2 read error: ", ecode.message (), ". Wrong ident assumed"); LogPrint ("Phase 2 read error: ", ecode.message (), ". Wrong ident assumed");
GetRemoteRouterInfo ().SetUnreachable (true); // this RouterInfo is not valid if (ecode != boost::asio::error::operation_aborted)
i2p::transports.ReuseDHKeysPair (m_DHKeysPair); {
m_DHKeysPair = nullptr; GetRemoteRouterInfo ().SetUnreachable (true); // this RouterInfo is not valid
Terminate (); i2p::transports.ReuseDHKeysPair (m_DHKeysPair);
m_DHKeysPair = nullptr;
Terminate ();
}
} }
else else
{ {
@ -291,7 +300,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Couldn't send Phase 3 message: ", ecode.message ()); LogPrint ("Couldn't send Phase 3 message: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -307,7 +317,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Phase 3 read error: ", ecode.message ()); LogPrint ("Phase 3 read error: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -356,7 +367,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Couldn't send Phase 4 message: ", ecode.message ()); LogPrint ("Couldn't send Phase 4 message: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -373,8 +385,11 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Phase 4 read error: ", ecode.message ()); LogPrint ("Phase 4 read error: ", ecode.message ());
GetRemoteRouterInfo ().SetUnreachable (true); // this router doesn't like us if (ecode != boost::asio::error::operation_aborted)
Terminate (); {
GetRemoteRouterInfo ().SetUnreachable (true); // this router doesn't like us
Terminate ();
}
} }
else else
{ {
@ -418,7 +433,8 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Read error: ", ecode.message ()); LogPrint ("Read error: ", ecode.message ());
Terminate (); if (ecode != boost::asio::error::operation_aborted)
Terminate ();
} }
else else
{ {
@ -604,8 +620,11 @@ namespace ntcp
if (ecode) if (ecode)
{ {
LogPrint ("Connect error: ", ecode.message ()); LogPrint ("Connect error: ", ecode.message ());
GetRemoteRouterInfo ().SetUnreachable (true); if (ecode != boost::asio::error::operation_aborted)
Terminate (); {
GetRemoteRouterInfo ().SetUnreachable (true);
Terminate ();
}
} }
else else
{ {

14
Transports.cpp
View file

@ -135,6 +135,7 @@ namespace i2p
{ {
m_SSUServer->Stop (); m_SSUServer->Stop ();
delete m_SSUServer; delete m_SSUServer;
m_SSUServer = nullptr;
} }
for (auto session: m_NTCPSessions) for (auto session: m_NTCPSessions)
@ -149,7 +150,7 @@ namespace i2p
{ {
m_Thread->join (); m_Thread->join ();
delete m_Thread; delete m_Thread;
m_Thread = 0; m_Thread = nullptr;
} }
} }
@ -188,13 +189,14 @@ namespace i2p
conn->ServerLogin (); conn->ServerLogin ();
} }
else else
{
delete conn; delete conn;
}
conn = new i2p::ntcp::NTCPServerConnection (m_Service); if (error != boost::asio::error::operation_aborted)
m_NTCPAcceptor->async_accept(conn->GetSocket (), boost::bind (&Transports::HandleAccept, this, {
conn, boost::asio::placeholders::error)); conn = new i2p::ntcp::NTCPServerConnection (m_Service);
m_NTCPAcceptor->async_accept(conn->GetSocket (), boost::bind (&Transports::HandleAccept, this,
conn, boost::asio::placeholders::error));
}
} }
i2p::ntcp::NTCPSession * Transports::GetNextNTCPSession () i2p::ntcp::NTCPSession * Transports::GetNextNTCPSession ()