From fbb5bb2f05de11cd15ed66677f16490253b6dc70 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Fri, 16 Sep 2016 10:31:11 -0400
Subject: [PATCH] fix #634.don't create timer in constructor

---
 ClientContext.cpp | 51 +++++++++++++++++++++--------------------------
 ClientContext.h   |  5 +----
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/ClientContext.cpp b/ClientContext.cpp
index 3eee42b2..b7300ad2 100644
--- a/ClientContext.cpp
+++ b/ClientContext.cpp
@@ -17,8 +17,7 @@ namespace client
 
 	ClientContext::ClientContext (): m_SharedLocalDestination (nullptr),
 		m_HttpProxy (nullptr), m_SocksProxy (nullptr), m_SamBridge (nullptr), 
-		m_BOBCommandChannel (nullptr), m_I2CPServer (nullptr),
-		m_CleanupUDPTimer(m_Service, boost::posix_time::seconds(1))
+		m_BOBCommandChannel (nullptr), m_I2CPServer (nullptr)
 	{
 	}
 	
@@ -88,19 +87,8 @@ namespace client
 			}
 		}
 
-		if ( m_ServiceThread == nullptr ) {
-			m_ServiceThread = new std::thread([&] () {
-					LogPrint(eLogInfo, "ClientContext: starting service");
-					m_Service.run();
-					LogPrint(eLogError, "ClientContext: service died");
-			});
-			ScheduleCleanupUDP();
-		}
-
-    	
 		// I2P tunnels
-		ReadTunnels ();
-
+		ReadTunnels ();		
     
 		// SAM
 		bool sam; i2p::config::GetOption("sam.enabled", sam);
@@ -149,6 +137,13 @@ namespace client
 		} 
 
 		m_AddressBook.StartResolvers ();	
+
+		// start UDP cleanup
+		if (!m_ServerForwards.empty ())
+		{
+			m_CleanupUDPTimer.reset (new boost::asio::deadline_timer(m_SharedLocalDestination->GetService ()));
+			ScheduleCleanupUDP();
+		}
 	}
 		
 	void ClientContext::Stop ()
@@ -210,25 +205,22 @@ namespace client
 		LogPrint(eLogInfo, "Clients: stopping AddressBook");
 		m_AddressBook.Stop ();
 
-    {
+    	{
 			std::lock_guard<std::mutex> lock(m_ForwardsMutex);
 			m_ServerForwards.clear();
 			m_ClientForwards.clear();
 		}
 		
-		
+		if (m_CleanupUDPTimer)
+		{
+			m_CleanupUDPTimer->cancel ();	
+			m_CleanupUDPTimer = nullptr;	
+		}
+
 		for (auto& it: m_Destinations)
 			it.second->Stop ();
 		m_Destinations.clear ();
 		m_SharedLocalDestination = nullptr;
-		// stop io service thread
-		if(m_ServiceThread)
-		{
-			m_Service.stop();
-			m_ServiceThread->join();
-			delete m_ServiceThread;
-			m_ServiceThread = nullptr;
-		}
 	}	
 
 	void ClientContext::ReloadConfig ()
@@ -558,9 +550,12 @@ namespace client
   
 	void ClientContext::ScheduleCleanupUDP()
 	{
-		// schedule cleanup in 1 second
-		m_CleanupUDPTimer.expires_at(m_CleanupUDPTimer.expires_at() + boost::posix_time::seconds(1));
-		m_CleanupUDPTimer.async_wait(std::bind(&ClientContext::CleanupUDP, this, std::placeholders::_1));
+		if (m_CleanupUDPTimer)
+		{
+			// schedule cleanup in 17 seconds
+			m_CleanupUDPTimer->expires_from_now (boost::posix_time::seconds (17));
+			m_CleanupUDPTimer->async_wait(std::bind(&ClientContext::CleanupUDP, this, std::placeholders::_1));
+		}
 	}
 
 	void ClientContext::CleanupUDP(const boost::system::error_code & ecode)
@@ -568,7 +563,7 @@ namespace client
 		if(!ecode)
 		{
 			std::lock_guard<std::mutex> lock(m_ForwardsMutex);
-			for ( auto & s : m_ServerForwards ) s.second->ExpireStale();
+			for (auto & s : m_ServerForwards ) s.second->ExpireStale();
 			ScheduleCleanupUDP();
 		}
 	}
diff --git a/ClientContext.h b/ClientContext.h
index 581ff466..1a41acfc 100644
--- a/ClientContext.h
+++ b/ClientContext.h
@@ -101,10 +101,7 @@ namespace client
 			BOBCommandChannel * m_BOBCommandChannel;
 			I2CPServer * m_I2CPServer;
 
-			boost::asio::io_service m_Service;
-			std::thread * m_ServiceThread;
-
-			boost::asio::deadline_timer m_CleanupUDPTimer;
+			std::unique_ptr<boost::asio::deadline_timer> m_CleanupUDPTimer;
 			
 		public:
 			// for HTTP