diff --git a/llarp/link/link_manager.cpp b/llarp/link/link_manager.cpp index 71fd79e38..e555e0697 100644 --- a/llarp/link/link_manager.cpp +++ b/llarp/link/link_manager.cpp @@ -500,8 +500,7 @@ namespace llarp { log::info( link_cat, "Remote requested too many relay IDs (greater than 1/4 of what we have)."); - m.respond( - serialize_response({{messages::STATUS_KEY, RCFetchMessage::INVALID_REQUEST}})); + m.respond(serialize_response({{messages::STATUS_KEY, RCFetchMessage::INVALID_REQUEST}})); return; } @@ -510,8 +509,7 @@ namespace llarp { if (sv.size() != RouterID::SIZE) { - m.respond(serialize_response( - {{messages::STATUS_KEY, RCFetchMessage::INVALID_REQUEST}})); + m.respond(serialize_response({{messages::STATUS_KEY, RCFetchMessage::INVALID_REQUEST}})); return; } explicit_relays.emplace(reinterpret_cast(sv.data())); diff --git a/llarp/messages/dht.hpp b/llarp/messages/dht.hpp index e86d1f153..2a0e38805 100644 --- a/llarp/messages/dht.hpp +++ b/llarp/messages/dht.hpp @@ -4,51 +4,6 @@ namespace llarp { - namespace FindRouterMessage - { - inline auto RETRY_EXP = "RETRY AS EXPLORATORY"sv; - inline auto RETRY_ITER = "RETRY AS ITERATIVE"sv; - inline auto RETRY_NEW = "RETRY WITH NEW RECIPIENT"sv; - - inline static std::string - serialize(const RouterID& rid, bool is_iterative, bool is_exploratory) - { - oxenc::bt_dict_producer btdp; - - try - { - btdp.append("E", is_exploratory ? 1 : 0); - btdp.append("I", is_iterative ? 1 : 0); - btdp.append("K", rid.ToView()); - } - catch (...) - { - log::error(link_cat, "Error: FindRouterMessage failed to bt encode contents!"); - } - - return std::move(btdp).str(); - } - - inline static std::string - serialize(const std::string& rid, bool is_iterative, bool is_exploratory) - { - oxenc::bt_dict_producer btdp; - - try - { - btdp.append("E", is_exploratory ? 1 : 0); - btdp.append("I", is_iterative ? 1 : 0); - btdp.append("K", std::move(rid)); - } - catch (...) - { - log::error(link_cat, "Error: FindRouterMessage failed to bt encode contents!"); - } - - return std::move(btdp).str(); - } - } // namespace FindRouterMessage - namespace FindIntroMessage { inline auto NOT_FOUND = "NOT FOUND"sv;