Browse Source

move WaitForConnect away from constructor

pull/113/head
orignal 10 years ago
parent
commit
1a0957b571
  1. 1
      SSU.cpp
  2. 10
      SSUSession.cpp
  3. 1
      SSUSession.h

1
SSU.cpp

@ -135,6 +135,7 @@ namespace transport
if (!session) if (!session)
{ {
session = new SSUSession (*this, from); session = new SSUSession (*this, from);
session->WaitForConnect ();
m_Sessions[from] = session; m_Sessions[from] = session;
LogPrint ("New SSU session from ", from.address ().to_string (), ":", from.port (), " created"); LogPrint ("New SSU session from ", from.address ().to_string (), ":", from.port (), " created");
} }

10
SSUSession.cpp

@ -21,8 +21,6 @@ namespace transport
m_Data (*this), m_NumSentBytes (0), m_NumReceivedBytes (0) m_Data (*this), m_NumSentBytes (0), m_NumReceivedBytes (0)
{ {
m_CreationTime = i2p::util::GetSecondsSinceEpoch (); m_CreationTime = i2p::util::GetSecondsSinceEpoch ();
if (!router) // incoming session
ScheduleConnectTimer ();
} }
SSUSession::~SSUSession () SSUSession::~SSUSession ()
@ -701,6 +699,14 @@ namespace transport
} }
} }
void SSUSession::WaitForConnect ()
{
if (!m_RemoteRouter) // incoming session
ScheduleConnectTimer ();
else
LogPrint (eLogError, "SSU wait for connect for outgoing session");
}
void SSUSession::ScheduleConnectTimer () void SSUSession::ScheduleConnectTimer ()
{ {
m_Timer.cancel (); m_Timer.cancel ();

1
SSUSession.h

@ -60,6 +60,7 @@ namespace transport
~SSUSession (); ~SSUSession ();
void Connect (); void Connect ();
void WaitForConnect ();
void Introduce (uint32_t iTag, const uint8_t * iKey); void Introduce (uint32_t iTag, const uint8_t * iKey);
void WaitForIntroduction (); void WaitForIntroduction ();
void Close (); void Close ();

Loading…
Cancel
Save