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

Merge pull request #4 from orignal/master

Browse source 
Merge pull request from orignal/master
This commit is contained in:
chertov 2014-01-21 19:30:12 -08:00
commit 27e448290d
6 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
RouterInfo.cpp
View file

@ -101,7 +101,16 @@ namespace data
r += ReadString (value, s);
s.seekg (1, std::ios_base::cur); r++; // ;
if (!strcmp (key, "host"))
address.host = value;
{
boost::system::error_code ecode;
address.host = boost::asio::ip::address::from_string (value, ecode);
if (ecode)
{
// TODO: we should try to resolve address here
LogPrint ("Unexpected address ", value);
SetUnreachable (true);
}
}
else if (!strcmp (key, "port"))
address.port = boost::lexical_cast<int>(value);
}
@ -166,7 +175,7 @@ namespace data
std::stringstream properties;
WriteString ("host", properties);
properties << '=';
WriteString (address.host, properties);
WriteString (address.host.to_string (), properties);
properties << ';';
WriteString ("port", properties);
properties << '=';
@ -237,7 +246,7 @@ namespace data
void RouterInfo::AddNTCPAddress (const char * host, int port)
{
Address addr;
addr.host = host;
addr.host = boost::asio::ip::address::from_string (host);
addr.port = port;
addr.transportStyle = eTransportNTCP;
addr.cost = 2;
@ -266,22 +275,28 @@ namespace data
return false;
}
bool RouterInfo::IsNTCP () const
bool RouterInfo::IsNTCP (bool v4only) const
{
for (auto& address : m_Addresses)
{
if (address.transportStyle == eTransportNTCP)
return true;
{
if (!v4only || address.host.is_v4 ())
return true;
}
}
return false;
}
RouterInfo::Address * RouterInfo::GetNTCPAddress ()
RouterInfo::Address * RouterInfo::GetNTCPAddress (bool v4only)
{
for (auto& address : m_Addresses)
{
if (address.transportStyle == eTransportNTCP)
return &address;
{
if (!v4only || address.host.is_v4 ())
return &address;
}
}
return nullptr;
}