From 5aa7f494709116911e4c43c888c492a87e15343f Mon Sep 17 00:00:00 2001
From: Michael <michael@loki.network>
Date: Wed, 12 Dec 2018 02:04:32 +0000
Subject: [PATCH] Move routing* to llarp/

---
 include/llarp/messages/dht.hpp               |  2 +-
 include/llarp/messages/discard.hpp           |  5 +++--
 include/llarp/messages/exit.hpp              |  2 +-
 include/llarp/messages/path_confirm.hpp      |  2 +-
 include/llarp/messages/path_latency.hpp      |  2 +-
 include/llarp/messages/path_transfer.hpp     |  2 +-
 include/llarp/messages/transfer_traffic.hpp  |  5 +++--
 include/llarp/path.hpp                       |  5 +++--
 include/llarp/pathset.hpp                    |  2 +-
 include/llarp/service/lookup.hpp             |  3 ++-
 include/llarp/service/protocol.hpp           | 10 ++++++----
 llarp/dht/find_intro.cpp                     |  2 +-
 llarp/dht/messages/findintro.hpp             |  3 ++-
 llarp/exit/close_exit.cpp                    |  2 +-
 llarp/exit/grant_exit.cpp                    |  2 +-
 llarp/exit/obtain_exit.cpp                   |  2 +-
 llarp/exit/reject_exit.cpp                   |  2 +-
 llarp/exit/transfer_traffic.cpp              |  4 ++--
 llarp/exit/update_exit.cpp                   |  2 +-
 llarp/router.hpp                             |  2 +-
 {include/llarp => llarp}/routing/handler.hpp |  0
 {include/llarp => llarp}/routing/message.hpp |  0
 llarp/routing/message_parser.cpp             |  6 +++---
 llarp/routing/path_confirm.cpp               |  4 ++--
 llarp/routing/path_latency.cpp               |  3 ++-
 llarp/service/protocol.cpp                   |  6 +++---
 llarp/transit_hop.cpp                        | 10 +++++-----
 27 files changed, 49 insertions(+), 41 deletions(-)
 rename {include/llarp => llarp}/routing/handler.hpp (100%)
 rename {include/llarp => llarp}/routing/message.hpp (100%)

diff --git a/include/llarp/messages/dht.hpp b/include/llarp/messages/dht.hpp
index d946d23ac..e81c5e04a 100644
--- a/include/llarp/messages/dht.hpp
+++ b/include/llarp/messages/dht.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_MESSAGES_DHT_HPP
 #define LLARP_MESSAGES_DHT_HPP
 #include <dht.hpp>
-#include <llarp/routing/message.hpp>
+#include <routing/message.hpp>
 
 #include <vector>
 
diff --git a/include/llarp/messages/discard.hpp b/include/llarp/messages/discard.hpp
index 2f40233c4..a187f0b24 100644
--- a/include/llarp/messages/discard.hpp
+++ b/include/llarp/messages/discard.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_MESSAGES_DISCARD_HPP
 #define LLARP_MESSAGES_DISCARD_HPP
+
 #include <link_message.hpp>
-#include <llarp/routing/message.hpp>
 #include <llarp/bencode.hpp>
-#include <llarp/routing/handler.hpp>
+#include <routing/handler.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/messages/exit.hpp b/include/llarp/messages/exit.hpp
index 379415153..89d863444 100644
--- a/include/llarp/messages/exit.hpp
+++ b/include/llarp/messages/exit.hpp
@@ -2,7 +2,7 @@
 #define LLARP_MESSAGES_EXIT_HPP
 #include <crypto.hpp>
 #include <exit/policy.hpp>
-#include <llarp/routing/message.hpp>
+#include <routing/message.hpp>
 
 #include <vector>
 
diff --git a/include/llarp/messages/path_confirm.hpp b/include/llarp/messages/path_confirm.hpp
index 7128a4eb1..3827e7255 100644
--- a/include/llarp/messages/path_confirm.hpp
+++ b/include/llarp/messages/path_confirm.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_MESSAGE_PATH_CONFIRM_HPP
 #define LLARP_MESSAGE_PATH_CONFIRM_HPP
 
