From 3ec727d84441f5e5612a4399269bb6acc28680e6 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 30 Oct 2020 19:32:00 -0400 Subject: [PATCH] I have no words. (#1438) So apparently dnsConfig in Router was never set. Router::networkConfig was set, but only used in the function which set it and otherwise only passed to another function once. dnsConfig was only used in one place. both member variables have been removed in favor of just referencing Router::m_Config. Co-authored-by: Thomas Winget --- llarp/router/router.cpp | 4 ++-- llarp/router/router.hpp | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 803023ca2..1e862b478 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -461,7 +461,7 @@ namespace llarp m_isServiceNode = conf.router.m_isRelay; - networkConfig = conf.network; + auto& networkConfig = conf.network; /// build a set of strictConnectPubkeys ( /// TODO: make this consistent with config -- do we support multiple strict connections @@ -1218,7 +1218,7 @@ namespace llarp LogInfo("accepting transit traffic"); paths.AllowTransit(); llarp_dht_allow_transit(dht()); - _exitContext.AddExitEndpoint("default-connectivity", networkConfig, dnsConfig); + _exitContext.AddExitEndpoint("default-connectivity", m_Config->network, m_Config->dns); return true; } diff --git a/llarp/router/router.hpp b/llarp/router/router.hpp index 2ea277d80..365b900bd 100644 --- a/llarp/router/router.hpp +++ b/llarp/router/router.hpp @@ -263,9 +263,6 @@ namespace llarp void PumpLL() override; - NetworkConfig networkConfig; - DnsConfig dnsConfig; - const lokimq::address DefaultRPCBindAddr = lokimq::address::tcp("127.0.0.1", 1190); bool enableRPCServer = false; lokimq::address rpcBindAddr = DefaultRPCBindAddr;