Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-17 15:25:35 +00:00
Code Issues Projects Releases Wiki Activity

use optional

Browse Source
This commit is contained in:
Jeff Becker 2019-12-30 16:06:57 -05:00
parent da5af879e9
commit ecf2685aa3
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llarp/messages/relay_commit.cpp
View File

@ -15,6 +15,7 @@
#include <util/thread/logic.hpp> #include <util/thread/logic.hpp>
#include <functional> #include <functional>
#include <absl/types/optional.h>
namespace llarp namespace llarp
{ {
@ -184,8 +185,7 @@ namespace llarp
// the actual hop // the actual hop
std::shared_ptr< Hop > hop; std::shared_ptr< Hop > hop;
const Addr fromAddr; const absl::optional< llarp::Addr > fromAddr;
const RouterContact fromRC;
LRCMFrameDecrypt(Context* ctx, Decrypter_ptr dec, LRCMFrameDecrypt(Context* ctx, Decrypter_ptr dec,
const LR_CommitMessage* commit) const LR_CommitMessage* commit)
@ -193,8 +193,9 @@ namespace llarp
, frames(commit->frames) , frames(commit->frames)
, context(ctx) , context(ctx)
, hop(std::make_shared< Hop >()) , hop(std::make_shared< Hop >())
, fromAddr(commit->session->GetRemoteEndpoint()) , fromAddr(commit->session->GetRemoteRC().IsPublicRouter()
, fromRC(commit->session->GetRemoteRC()) ? absl::optional< llarp::Addr >{}
: commit->session->GetRemoteEndpoint())
{ {
hop->info.downstream = commit->session->GetPubKey(); hop->info.downstream = commit->session->GetPubKey();
} }
@ -246,7 +247,7 @@ namespace llarp
{ {
if(self->context->HasTransitHop(self->hop->info)) if(self->context->HasTransitHop(self->hop->info))
{ {
llarp::LogError("duplicate transit hop", self->hop->info); llarp::LogError("duplicate transit hop ", self->hop->info);
OnForwardLRCMResult(self->context->Router(), self->hop->info.rxID, OnForwardLRCMResult(self->context->Router(), self->hop->info.rxID,
self->hop->info.downstream, self->hop->pathKey, self->hop->info.downstream, self->hop->pathKey,
SendStatus::Congestion); SendStatus::Congestion);
@ -254,13 +255,13 @@ namespace llarp
return; return;
} }
if(not self->fromRC.IsPublicRouter()) if(self->fromAddr.has_value())
{ {
// only do ip limiting from non service nodes // only do ip limiting from non service nodes
if(self->context->CheckPathLimitHitByIP(self->fromAddr)) if(self->context->CheckPathLimitHitByIP(self->fromAddr.value()))
{ {
// we hit a limit so tell it to slow tf down // we hit a limit so tell it to slow tf down
llarp::LogError("client path build limited ", self->hop->info); llarp::LogError("client path build hit limit ", self->hop->info);
OnForwardLRCMResult(self->context->Router(), self->hop->info.rxID, OnForwardLRCMResult(self->context->Router(), self->hop->info.rxID,
self->hop->info.downstream, self->hop->pathKey, self->hop->info.downstream, self->hop->pathKey,
SendStatus::Congestion); SendStatus::Congestion);