-#include <llarp/routing/message.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/messages/path_latency.hpp b/include/llarp/messages/path_latency.hpp
index 545a0ef55..f762a5bf5 100644
--- a/include/llarp/messages/path_latency.hpp
+++ b/include/llarp/messages/path_latency.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_MESSAGES_PATH_LATENCY_HPP
 #define LLARP_MESSAGES_PATH_LATENCY_HPP
 
-#include <llarp/routing/message.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/messages/path_transfer.hpp b/include/llarp/messages/path_transfer.hpp
index 6081f9ff6..ac7378c37 100644
--- a/include/llarp/messages/path_transfer.hpp
+++ b/include/llarp/messages/path_transfer.hpp
@@ -3,8 +3,8 @@
 
 #include <crypto.hpp>
 #include <llarp/encrypted.hpp>
-#include <llarp/routing/message.hpp>
 #include <llarp/service/protocol.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/include/llarp/messages/transfer_traffic.hpp b/include/llarp/messages/transfer_traffic.hpp
index 595ea0cd7..c704f2c6b 100644
--- a/include/llarp/messages/transfer_traffic.hpp
+++ b/include/llarp/messages/transfer_traffic.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_MESSAGES_TRANSFER_TRAFFIC_HPP
 #define LLARP_MESSAGES_TRANSFER_TRAFFIC_HPP
-#include <llarp/routing/message.hpp>
-#include <llarp/encrypted.hpp>
 #include <crypto.hpp>
+#include <llarp/encrypted.hpp>
+#include <routing/message.hpp>
+
 #include <vector>
 
 namespace llarp
diff --git a/include/llarp/path.hpp b/include/llarp/path.hpp
index b2e22bc44..542527c9b 100644
--- a/include/llarp/path.hpp
+++ b/include/llarp/path.hpp
@@ -1,5 +1,6 @@
 #ifndef LLARP_PATH_HPP
 #define LLARP_PATH_HPP
+
 #include <crypto.hpp>
 #include <dht.hpp>
 #include <llarp/aligned.hpp>
@@ -9,11 +10,11 @@
 #include <llarp/pathbuilder.hpp>
 #include <llarp/pathset.hpp>
 #include <llarp/router_id.hpp>
-#include <llarp/routing/handler.hpp>
-#include <llarp/routing/message.hpp>
 #include <llarp/service/Intro.hpp>
 #include <llarp/threading.hpp>
 #include <llarp/time.hpp>
+#include <routing/handler.hpp>
+#include <routing/message.hpp>
 
 #include <functional>
 #include <list>
diff --git a/include/llarp/pathset.hpp b/include/llarp/pathset.hpp
index a40dc4452..27c1135bc 100644
--- a/include/llarp/pathset.hpp
+++ b/include/llarp/pathset.hpp
@@ -4,10 +4,10 @@
 #include <dht/messages/all.hpp>
 #include <llarp/path_types.hpp>
 #include <llarp/router_id.hpp>
-#include <llarp/routing/message.hpp>
 #include <llarp/service/IntroSet.hpp>
 #include <llarp/service/lookup.hpp>
 #include <llarp/time.hpp>
+#include <routing/message.hpp>
 
 #include <functional>
 #include <list>
diff --git a/include/llarp/service/lookup.hpp b/include/llarp/service/lookup.hpp
index aba015012..9df180dc9 100644
--- a/include/llarp/service/lookup.hpp
+++ b/include/llarp/service/lookup.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_SERVICE_LOOKUP_HPP
 #define LLARP_SERVICE_LOOKUP_HPP
 
-#include <llarp/routing/message.hpp>
 #include <llarp/service/IntroSet.hpp>
+#include <routing/message.hpp>
+
 #include <set>
 
 namespace llarp
