From 0f68bbac8ecd9bfb5e8cb8ee64d6927aaf588cf0 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 23 Jun 2016 14:01:41 -0400
Subject: [PATCH] single #ifdef for protocol type

---
 I2CP.cpp | 23 +++++------------------
 I2CP.h   | 29 +++++++++--------------------
 2 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/I2CP.cpp b/I2CP.cpp
index 6e53451c..4884583e 100644
--- a/I2CP.cpp
+++ b/I2CP.cpp
@@ -114,12 +114,7 @@ namespace client
 		}	
 	}
 
-	I2CPSession::I2CPSession (I2CPServer& owner, 
-#ifdef ANDROID
-		std::shared_ptr<boost::asio::local::stream_protocol::socket> socket):
-#else
-		std::shared_ptr<boost::asio::ip::tcp::socket> socket):
-#endif
+	I2CPSession::I2CPSession (I2CPServer& owner, std::shared_ptr<proto::socket> socket):
 		m_Owner (owner), m_Socket (socket), m_Payload (nullptr),
 		m_SessionID (0xFFFF), m_MessageID (0), m_IsSendAccepted (true)
 	{
@@ -590,9 +585,9 @@ namespace client
 		m_IsRunning (false), m_Thread (nullptr),
 		m_Acceptor (m_Service, 
 #ifdef ANDROID
-            boost::asio::local::stream_protocol::endpoint(std::string (1, '\0') + interface)) // leading 0 for abstract address
+            I2CPSession::proto::endpoint(std::string (1, '\0') + interface)) // leading 0 for abstract address
 #else
-			boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(interface), port))
+			I2CPSession::proto::endpoint(boost::asio::ip::address::from_string(interface), port))
 #endif
 	{
 		memset (m_MessagesHandlers, 0, sizeof (m_MessagesHandlers));
@@ -654,21 +649,13 @@ namespace client
 
 	void I2CPServer::Accept ()
 	{
-#ifdef ANDROID
-		auto newSocket = std::make_shared<boost::asio::local::stream_protocol::socket> (m_Service);
-#else
-		auto newSocket = std::make_shared<boost::asio::ip::tcp::socket> (m_Service);
-#endif
+		auto newSocket = std::make_shared<I2CPSession::proto::socket> (m_Service);
 		m_Acceptor.async_accept (*newSocket, std::bind (&I2CPServer::HandleAccept, this,
 			std::placeholders::_1, newSocket));
 	}
 
 	void I2CPServer::HandleAccept(const boost::system::error_code& ecode,
-#ifdef ANDROID
-        std::shared_ptr<boost::asio::local::stream_protocol::socket> socket)
-#else
-		std::shared_ptr<boost::asio::ip::tcp::socket> socket)
-#endif
+		std::shared_ptr<I2CPSession::proto::socket> socket)
 	{
 		if (!ecode && socket)
 		{
diff --git a/I2CP.h b/I2CP.h
index 20f20d63..4964c575 100644
--- a/I2CP.h
+++ b/I2CP.h
@@ -99,12 +99,14 @@ namespace client
 	{
 		public:
 
-			I2CPSession (I2CPServer& owner,
 #ifdef ANDROID 
-				std::shared_ptr<boost::asio::local::stream_protocol::socket> socket);
+			typedef boost::asio::local::stream_protocol proto;
 #else
-				std::shared_ptr<boost::asio::ip::tcp::socket> socket);
-#endif
+			typedef boost::asio::ip::tcp proto;
+#endif		
+
+			I2CPSession (I2CPServer& owner, std::shared_ptr<proto::socket> socket);
+
 			~I2CPSession ();
 
 			void Start ();
@@ -149,11 +151,7 @@ namespace client
 		private:
 
 			I2CPServer& m_Owner;
-#ifdef ANDROID
-			std::shared_ptr<boost::asio::local::stream_protocol::socket> m_Socket;
-#else
-			std::shared_ptr<boost::asio::ip::tcp::socket> m_Socket;
-#endif
+			std::shared_ptr<proto::socket> m_Socket;
 			uint8_t m_Header[I2CP_HEADER_SIZE], * m_Payload;
 			size_t m_PayloadLen;
 
@@ -183,12 +181,7 @@ namespace client
 
 			void Accept ();
 
-			void HandleAccept(const boost::system::error_code& ecode,
-#ifdef ANDROID
-				std::shared_ptr<boost::asio::local::stream_protocol::socket> socket);
-#else
-				std::shared_ptr<boost::asio::ip::tcp::socket> socket);
-#endif
+			void HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<I2CPSession::proto::socket> socket);
 
 		private:
 			
@@ -198,11 +191,7 @@ namespace client
 			bool m_IsRunning;
 			std::thread * m_Thread;	
 			boost::asio::io_service m_Service;
-#ifdef ANDROID
-			boost::asio::local::stream_protocol::acceptor m_Acceptor;
-#else
-			boost::asio::ip::tcp::acceptor m_Acceptor;
-#endif
+			I2CPSession::proto::acceptor m_Acceptor;
 
 		public: