diff --git a/llarp/config/config.hpp b/llarp/config/config.hpp index dd3aea1f1..a6d9c076d 100644 --- a/llarp/config/config.hpp +++ b/llarp/config/config.hpp @@ -147,7 +147,6 @@ namespace llarp std::string interface; int addressFamily; uint16_t port; - std::unordered_set serverOptions; }; public: diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 3e61b29b2..d6671a529 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -534,23 +534,9 @@ namespace llarp for(const LinksConfig::LinkInfo &serverConfig : conf->links.inboundLinks()) { // get default factory + // TODO: this is dead code, as is everything related to _defaultLinkType, + // also review LinkFactory for dead code auto inboundLinkFactory = LinkFactory::Obtain(_defaultLinkType, true); - // for each option if provided ... - for(const auto &opt : serverConfig.serverOptions) - { - // try interpreting it as a link type - const auto linktype = LinkFactory::TypeFromName(opt); - if (linktype != LinkFactory::LinkType::eLinkUnknown) - { - // override link factory if it's a valid link type - auto factory = LinkFactory::Obtain(linktype, true); - if (factory) - { - inboundLinkFactory = std::move(factory); - break; - } - } - } auto server = inboundLinkFactory( m_keyManager, diff --git a/test/config/test_llarp_config_config.cpp b/test/config/test_llarp_config_config.cpp index e86349dec..fc2e06728 100644 --- a/test/config/test_llarp_config_config.cpp +++ b/test/config/test_llarp_config_config.cpp @@ -101,7 +101,6 @@ ifaddr=10.101.0.1/16 ASSERT_EQ(links[0].interface, "eth0"); ASSERT_EQ(links[0].addressFamily, AF_INET); ASSERT_EQ(links[0].port, 5501); - ASSERT_TRUE(links[0].serverOptions.empty()); } ASSERT_THAT(config.bootstrap.routers,