diff --git a/include/llarp/service/protocol.hpp b/include/llarp/service/protocol.hpp
index 62197c1a4..88c709128 100644
--- a/include/llarp/service/protocol.hpp
+++ b/include/llarp/service/protocol.hpp
@@ -1,15 +1,17 @@
 #ifndef LLARP_SERVICE_PROTOCOL_HPP
 #define LLARP_SERVICE_PROTOCOL_HPP
-#include <llarp/time.hpp>
-#include <llarp/bencode.hpp>
+
 #include <crypto.hpp>
-#include <llarp/encrypted.hpp>
 #include <dht/message.hpp>
-#include <llarp/routing/message.hpp>
+#include <llarp/bencode.hpp>
+#include <llarp/encrypted.hpp>
 #include <llarp/service/Identity.hpp>
 #include <llarp/service/Info.hpp>
 #include <llarp/service/Intro.hpp>
 #include <llarp/service/handler.hpp>
+#include <llarp/time.hpp>
+#include <routing/message.hpp>
+
 #include <vector>
 
 namespace llarp
diff --git a/llarp/dht/find_intro.cpp b/llarp/dht/find_intro.cpp
index f7190e50f..a513f7af2 100644
--- a/llarp/dht/find_intro.cpp
+++ b/llarp/dht/find_intro.cpp
@@ -1,7 +1,7 @@
 #include <dht/context.hpp>
 #include <dht/messages/findintro.hpp>
 #include <dht/messages/gotintro.hpp>
-#include <llarp/routing/message.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dht/messages/findintro.hpp b/llarp/dht/messages/findintro.hpp
index 42efce234..d58d39efd 100644
--- a/llarp/dht/messages/findintro.hpp
+++ b/llarp/dht/messages/findintro.hpp
@@ -1,9 +1,10 @@
 #ifndef LLARP_DHT_MESSAGES_FIND_INTRO_HPP
 #define LLARP_DHT_MESSAGES_FIND_INTRO_HPP
+
 #include <dht/message.hpp>
-#include <llarp/routing/message.hpp>
 #include <llarp/service/address.hpp>
 #include <llarp/service/tag.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/close_exit.cpp b/llarp/exit/close_exit.cpp
index e17fc937f..5fe702c48 100644
--- a/llarp/exit/close_exit.cpp
+++ b/llarp/exit/close_exit.cpp
@@ -1,5 +1,5 @@
 #include <llarp/messages/exit.hpp>
-#include <llarp/routing/handler.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/grant_exit.cpp b/llarp/exit/grant_exit.cpp
index 2b3a20b1f..67e1d2844 100644
--- a/llarp/exit/grant_exit.cpp
+++ b/llarp/exit/grant_exit.cpp
@@ -1,5 +1,5 @@
 #include <llarp/messages/exit.hpp>
-#include <llarp/routing/handler.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/obtain_exit.cpp b/llarp/exit/obtain_exit.cpp
index 17b9049c0..8b9ecb610 100644
--- a/llarp/exit/obtain_exit.cpp
+++ b/llarp/exit/obtain_exit.cpp
@@ -1,6 +1,6 @@
 #include <link_layer.hpp>
 #include <llarp/messages/exit.hpp>
-#include <llarp/routing/handler.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/reject_exit.cpp b/llarp/exit/reject_exit.cpp
index f290e17cd..e245ecce5 100644
--- a/llarp/exit/reject_exit.cpp
+++ b/llarp/exit/reject_exit.cpp
@@ -1,5 +1,5 @@
 #include <llarp/messages/exit.hpp>
-#include <llarp/routing/handler.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/transfer_traffic.cpp b/llarp/exit/transfer_traffic.cpp
index 2a65f73c7..8160212eb 100644
--- a/llarp/exit/transfer_traffic.cpp
+++ b/llarp/exit/transfer_traffic.cpp
@@ -1,6 +1,6 @@
-#include <llarp/messages/transfer_traffic.hpp>
-#include <llarp/routing/handler.hpp>
 #include <llarp/endian.hpp>
+#include <llarp/messages/transfer_traffic.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/exit/update_exit.cpp b/llarp/exit/update_exit.cpp
index 6bb367059..5de2714b2 100644
--- a/llarp/exit/update_exit.cpp
+++ b/llarp/exit/update_exit.cpp
@@ -1,5 +1,5 @@
 #include <llarp/messages/exit.hpp>
-#include <llarp/routing/handler.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/router.hpp b/llarp/router.hpp
index 64e7d818a..2dfb655ef 100644
--- a/llarp/router.hpp
+++ b/llarp/router.hpp
@@ -17,11 +17,11 @@
 #include <llarp/nodedb.hpp>
 #include <llarp/path.hpp>
 #include <llarp/profiling.hpp>
-#include <llarp/routing/handler.hpp>
 #include <llarp/rpc.hpp>
 #include <llarp/service.hpp>
 #include <mem.hpp>
 #include <router_contact.hpp>
+#include <routing/handler.hpp>
 #include <str.hpp>
 #include <threadpool.hpp>
 
diff --git a/include/llarp/routing/handler.hpp b/llarp/routing/handler.hpp
similarity index 100%
rename from include/llarp/routing/handler.hpp
rename to llarp/routing/handler.hpp
diff --git a/include/llarp/routing/message.hpp b/llarp/routing/message.hpp
similarity index 100%
rename from include/llarp/routing/message.hpp
rename to llarp/routing/message.hpp
diff --git a/llarp/routing/message_parser.cpp b/llarp/routing/message_parser.cpp
index 07c1c5d07..731c2df5a 100644
--- a/llarp/routing/message_parser.cpp
+++ b/llarp/routing/message_parser.cpp
@@ -1,10 +1,10 @@
 #include <llarp/messages/dht.hpp>
+#include <llarp/messages/discard.hpp>
 #include <llarp/messages/path_confirm.hpp>
 #include <llarp/messages/path_latency.hpp>
 #include <llarp/messages/path_transfer.hpp>
-#include <llarp/messages/discard.hpp>
-#include <llarp/routing/message.hpp>
-#include "mem.hpp"
+#include <mem.hpp>
+#include <routing/message.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/path_confirm.cpp b/llarp/routing/path_confirm.cpp
index caa95612d..ff6160dbc 100644
--- a/llarp/routing/path_confirm.cpp
+++ b/llarp/routing/path_confirm.cpp
@@ -1,8 +1,8 @@
 #include <llarp/messages/path_confirm.hpp>
 
-#include <llarp/time.hpp>
 #include <llarp/bencode.hpp>
-#include <llarp/routing/handler.hpp>
+#include <llarp/time.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/routing/path_latency.cpp b/llarp/routing/path_latency.cpp
index 6da1b8abd..494afdd29 100644
--- a/llarp/routing/path_latency.cpp
+++ b/llarp/routing/path_latency.cpp
@@ -1,5 +1,6 @@
 #include <llarp/messages/path_latency.hpp>
-#include <llarp/routing/handler.hpp>
+
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index ad9cfb461..8647d7045 100644
--- a/llarp/service/protocol.cpp
+++ b/llarp/service/protocol.cpp
@@ -1,8 +1,8 @@
+#include <buffer.hpp>
 #include <llarp/logic.hpp>
-#include <llarp/routing/handler.hpp>
 #include <llarp/service/protocol.hpp>
-#include "buffer.hpp"
-#include "mem.hpp"
+#include <mem.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {
diff --git a/llarp/transit_hop.cpp b/llarp/transit_hop.cpp
index 246edec8f..2044bb923 100644
--- a/llarp/transit_hop.cpp
+++ b/llarp/transit_hop.cpp
@@ -1,9 +1,9 @@
-#include <llarp/path.hpp>
-#include <llarp/routing/handler.hpp>
-#include <llarp/messages/discard.hpp>
-#include "buffer.hpp"
-#include "router.hpp"
+#include <buffer.hpp>
 #include <llarp/endian.hpp>
+#include <llarp/messages/discard.hpp>
+#include <llarp/path.hpp>
+#include <router.hpp>
+#include <routing/handler.hpp>
 
 namespace llarp
 {