redo includes to be consistent

llarp/config/config.cpp

@@ -1,8 +1,7 @@
-#include <chrono>
 #include "config.hpp"
-
+#include "definition.hpp"
-#include "config/definition.hpp"
 #include "ini.hpp"
+
 #include <llarp/constants/files.hpp>
 #include <llarp/constants/platform.hpp>
 #include <llarp/constants/version.hpp>
@@ -18,6 +17,7 @@
 
 #include <llarp/service/name.hpp>
 
+#include <chrono>
 #include <cstdlib>
 #include <ios>
 #include <iostream>

llarp/config/config.hpp

@@ -1,14 +1,15 @@
 #pragma once
+#include "ini.hpp"
+#include "definition.hpp"
 
 #include <chrono>
+
 #include <llarp/bootstrap.hpp>
 #include <llarp/crypto/types.hpp>
 #include <llarp/router_contact.hpp>
 #include <llarp/util/fs.hpp>
 #include <llarp/util/str.hpp>
 #include <llarp/util/logging.hpp>
-#include "ini.hpp"
-#include "definition.hpp"
 #include <llarp/constants/files.hpp>
 #include <llarp/net/ip_address.hpp>
 #include <llarp/net/net_int.hpp>
@@ -16,7 +17,6 @@
 #include <llarp/service/address.hpp>
 #include <llarp/service/auth.hpp>
 #include <llarp/dns/srv_data.hpp>
-
 #include <llarp/router_contact.hpp>
 
 #include <cstdlib>

llarp/constants/version.cpp.in

