PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

use boost::asio::address for address

Browse Source
This commit is contained in:
orignal 2014-01-21 16:07:16 -05:00
parent 224b423522
commit 2d428fd090
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NTCPSession.cpp
View File

@ -517,10 +517,10 @@ namespace ntcp
} }
NTCPClient::NTCPClient (boost::asio::io_service& service, const char * address, NTCPClient::NTCPClient (boost::asio::io_service& service, boost::asio::ip::address& address,
int port, i2p::data::RouterInfo& in_RouterInfo): int port, i2p::data::RouterInfo& in_RouterInfo):
NTCPSession (service, in_RouterInfo), NTCPSession (service, in_RouterInfo),
m_Endpoint (boost::asio::ip::address::from_string (address), port) m_Endpoint (address, port)
{ {
Connect (); Connect ();
} }

2
NTCPSession.h
View File

@ -144,7 +144,7 @@ namespace ntcp
{ {
public: public:
NTCPClient (boost::asio::io_service& service, const char * address, int port, i2p::data::RouterInfo& in_RouterInfo); NTCPClient (boost::asio::io_service& service, boost::asio::ip::address& address, int port, i2p::data::RouterInfo& in_RouterInfo);
private: private:

4
RouterContext.cpp
View File

@ -45,7 +45,7 @@ namespace i2p
auto address = m_RouterInfo.GetNTCPAddress (); auto address = m_RouterInfo.GetNTCPAddress ();
if (address) if (address)
{ {
address->host = host; address->host = boost::asio::ip::address::from_string (host);
address->port = port; address->port = port;
} }
@ -80,4 +80,4 @@ namespace i2p
std::ofstream fi (ROUTER_INFO); std::ofstream fi (ROUTER_INFO);
fi.write ((char *)m_RouterInfo.GetBuffer (), m_RouterInfo.GetBufferLen ()); fi.write ((char *)m_RouterInfo.GetBuffer (), m_RouterInfo.GetBufferLen ());
} }
} }

6
RouterInfo.cpp
View File

@ -101,7 +101,7 @@ namespace data
r += ReadString (value, s); r += ReadString (value, s);
s.seekg (1, std::ios_base::cur); r++; // ; s.seekg (1, std::ios_base::cur); r++; // ;
if (!strcmp (key, "host")) if (!strcmp (key, "host"))
address.host = value; address.host = boost::asio::ip::address::from_string (value);
else if (!strcmp (key, "port")) else if (!strcmp (key, "port"))
address.port = boost::lexical_cast<int>(value); address.port = boost::lexical_cast<int>(value);
} }
@ -166,7 +166,7 @@ namespace data
std::stringstream properties; std::stringstream properties;
WriteString ("host", properties); WriteString ("host", properties);
properties << '='; properties << '=';
WriteString (address.host, properties); WriteString (address.host.to_string (), properties);
properties << ';'; properties << ';';
WriteString ("port", properties); WriteString ("port", properties);
properties << '='; properties << '=';
@ -227,7 +227,7 @@ namespace data
void RouterInfo::AddNTCPAddress (const char * host, int port) void RouterInfo::AddNTCPAddress (const char * host, int port)
{ {
Address addr; Address addr;
addr.host = host; addr.host = boost::asio::ip::address::from_string (host);
addr.port = port; addr.port = port;
addr.transportStyle = eTransportNTCP; addr.transportStyle = eTransportNTCP;
addr.cost = 2; addr.cost = 2;

2
RouterInfo.h
View File

@ -27,7 +27,7 @@ namespace data
struct Address struct Address
{ {
TransportStyle transportStyle; TransportStyle transportStyle;
std::string host; boost::asio::ip::address host;
int port; int port;
uint64_t date; uint64_t date;
uint8_t cost; uint8_t cost;

2
Transports.cpp
View File

@ -139,7 +139,7 @@ namespace i2p
auto address = r->GetNTCPAddress (); auto address = r->GetNTCPAddress ();
if (address) if (address)
{ {
session = new i2p::ntcp::NTCPClient (m_Service, address->host.c_str (), address->port, *r); session = new i2p::ntcp::NTCPClient (m_Service, address->host, address->port, *r);
AddNTCPSession (session); AddNTCPSession (session);
} }
else else