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

single #ifdef for protocol type

Browse source
This commit is contained in:
orignal 2016-06-23 14:01:41 -04:00
parent 13e965096b
commit 0f68bbac8e
2 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
I2CP.cpp
View file

@ -114,12 +114,7 @@ namespace client
} }
} }
I2CPSession::I2CPSession (I2CPServer& owner, I2CPSession::I2CPSession (I2CPServer& owner, std::shared_ptr<proto::socket> socket):
#ifdef ANDROID
std::shared_ptr<boost::asio::local::stream_protocol::socket> socket):
#else
std::shared_ptr<boost::asio::ip::tcp::socket> socket):
#endif
m_Owner (owner), m_Socket (socket), m_Payload (nullptr), m_Owner (owner), m_Socket (socket), m_Payload (nullptr),
m_SessionID (0xFFFF), m_MessageID (0), m_IsSendAccepted (true) m_SessionID (0xFFFF), m_MessageID (0), m_IsSendAccepted (true)
{ {
@ -590,9 +585,9 @@ namespace client
m_IsRunning (false), m_Thread (nullptr), m_IsRunning (false), m_Thread (nullptr),
m_Acceptor (m_Service, m_Acceptor (m_Service,
#ifdef ANDROID #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 #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 #endif
{ {
memset (m_MessagesHandlers, 0, sizeof (m_MessagesHandlers)); memset (m_MessagesHandlers, 0, sizeof (m_MessagesHandlers));
@ -654,21 +649,13 @@ namespace client
void I2CPServer::Accept () void I2CPServer::Accept ()
{ {
#ifdef ANDROID auto newSocket = std::make_shared<I2CPSession::proto::socket> (m_Service);
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
m_Acceptor.async_accept (*newSocket, std::bind (&I2CPServer::HandleAccept, this, m_Acceptor.async_accept (*newSocket, std::bind (&I2CPServer::HandleAccept, this,
std::placeholders::_1, newSocket)); std::placeholders::_1, newSocket));
} }
void I2CPServer::HandleAccept(const boost::system::error_code& ecode, void I2CPServer::HandleAccept(const boost::system::error_code& ecode,
#ifdef ANDROID std::shared_ptr<I2CPSession::proto::socket> socket)
std::shared_ptr<boost::asio::local::stream_protocol::socket> socket)
#else
std::shared_ptr<boost::asio::ip::tcp::socket> socket)
#endif
{ {
if (!ecode && socket) if (!ecode && socket)
{ {

27
I2CP.h
View file

@ -99,12 +99,14 @@ namespace client
{ {
public: public:
I2CPSession (I2CPServer& owner,
#ifdef ANDROID #ifdef ANDROID
std::shared_ptr<boost::asio::local::stream_protocol::socket> socket); typedef boost::asio::local::stream_protocol proto;
#else #else
std::shared_ptr<boost::asio::ip::tcp::socket> socket); typedef boost::asio::ip::tcp proto;
#endif #endif
I2CPSession (I2CPServer& owner, std::shared_ptr<proto::socket> socket);
~I2CPSession (); ~I2CPSession ();
void Start (); void Start ();
@ -149,11 +151,7 @@ namespace client
private: private:
I2CPServer& m_Owner; I2CPServer& m_Owner;
#ifdef ANDROID std::shared_ptr<proto::socket> m_Socket;
std::shared_ptr<boost::asio::local::stream_protocol::socket> m_Socket;
#else
std::shared_ptr<boost::asio::ip::tcp::socket> m_Socket;
#endif
uint8_t m_Header[I2CP_HEADER_SIZE], * m_Payload; uint8_t m_Header[I2CP_HEADER_SIZE], * m_Payload;
size_t m_PayloadLen; size_t m_PayloadLen;
@ -183,12 +181,7 @@ namespace client
void Accept (); void Accept ();
void HandleAccept(const boost::system::error_code& ecode, void HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<I2CPSession::proto::socket> socket);
#ifdef ANDROID
std::shared_ptr<boost::asio::local::stream_protocol::socket> socket);
#else
std::shared_ptr<boost::asio::ip::tcp::socket> socket);
#endif
private: private:
@ -198,11 +191,7 @@ namespace client
bool m_IsRunning; bool m_IsRunning;
std::thread * m_Thread; std::thread * m_Thread;
boost::asio::io_service m_Service; boost::asio::io_service m_Service;
#ifdef ANDROID I2CPSession::proto::acceptor m_Acceptor;
boost::asio::local::stream_protocol::acceptor m_Acceptor;
#else
boost::asio::ip::tcp::acceptor m_Acceptor;
#endif
public: public: