Move subset of messages to right directory

llarp/CMakeLists.txt

@@ -175,7 +175,6 @@ set(LIB_SRC
   link/server.cpp
   link/session.cpp
   messages/dht_immediate.cpp
-  messages/dht.cpp
   messages/discard.cpp
   messages/exit.cpp
   messages/link_intro.cpp
@@ -186,7 +185,6 @@ set(LIB_SRC
   messages/path_transfer.cpp
   messages/relay.cpp
   messages/relay_commit.cpp
-  messages/transfer_traffic.cpp
   net/address_info.cpp
   net/exit_info.cpp
   net/ip.cpp
@@ -205,9 +203,11 @@ set(LIB_SRC
   router/router.cpp
   router_contact.cpp
   router_id.cpp
+  routing/dht_message.cpp
   routing/handler.cpp
   routing/message_parser.cpp
   routing/message.cpp
+  routing/transfer_traffic.cpp
   rpc/rpc.cpp
   service/address.cpp
   service/async_key_exchange.cpp

llarp/dht/context.cpp

@@ -13,10 +13,10 @@
 #include <dht/recursiverouterlookup.hpp>
 #include <dht/serviceaddresslookup.hpp>
 #include <dht/taglookup.hpp>
-#include <messages/dht.hpp>
 #include <messages/dht_immediate.hpp>
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 #include <util/logic.hpp>
 #include <nodedb.hpp>
 

llarp/dht/localrouterlookup.cpp

@@ -2,9 +2,10 @@
 
 #include <dht/context.hpp>
 #include <dht/messages/gotrouter.hpp>
-#include <messages/dht.hpp>
+
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 #include <util/logger.hpp>
 
 namespace llarp

llarp/dht/localserviceaddresslookup.cpp

@@ -2,9 +2,9 @@
 
 #include <dht/context.hpp>
 #include <dht/messages/gotintro.hpp>
-#include <messages/dht.hpp>
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 #include <util/logger.hpp>
 
 namespace llarp

llarp/dht/localtaglookup.cpp

@@ -2,9 +2,9 @@
 
 #include <dht/context.hpp>
 #include <dht/messages/gotintro.hpp>
-#include <messages/dht.hpp>
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 
 namespace llarp
 {

llarp/dht/messages/findrouter.cpp

@@ -2,10 +2,10 @@
 
 #include <dht/context.hpp>
 #include <dht/messages/gotrouter.hpp>
-#include <messages/dht.hpp>
-#include <path/path_context.hpp>
 #include <nodedb.hpp>
+#include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 
 namespace llarp
 {

llarp/dht/messages/gotintro.cpp

@@ -1,9 +1,9 @@
 #include <dht/messages/gotintro.hpp>
 
 #include <dht/context.hpp>
-#include <messages/dht.hpp>
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 
 namespace llarp
 {

llarp/dht/messages/pubintro.cpp

@@ -2,9 +2,9 @@
 
 #include <dht/context.hpp>
 #include <dht/messages/gotintro.hpp>
-#include <messages/dht.hpp>
 #include <messages/dht_immediate.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 
 namespace llarp
 {

llarp/exit/session.hpp

@@ -2,9 +2,9 @@
 #define LLARP_EXIT_SESSION_HPP
 
 #include <messages/exit.hpp>
-#include <messages/transfer_traffic.hpp>
 #include <net/ip.hpp>
 #include <path/pathbuilder.hpp>
+#include <routing/transfer_traffic.hpp>
 
 #include <deque>
 #include <queue>

llarp/path/path.cpp

@@ -1,15 +1,15 @@
 #include <path/path.hpp>
 
-#include <messages/dht.hpp>
 #include <messages/discard.hpp>
 #include <messages/exit.hpp>
 #include <messages/path_latency.hpp>
 #include <messages/relay_commit.hpp>
-#include <messages/transfer_traffic.hpp>
 #include <path/pathbuilder.hpp>
 #include <path/transit_hop.hpp>
 #include <profiling.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
+#include <routing/transfer_traffic.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
 

llarp/path/pathset.cpp

@@ -1,8 +1,8 @@
 #include <path/pathset.hpp>
 
 #include <dht/messages/pubintro.hpp>
-#include <messages/dht.hpp>
 #include <path/path.hpp>
+#include <routing/dht_message.hpp>
 
 namespace llarp
 {

llarp/routing/dht_message.cpp

@@ -1,4 +1,4 @@
-#include <messages/dht.hpp>
+#include <routing/dht_message.hpp>
 
 #include <router/abstractrouter.hpp>
 #include <routing/handler.hpp>

llarp/routing/message_parser.cpp

@@ -1,13 +1,13 @@
 #include <routing/message_parser.hpp>
 
-#include <messages/dht.hpp>
 #include <messages/discard.hpp>
 #include <messages/exit.hpp>
 #include <messages/path_confirm.hpp>
 #include <messages/path_latency.hpp>
 #include <messages/path_transfer.hpp>
-#include <messages/transfer_traffic.hpp>
 #include <path/path_types.hpp>
+#include <routing/dht_message.hpp>
+#include <routing/transfer_traffic.hpp>
 #include <util/mem.hpp>
 
 namespace llarp

llarp/routing/transfer_traffic.cpp

@@ -1,4 +1,4 @@
-#include <messages/transfer_traffic.hpp>
+#include <routing/transfer_traffic.hpp>
 
 #include <routing/handler.hpp>
 #include <util/bencode.hpp>

llarp/service/endpoint.cpp

@@ -5,11 +5,11 @@
 #include <dht/messages/gotintro.hpp>
 #include <dht/messages/gotrouter.hpp>
 #include <dht/messages/pubintro.hpp>
-#include <messages/dht.hpp>
 #include <messages/path_transfer.hpp>
 #include <nodedb.hpp>
 #include <profiling.hpp>
 #include <router/abstractrouter.hpp>
+#include <routing/dht_message.hpp>
 #include <service/endpoint_util.hpp>
 #include <service/hidden_service_address_lookup.hpp>
 #include <service/outbound_context.hpp>

llarp/service/hidden_service_address_lookup.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_SERVICE_HIDDEN_SERVICE_ADDRESS_LOOKUP_HPP
 #define LLARP_SERVICE_HIDDEN_SERVICE_ADDRESS_LOOKUP_HPP
 
-#include <messages/dht.hpp>
+#include <routing/dht_message.hpp>
 #include <service/intro_set.hpp>
 #include <service/lookup.hpp>
 

llarp/service/tag_lookup_job.cpp

@@ -1,7 +1,7 @@
 #include <service/tag_lookup_job.hpp>
 
 #include <dht/messages/findintro.hpp>
-#include <messages/dht.hpp>
+#include <routing/dht_message.hpp>
 #include <service/endpoint.hpp>
 
 namespace llarp

test/routing/llarp_routing_transfer_traffic.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <messages/transfer_traffic.hpp>
+#include <routing/transfer_traffic.hpp>
 
 using TransferTrafficMessage = llarp::routing::TransferTrafficMessage;