@@ -1,5 +1,5 @@
-#include <constants/version.hpp>
+#include <llarp/constants/version.hpp>
-#include <constants/proto.hpp>
+#include <llarp/constants/proto.hpp>
 
 namespace llarp
 {

llarp/crypto/constants.hpp

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include <libntrup/ntru.h>
+#include <llarp/crypto/ntru/ntru.h>
 
 static constexpr uint32_t PUBKEYSIZE = 32;
 static constexpr uint32_t SECKEYSIZE = 64;

llarp/dns/rr.cpp

@@ -1,6 +1,6 @@
 #include "rr.hpp"
 #include "dns.hpp"
-#include "util/formattable.hpp"
+#include <llarp/util/formattable.hpp>
 #include <llarp/util/mem.hpp>
 #include <llarp/util/logging.hpp>
 

llarp/exit/session.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "exit_messages.hpp"
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
 #include <llarp/net/ip_packet.hpp>
 #include <llarp/path/pathbuilder.hpp>
 #include <llarp/routing/transfer_traffic_message.hpp>

llarp/handlers/exit.cpp

@@ -11,7 +11,7 @@
 #include <llarp/router/i_rc_lookup_handler.hpp>
 
 #include <cassert>
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
 
 namespace llarp
 {

llarp/messages/relay_commit.hpp

@@ -2,7 +2,7 @@
 
 #include <llarp/crypto/encrypted_frame.hpp>
 #include <llarp/crypto/types.hpp>
-#include "link_message.hpp"
+#include <llarp/messages/link_message.hpp>
 #include <llarp/path/path_types.hpp>
 #include <llarp/pow.hpp>
 

llarp/path/pathbuilder.cpp

@@ -1,10 +1,10 @@
 #include "pathbuilder.hpp"
+#include "path_context.hpp"
 
 #include <llarp/crypto/crypto.hpp>
 #include <llarp/messages/relay_commit.hpp>
 #include <llarp/nodedb.hpp>
-#include "path_context.hpp"
+#include <llarp/util/logging.hpp>
-#include "util/logging.hpp"
 #include <llarp/profiling.hpp>
 #include <llarp/router/abstractrouter.hpp>
 #include <llarp/router/i_rc_lookup_handler.hpp>

llarp/path/pathset.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "path_types.hpp"
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
 #include <llarp/router_id.hpp>
 #include <llarp/routing/message.hpp>
 #include <llarp/service/intro_set.hpp>

llarp/path/transit_hop.cpp

@@ -33,7 +33,9 @@ namespace llarp
     }
 
     TransitHop::TransitHop()
-        : m_UpstreamGather(transit_hop_queue_size), m_DownstreamGather(transit_hop_queue_size)
+        : IHopHandler{}
+        , m_UpstreamGather{transit_hop_queue_size}
+        , m_DownstreamGather{transit_hop_queue_size}
     {
       m_UpstreamGather.enable();
       m_DownstreamGather.enable();

llarp/path/transit_hop.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <llarp/constants/path.hpp>
-#include "ihophandler.hpp"
+#include <llarp/path/ihophandler.hpp>
-#include "path_types.hpp"
+#include <llarp/path/path_types.hpp>
 #include <llarp/routing/handler.hpp>
 #include <llarp/router_id.hpp>
 #include <llarp/util/compare_ptr.hpp>

llarp/quic/tunnel.cpp

@@ -1,7 +1,7 @@
 #include "tunnel.hpp"
-#include "service/convotag.hpp"
+#include <llarp/service/convotag.hpp>
-#include "service/endpoint.hpp"
+#include <llarp/service/endpoint.hpp>
-#include "service/name.hpp"
+#include <llarp/service/name.hpp>
 #include "stream.hpp"
 #include <limits>
 #include <llarp/util/logging.hpp>

llarp/router/route_poker.cpp

@@ -1,6 +1,6 @@
 #include "route_poker.hpp"
-#include "abstractrouter.hpp"
+#include <llarp/router/abstractrouter.hpp>
-#include "net/sock_addr.hpp"
+#include <llarp/net/sock_addr.hpp>
 #include <llarp/service/context.hpp>
 #include <llarp/dns/platform.hpp>
 #include <unordered_set>

llarp/service/convotag.cpp

@@ -1,5 +1,5 @@
 #include "convotag.hpp"
-#include "net/ip.hpp"
+#include <llarp/net/ip.hpp>
 
 namespace llarp::service
 {

llarp/service/endpoint.cpp

@@ -1,7 +1,15 @@
 #include <chrono>
 #include <memory>
 #include "endpoint.hpp"
+#include "endpoint_state.hpp"
+#include "endpoint_util.hpp"
+#include "hidden_service_address_lookup.hpp"
+#include "outbound_context.hpp"
+#include "protocol.hpp"
+#include "info.hpp"
+#include "protocol_type.hpp"
 
+#include <llarp/net/ip.hpp>
 #include <llarp/dht/context.hpp>
 #include <llarp/dht/key.hpp>
 #include <llarp/dht/messages/findintro.hpp>
@@ -16,27 +24,18 @@
 #include <llarp/router/abstractrouter.hpp>
 #include <llarp/routing/dht_message.hpp>
 #include <llarp/routing/path_transfer_message.hpp>
-#include "endpoint_state.hpp"
+
-#include "endpoint_util.hpp"
-#include "hidden_service_address_lookup.hpp"
-#include "net/ip.hpp"
-#include "outbound_context.hpp"
-#include "protocol.hpp"
-#include "service/info.hpp"
-#include "service/protocol_type.hpp"
 #include <llarp/util/str.hpp>
 #include <llarp/util/buffer.hpp>
 #include <llarp/util/meta/memfn.hpp>
 #include <llarp/link/link_manager.hpp>
 #include <llarp/tooling/dht_event.hpp>
+#include <llarp/quic/server.hpp>
 #include <llarp/quic/tunnel.hpp>
 #include <llarp/util/priority_queue.hpp>
 
 #include <optional>
 #include <utility>
-
-#include <llarp/quic/server.hpp>
-#include <llarp/quic/tunnel.hpp>
 #include <uvw.hpp>
 #include <variant>
 

llarp/service/endpoint.hpp

@@ -6,24 +6,27 @@
 #include <llarp/net/net.hpp>
 #include <llarp/path/path.hpp>
 #include <llarp/path/pathbuilder.hpp>
-#include "address.hpp"
-#include "handler.hpp"
-#include "identity.hpp"
-#include "pendingbuffer.hpp"
-#include "protocol.hpp"
-#include "sendcontext.hpp"
-#include "service/protocol_type.hpp"
-#include "session.hpp"
-#include "lookup.hpp"
 #include <llarp/util/compare_ptr.hpp>
+
+// --- begin kitchen sink headers ----
+#include <llarp/service/address.hpp>
+#include <llarp/service/handler.hpp>
+#include <llarp/service/identity.hpp>
+#include <llarp/service/pendingbuffer.hpp>
+#include <llarp/service/protocol.hpp>
+#include <llarp/service/sendcontext.hpp>
+#include <llarp/service/protocol_type.hpp>
+#include <llarp/service/session.hpp>
+#include <llarp/service/lookup.hpp>
+#include <llarp/service/endpoint_types.hpp>
+#include <llarp/endpoint_base.hpp>
+#include <llarp/service/auth.hpp>
+// ----- end kitchen sink headers -----
+
 #include <optional>
 #include <unordered_map>
 #include <variant>
 #include <oxenc/variant.h>
-#include "endpoint_types.hpp"
-#include "llarp/endpoint_base.hpp"
-
-#include "auth.hpp"
 
 #include <llarp/vpn/egres_packet_router.hpp>
 #include <llarp/dns/server.hpp>

llarp/service/intro.cpp

@@ -1,5 +1,5 @@
 #include "intro.hpp"
-#include "util/time.hpp"
+#include <llarp/util/time.hpp>
 
 namespace llarp
 {

llarp/service/outbound_context.cpp

@@ -1,16 +1,15 @@
 #include "outbound_context.hpp"
-
-#include <llarp/router/abstractrouter.hpp>
 #include "async_key_exchange.hpp"
 #include "hidden_service_address_lookup.hpp"
 #include "endpoint.hpp"
+#include "endpoint_util.hpp"
+#include "protocol_type.hpp"
+
+#include <llarp/router/abstractrouter.hpp>
 #include <llarp/nodedb.hpp>
 #include <llarp/profiling.hpp>
 #include <llarp/util/meta/memfn.hpp>
 
-#include "endpoint_util.hpp"
-#include "service/protocol_type.hpp"
-
 #include <random>
 #include <algorithm>
 

llarp/tooling/router_hive.hpp

@@ -3,8 +3,8 @@
 #include "router_event.hpp"
 
 #include <llarp.hpp>
-#include <config/config.hpp>
+#include <llarp/config/config.hpp>
-#include <tooling/hive_context.hpp>
+#include <llarp/tooling/hive_context.hpp>
 
 #include <vector>
 #include <deque>

llarp/vpn/win32.cpp

@@ -1,4 +1,4 @@
-#include "vpn/win32.hpp"
+#include "win32.hpp"
 #include <llarp/win32/windivert.hpp>
 #include <llarp/win32/wintun.hpp>
 #include <fmt/core.h>

pybind/llarp/context.cpp

@@ -3,7 +3,8 @@
 #include <llarp/tooling/hive_context.hpp>
 #include <llarp/router/router.hpp>
 #include <llarp/handlers/pyhandler.hpp>
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
+
 namespace llarp
 {
   void

test/CMakeLists.txt

@@ -60,8 +60,4 @@ if(WIN32)
     target_link_libraries(testAll PUBLIC ws2_32 iphlpapi shlwapi)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    target_link_directories(testAll PRIVATE /usr/local/lib)
-endif()
-
 add_custom_target(check COMMAND testAll)

test/check_main.cpp

@@ -1,8 +1,8 @@
 #define CATCH_CONFIG_RUNNER
 #include <catch2/catch.hpp>
 
-#include <util/logging.hpp>
+#include <llarp/util/logging.hpp>
-#include <util/service_manager.hpp>
+#include <llarp/util/service_manager.hpp>
 
 #ifdef _WIN32
 #include <winsock2.h>

test/config/test_llarp_config_definition.cpp

@@ -1,4 +1,4 @@
-#include <config/definition.hpp>
+#include <llarp/config/definition.hpp>
 
 #include <catch2/catch.hpp>
 

test/config/test_llarp_config_ini.cpp

@@ -1,4 +1,4 @@
-#include <config/ini.hpp>
+#include <llarp/config/ini.hpp>
 
 #include <catch2/catch.hpp>
 

test/config/test_llarp_config_output.cpp

@@ -1,4 +1,4 @@
-#include <config/definition.hpp>
+#include <llarp/config/definition.hpp>
 
 #include <catch2/catch.hpp>
 

test/crypto/test_llarp_crypto.cpp

@@ -1,4 +1,4 @@
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 
 #include <iostream>
 

test/crypto/test_llarp_crypto_types.cpp

@@ -1,9 +1,9 @@
-#include <crypto/types.hpp>
+#include <llarp/crypto/types.hpp>
 
 #include <fstream>
 #include <string>
 
-#include <test_util.hpp>
+#include "test_util.hpp"
 #include <catch2/catch.hpp>
 
 extern "C" {

test/crypto/test_llarp_key_manager.cpp

@@ -1,14 +1,15 @@
-#include <config/key_manager.hpp>
+#include "llarp_test.hpp"
+#include "test_util.hpp"
 
-#include <crypto/crypto.hpp>
+#include <llarp/config/key_manager.hpp>
-#include <crypto/crypto_libsodium.hpp>
+
-#include <llarp_test.hpp>
+#include <llarp/crypto/crypto.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 
 #include <functional>
 #include <random>
 
 #include <string>
-#include <test_util.hpp>
 #include <catch2/catch.hpp>
 
 using namespace ::llarp;

test/dns/test_llarp_dns_dns.cpp

@@ -1,11 +1,11 @@
 #include <catch2/catch.hpp>
-#include <dns/dns.hpp>
+#include <llarp/dns/dns.hpp>
-#include <dns/message.hpp>
+#include <llarp/dns/message.hpp>
-#include <dns/name.hpp>
+#include <llarp/dns/name.hpp>
-#include <dns/rr.hpp>
+#include <llarp/dns/rr.hpp>
-#include <net/net.hpp>
+#include <llarp/net/net.hpp>
-#include <net/ip.hpp>
+#include <llarp/net/ip.hpp>
-#include <util/buffer.hpp>
+#include <llarp/util/buffer.hpp>
 
 #include <algorithm>
 

test/llarp_test.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 #include <catch2/catch.hpp>
 
 namespace llarp::test

test/net/test_ip_address.cpp

@@ -1,4 +1,4 @@
-#include <net/ip_address.hpp>
+#include <llarp/net/ip_address.hpp>
 
 #include <catch2/catch.hpp>
 

test/net/test_llarp_net.cpp

@@ -1,7 +1,7 @@
-#include <net/net_int.hpp>
+#include <llarp/net/net_int.hpp>
-#include <net/ip.hpp>
+#include <llarp/net/ip.hpp>
-#include <net/ip_range.hpp>
+#include <llarp/net/ip_range.hpp>
-#include <net/net.hpp>
+#include <llarp/net/net.hpp>
 #include <oxenc/hex.h>
 
 #include <catch2/catch.hpp>

test/net/test_sock_addr.cpp

@@ -1,6 +1,6 @@
-#include <util/mem.hpp>
+#include <llarp/util/mem.hpp>
-#include <net/sock_addr.hpp>
+#include <llarp/net/sock_addr.hpp>
-#include <net/net_if.hpp>
+#include <llarp/net/net_if.hpp>
 #include <llarp/util/logging.hpp>
 
 #include <catch2/catch.hpp>

test/nodedb/test_nodedb.cpp

@@ -1,8 +1,8 @@
 #include <catch2/catch.hpp>
-#include "config/config.hpp"
 
-#include <router_contact.hpp>
+#include <llarp/config/config.hpp>
-#include <nodedb.hpp>
+#include <llarp/router_contact.hpp>
+#include <llarp/nodedb.hpp>
 
 using llarp_nodedb = llarp::NodeDB;
 

test/path/test_path.cpp

@@ -1,4 +1,4 @@
-#include <path/path.hpp>
+#include <llarp/path/path.hpp>
 #include <catch2/catch.hpp>
 
 using Path_t   = llarp::path::Path;

test/peerstats/test_peer_db.cpp

@@ -1,12 +1,12 @@
-#include <peerstats/peer_db.hpp>
+#include <llarp/peerstats/peer_db.hpp>
 #include <test_util.hpp>
 
 #include <numeric>
 #include <catch2/catch.hpp>
-#include "peerstats/types.hpp"
+#include <llarp/peerstats/types.hpp>
-#include "router_contact.hpp"
+#include <llarp/router_contact.hpp>
-#include "util/logging.hpp"
+#include <llarp/util/logging.hpp>
-#include "util/time.hpp"
+#include <llarp/util/time.hpp>
 
 TEST_CASE("Test PeerDb PeerStats memory storage", "[PeerDb]")
 {

test/peerstats/test_peer_types.cpp

@@ -1,5 +1,5 @@
 #include <numeric>
-#include <peerstats/types.hpp>
+#include <llarp/peerstats/types.hpp>
 #include <test_util.hpp>
 
 #include <catch2/catch.hpp>

test/router/test_llarp_router_version.cpp

@@ -1,5 +1,5 @@
-#include <router_version.hpp>
+#include <llarp/router_version.hpp>
-#include "router/router.hpp"
+#include <llarp/router/router.hpp>
 
 #include <catch2/catch.hpp>
 

test/routing/test_llarp_routing_obtainexitmessage.cpp

@@ -1,8 +1,7 @@
-#include <exit/exit_messages.hpp>
+#include "llarp_test.hpp"
-
+#include <llarp/exit/exit_messages.hpp>
-#include <crypto/crypto.hpp>
+#include <llarp/crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
-#include <llarp_test.hpp>
 
 #include <catch2/catch.hpp>
 

test/routing/test_llarp_routing_transfer_traffic.cpp

@@ -1,4 +1,4 @@
-#include <routing/transfer_traffic_message.hpp>
+#include <llarp/routing/transfer_traffic_message.hpp>
 
 #include <catch2/catch.hpp>
 

test/service/test_llarp_service_address.cpp

@@ -1,4 +1,4 @@
-#include <service/address.hpp>
+#include <llarp/service/address.hpp>
 
 #include <catch2/catch.hpp>
 

test/service/test_llarp_service_identity.cpp

@@ -1,13 +1,13 @@
-#include <crypto/crypto.hpp>
+#include <llarp/crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 #include <sodium/crypto_scalarmult_ed25519.h>
-#include <path/path.hpp>
+#include <llarp/path/path.hpp>
-#include <service/address.hpp>
+#include <llarp/service/address.hpp>
-#include <service/identity.hpp>
+#include <llarp/service/identity.hpp>
-#include <service/intro_set.hpp>
+#include <llarp/service/intro_set.hpp>
-#include <util/time.hpp>
+#include <llarp/util/time.hpp>
 
-#include <test_util.hpp>
+#include "test_util.hpp"
 #include <catch2/catch.hpp>
 
 using namespace llarp;

test/service/test_llarp_service_name.cpp

@@ -1,6 +1,6 @@
 #include "catch2/catch.hpp"
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
-#include <service/name.hpp>
+#include <llarp/service/name.hpp>
 #include <oxenc/hex.h>
 
 using namespace std::literals;

test/test_llarp_encrypted_frame.cpp

@@ -1,12 +1,9 @@
-#include <crypto/encrypted_frame.hpp>
+#include "llarp_test.hpp"
-
+#include "test_util.hpp"
-#include <crypto/crypto.hpp>
+#include <llarp/crypto/encrypted_frame.hpp>
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto.hpp>
-#include <llarp_test.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
-#include <messages/relay_commit.hpp>
+#include <llarp/messages/relay_commit.hpp>
-
-#include <test_util.hpp>
-
 #include <catch2/catch.hpp>
 
 using namespace ::llarp;

test/test_llarp_router_contact.cpp

@@ -1,9 +1,9 @@
 #include <catch2/catch.hpp>
 
-#include <crypto/crypto.hpp>
+#include <llarp/crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
-#include <router_contact.hpp>
+#include <llarp/router_contact.hpp>
-#include <net/net_int.hpp>
+#include <llarp/net/net_int.hpp>
 #include <llarp/util/time.hpp>
 
 namespace

test/test_util.cpp

@@ -1,4 +1,4 @@
-#include <test_util.hpp>
+#include "test_util.hpp"
 
 #include <random>
 

test/test_util.hpp

@@ -1,9 +1,8 @@
 #ifndef TEST_UTIL_HPP
 #define TEST_UTIL_HPP
 
-#include <util/fs.hpp>
+#include <llarp/util/fs.hpp>
-#include <util/types.hpp>
+#include <llarp/util/types.hpp>
-
 #include <bitset>
 #include <vector>
 

test/util/meta/test_llarp_util_memfn.cpp

@@ -1,4 +1,4 @@
-#include <util/meta/memfn.hpp>
+#include <llarp/util/meta/memfn.hpp>
 
 #include <catch2/catch.hpp>
 

test/util/test_llarp_util_aligned.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 
-#include <util/aligned.hpp>
+#include <llarp/util/aligned.hpp>
 
 #include <iostream>
 #include <sstream>

test/util/test_llarp_util_bencode.cpp

@@ -1,5 +1,5 @@
-#include <util/bencode.h>
+#include <llarp/util/bencode.h>
-#include <util/bencode.hpp>
+#include <llarp/util/bencode.hpp>
 
 #include <iostream>
 #include <string>

test/util/test_llarp_util_bits.cpp

@@ -1,5 +1,5 @@
 #include <catch2/catch.hpp>
-#include <util/bits.hpp>
+#include <llarp/util/bits.hpp>
 
 using namespace llarp::bits;
 

test/util/test_llarp_util_decaying_hashset.cpp

@@ -1,5 +1,5 @@
-#include <util/decaying_hashset.hpp>
+#include <llarp/util/decaying_hashset.hpp>
-#include <router_id.hpp>
+#include <llarp/router_id.hpp>
 #include <catch2/catch.hpp>
 
 TEST_CASE("DecayingHashSet test decay static time", "[decaying-hashset]")

test/util/test_llarp_util_log_level.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
-#include <util/logging.hpp>
+#include <llarp/util/logging.hpp>
-#include <config/config.hpp>
+#include <llarp/config/config.hpp>
 #include <oxen/log/level.hpp>
 
 using TestString = std::string;

test/util/test_llarp_util_str.cpp

@@ -1,4 +1,4 @@
-#include <util/str.hpp>
+#include <llarp/util/str.hpp>
 #include <catch2/catch.hpp>
 
 #include <vector>

test/util/thread/test_llarp_util_queue.cpp

@@ -1,6 +1,6 @@
-#include <util/thread/queue.hpp>
+#include <llarp/util/thread/queue.hpp>
-#include <util/thread/threading.hpp>
+#include <llarp/util/thread/threading.hpp>
-#include <util/thread/barrier.hpp>
+#include <llarp/util/thread/barrier.hpp>
 
 #include <array>
 #include <condition_variable>

test/util/thread/test_llarp_util_queue_manager.cpp

@@ -1,4 +1,4 @@
-#include <util/thread/queue_manager.hpp>
+#include <llarp/util/thread/queue_manager.hpp>
 
 #include <optional>
 #include <vector>