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

select introducers randomly. More logging for RelayIntro

Browse Source
This commit is contained in:
orignal 2022-07-30 16:31:44 -04:00
parent fc63ca6982
commit 71766ecd16
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libi2pd/SSU2.cpp
View File

@ -6,6 +6,7 @@
* See full license text in LICENSE file at top of project tree * See full license text in LICENSE file at top of project tree
*/ */
#include <random>
#include "Log.h" #include "Log.h"
#include "RouterContext.h" #include "RouterContext.h"
#include "Transports.h" #include "Transports.h"
@ -576,18 +577,27 @@ namespace transport
auto ts = i2p::util::GetSecondsSinceEpoch (); auto ts = i2p::util::GetSecondsSinceEpoch ();
std::shared_ptr<i2p::data::RouterInfo> r; std::shared_ptr<i2p::data::RouterInfo> r;
uint32_t relayTag = 0; uint32_t relayTag = 0;
for (auto& it: address->ssu->introducers) if (!address->ssu->introducers.empty ())
{ {
if (it.iTag && ts < it.iExp) std::vector<int> indicies;
{ for (int i = 0; i < (int)address->ssu->introducers.size (); i++) indicies.push_back(i);
r = i2p::data::netdb.FindRouter (it.iKey); if (indicies.size () > 1)
if (r && r->IsReachableFrom (i2p::context.GetRouterInfo ())) std::shuffle (indicies.begin(), indicies.end(), std::mt19937(std::random_device()()));
{
relayTag = it.iTag; for (auto i: indicies)
if (relayTag) break; {
} const auto& introducer = address->ssu->introducers[indicies[i]];
} if (introducer.iTag && ts < introducer.iExp)
} {
r = i2p::data::netdb.FindRouter (introducer.iKey);
if (r && r->IsReachableFrom (i2p::context.GetRouterInfo ()))
{
relayTag = introducer.iTag;
if (relayTag) break;
}
}
}
}
if (r) if (r)
{ {
if (relayTag) if (relayTag)

6
libi2pd/SSU2Session.cpp
View File

@ -1070,6 +1070,7 @@ namespace transport
const uint8_t * introKey, uint64_t token) const uint8_t * introKey, uint64_t token)
{ {
// we are Charlie // we are Charlie
LogPrint (eLogDebug, "SSU2: Sending HolePunch to ", ep);
Header header; Header header;
uint8_t h[32], payload[SSU2_MAX_PACKET_SIZE]; uint8_t h[32], payload[SSU2_MAX_PACKET_SIZE];
// fill packet // fill packet
@ -1641,11 +1642,14 @@ namespace transport
SendHolePunch (bufbe32toh (buf + 33), ep, addr->i, token); SendHolePunch (bufbe32toh (buf + 33), ep, addr->i, token);
} }
else else
{
LogPrint (eLogWarning, "SSU2: RelayIntro unsupported address");
code = eSSU2RelayResponseCodeCharlieUnsupportedAddress; code = eSSU2RelayResponseCodeCharlieUnsupportedAddress;
}
} }
else else
{ {
LogPrint (eLogWarning, "SSU2: RelayInfo unknown address"); LogPrint (eLogWarning, "SSU2: RelayIntro unknown address");
code = eSSU2RelayResponseCodeCharlieAliceIsUnknown; code = eSSU2RelayResponseCodeCharlieAliceIsUnknown;
} }
} }