diff --git a/cmake/win32_installer_deps.cmake b/cmake/win32_installer_deps.cmake index b404ab528..03cfd6d7e 100644 --- a/cmake/win32_installer_deps.cmake +++ b/cmake/win32_installer_deps.cmake @@ -31,7 +31,7 @@ set(CPACK_NSIS_DEFINES "RequestExecutionLevel admin") set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '$INSTDIR\\\\bin\\\\tuntap-install.exe /S'\\nExecWait '$INSTDIR\\\\bin\\\\lokinet.exe --install'\\nExecWait '$INSTDIR\\\\bin\\\\lokinet.exe -g C:\\\\ProgramData\\\\lokinet\\\\lokinet.ini'\\nCopyFiles '$INSTDIR\\\\share\\\\bootstrap.signed' C:\\\\ProgramData\\\\lokinet\\\\bootstrap.signed") set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "ExecWait '$INSTDIR\\\\bin\\\\lokinet.exe --remove'\\nRMDir /r /REBOOTOK C:\\\\ProgramData\\\\lokinet") set(CPACK_NSIS_CREATE_ICONS_EXTRA - "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Lokinet.lnk' '$INSTDIR\\\\share\\\\gui\\\\lokinet-gui.exe' '-platform windows:dpiawareness=0'" + "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Lokinet.lnk' '$INSTDIR\\\\share\\\\gui\\\\lokinet-gui.exe'" ) set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Lokinet.lnk'" diff --git a/llarp/router/outbound_message_handler.cpp b/llarp/router/outbound_message_handler.cpp index 5ba8e1896..431de0cb6 100644 --- a/llarp/router/outbound_message_handler.cpp +++ b/llarp/router/outbound_message_handler.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include @@ -23,12 +22,6 @@ namespace llarp OutboundMessageHandler::QueueMessage( const RouterID& remote, const ILinkMessage* msg, SendStatusHandler callback) { - if (not _lookupHandler->RemoteIsAllowed(remote)) - { - DoCallback(callback, SendStatus::InvalidRouter); - return true; - } - const uint16_t priority = msg->Priority(); std::array linkmsg_buffer; llarp_buffer_t buf(linkmsg_buffer); @@ -112,11 +105,9 @@ namespace llarp } void - OutboundMessageHandler::Init( - ILinkManager* linkManager, I_RCLookupHandler* lookupHandler, std::shared_ptr logic) + OutboundMessageHandler::Init(ILinkManager* linkManager, std::shared_ptr logic) { _linkManager = linkManager; - _lookupHandler = lookupHandler; _logic = logic; outboundMessageQueues.emplace(zeroID, MessageQueue()); diff --git a/llarp/router/outbound_message_handler.hpp b/llarp/router/outbound_message_handler.hpp index 38532d2d9..44f53e69f 100644 --- a/llarp/router/outbound_message_handler.hpp +++ b/llarp/router/outbound_message_handler.hpp @@ -17,7 +17,6 @@ struct llarp_buffer_t; namespace llarp { - struct I_RCLookupHandler; struct ILinkManager; class Logic; enum class SessionResult; @@ -43,7 +42,7 @@ namespace llarp ExtractStatus() const override; void - Init(ILinkManager* linkManager, I_RCLookupHandler* lookupHandler, std::shared_ptr logic); + Init(ILinkManager* linkManager, std::shared_ptr logic); private: using Message = std::pair, SendStatusHandler>; @@ -138,7 +137,6 @@ namespace llarp std::queue roundRobinOrder; ILinkManager* _linkManager; - I_RCLookupHandler* _lookupHandler; std::shared_ptr _logic; util::ContentionKiller m_Killer; diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 69a198dac..cbf256628 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -551,7 +551,7 @@ namespace llarp LogInfo("Loaded ", bootstrapRCList.size(), " bootstrap routers"); // Init components after relevant config settings loaded - _outboundMessageHandler.Init(&_linkManager, &_rcLookupHandler, _logic); + _outboundMessageHandler.Init(&_linkManager, _logic); _outboundSessionMaker.Init( this, &_linkManager,