From 27fac68716ba0e08b44705f47ababb50c960467a Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 28 Apr 2019 14:22:38 -0400 Subject: [PATCH] fix --- llarp/handlers/tun.cpp | 2 +- llarp/messages/relay_commit.cpp | 4 ++-- llarp/service/endpoint.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp index 9ff20a011..ee25a7ed0 100644 --- a/llarp/handlers/tun.cpp +++ b/llarp/handlers/tun.cpp @@ -348,7 +348,7 @@ namespace llarp { dns::Message *replyMsg = new dns::Message(std::move(msg)); EnsurePathToSNode( - addr.as_array(), [=](const RouterID &, exit::BaseSession * s) { + addr.as_array(), [=](const RouterID &, exit::BaseSession_ptr s) { SendDNSReply(addr, s, replyMsg, reply, true, isV6); }); return true; diff --git a/llarp/messages/relay_commit.cpp b/llarp/messages/relay_commit.cpp index 33fa7e082..747d6e786 100644 --- a/llarp/messages/relay_commit.cpp +++ b/llarp/messages/relay_commit.cpp @@ -237,7 +237,7 @@ namespace llarp // ... and it's valid const auto now = self->context->Router()->Now(); if(self->record.nextRC->IsPublicRouter() - && self->record.nextRC->Verify(self->context->GetCrypto(), now)) + && self->record.nextRC->Verify(self->context->crypto(), now)) { llarp_nodedb* n = self->context->Router()->nodedb(); const RouterContact rc = std::move(*self->record.nextRC); @@ -314,7 +314,7 @@ namespace llarp return; } // generate path key as we are in a worker thread - auto crypto = self->context->GetCrypto(); + auto crypto = self->context->crypto(); if(!crypto->dh_server(self->hop->pathKey, self->record.commkey, self->context->EncryptionSecretKey(), self->record.tunnelNonce)) diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp index c77d3e1b0..b6b440cd3 100644 --- a/llarp/service/endpoint.cpp +++ b/llarp/service/endpoint.cpp @@ -970,7 +970,7 @@ namespace llarp RemoveConvoTag(frame.T); return true; } - if(!frame.AsyncDecryptAndVerify(EndpointLogic(), crypto(), p, Worker(), + if(!frame.AsyncDecryptAndVerify(EndpointLogic(), crypto(), p, CryptoWorker(), m_Identity, m_DataHandler)) { // send discard