Browse Source

take first avalable resolved address if local address is not specified

pull/1687/head
orignal 3 years ago
parent
commit
b0874410f1
  1. 19
      libi2pd_client/I2PTunnel.cpp

19
libi2pd_client/I2PTunnel.cpp

@ -606,8 +606,10 @@ namespace client
if (!ecode) if (!ecode)
{ {
bool found = false; bool found = false;
boost::asio::ip::tcp::resolver::iterator end;
boost::asio::ip::tcp::endpoint ep; boost::asio::ip::tcp::endpoint ep;
if (m_LocalAddress)
{
boost::asio::ip::tcp::resolver::iterator end;
while (it != end) while (it != end)
{ {
ep = *it; ep = *it;
@ -615,26 +617,31 @@ namespace client
{ {
if (ep.address ().is_v4 ()) if (ep.address ().is_v4 ())
{ {
if (!m_LocalAddress || m_LocalAddress->is_v4 ()) // look for ipv4 if not specified if (m_LocalAddress->is_v4 ()) found = true;
found = true;
} }
else if (ep.address ().is_v6 ()) else if (ep.address ().is_v6 ())
{ {
if (i2p::util::net::IsYggdrasilAddress (ep.address ())) if (i2p::util::net::IsYggdrasilAddress (ep.address ()))
{ {
if (m_LocalAddress && i2p::util::net::IsYggdrasilAddress (*m_LocalAddress)) if (i2p::util::net::IsYggdrasilAddress (*m_LocalAddress))
found = true; found = true;
} }
else if (m_LocalAddress && m_LocalAddress->is_v6 ()) else if (m_LocalAddress->is_v6 ())
found = true; found = true;
} }
} }
if (found) break; if (found) break;
it++; it++;
} }
}
else
{
found = true;
ep = *it; // first available
}
if (!found) if (!found)
{ {
LogPrint (eLogError, "I2PTunnel: Unable to reslove to compatible address"); LogPrint (eLogError, "I2PTunnel: Unable to resolve to compatible address");
return; return;
} }

Loading…
Cancel
Save