From 3c6793745b80d5c782c7d979f5e9317ca5a5b99e Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 7 Apr 2014 20:34:22 -0400 Subject: [PATCH] don't delete initial SSU sessions --- Transports.cpp | 21 --------------------- Transports.h | 2 -- 2 files changed, 23 deletions(-) diff --git a/Transports.cpp b/Transports.cpp index a0c968d6..d427635c 100644 --- a/Transports.cpp +++ b/Transports.cpp @@ -92,7 +92,6 @@ namespace i2p m_DHKeysPairSupplier.Start (); m_IsRunning = true; m_Thread = new std::thread (std::bind (&Transports::Run, this)); - m_Timer = new boost::asio::deadline_timer (m_Service); // create acceptors auto addresses = context.GetRouterInfo ().GetAddresses (); for (auto& address : addresses) @@ -128,12 +127,6 @@ namespace i2p delete session.second; m_NTCPSessions.clear (); delete m_NTCPAcceptor; - - if (m_Timer) - { - m_Timer->cancel (); - delete m_Timer; - } if (m_SSUServer) { @@ -272,22 +265,8 @@ namespace i2p if (router && router->IsSSU () && m_SSUServer) m_SSUServer->GetSession (router, true); // peer test } - if (m_Timer) - { - m_Timer->expires_from_now (boost::posix_time::seconds(5)); // 5 seconds - m_Timer->async_wait (boost::bind (&Transports::HandleTimer, this, boost::asio::placeholders::error)); - } } - void Transports::HandleTimer (const boost::system::error_code& ecode) - { - if (ecode != boost::asio::error::operation_aborted) - { - // end of external IP detection - if (m_SSUServer) - m_SSUServer->DeleteAllSessions (); - } - } i2p::data::DHKeysPair * Transports::GetNextDHKeysPair () { diff --git a/Transports.h b/Transports.h index bcec7690..b0ff8455 100644 --- a/Transports.h +++ b/Transports.h @@ -71,7 +71,6 @@ namespace i2p void PostMessage (const i2p::data::IdentHash& ident, i2p::I2NPMessage * msg); void DetectExternalIP (); - void HandleTimer (const boost::system::error_code& ecode); private: @@ -83,7 +82,6 @@ namespace i2p std::map m_NTCPSessions; i2p::ssu::SSUServer * m_SSUServer; - boost::asio::deadline_timer * m_Timer; DHKeysPairSupplier m_DHKeysPairSupplier;