PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-02 06:54:15 +00:00
Code Issues Releases Activity

more precise compatibility check

Browse Source
This commit is contained in:
orignal 2021-03-12 20:51:12 -05:00
parent 6012585067
commit 1b8da90cbb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libi2pd/RouterInfo.cpp
View File

@ -1131,9 +1131,16 @@ namespace data
return (bool)GetAddress ( return (bool)GetAddress (
[commonTransports](std::shared_ptr<const RouterInfo::Address> address)->bool [commonTransports](std::shared_ptr<const RouterInfo::Address> address)->bool
{ {
// TODO:check v4 and v6 separately based on caps if (address->IsPublishedNTCP2 ())
if ((commonTransports & (eNTCP2V4 | eNTCP2V6)) && address->IsPublishedNTCP2 ()) return true; {
if ((commonTransports & (eSSUV4 | eSSUV6)) && address->IsReachableSSU ()) return true; if ((commonTransports & eNTCP2V4) && address->IsV4 ()) return true;
if ((commonTransports & eNTCP2V6) && address->IsV6 ()) return true;
}
else if (address->IsReachableSSU ())
{
if ((commonTransports & eSSUV4) && address->IsV4 ()) return true;
if ((commonTransports & eSSUV6) && address->IsV6 ()) return true;
}
return false; return false;
}); });
} }

4
libi2pd/RouterInfo.h
View File

@ -130,8 +130,8 @@ namespace data
bool IsCompatible (const boost::asio::ip::address& other) const bool IsCompatible (const boost::asio::ip::address& other) const
{ {
return (host.is_v4 () && other.is_v4 ()) || return (IsV4 () && other.is_v4 ()) ||
(host.is_v6 () && other.is_v6 ()); (IsV6 () && other.is_v6 ());
} }
bool operator==(const Address& other) const bool operator==(const Address& other) const