Merge pull request #214 from michael-loki/reorganise_source

Reorganise source into more folders. Confirmed it's just pure rename

CMakeLists.txt

@@ -209,32 +209,32 @@ if(UNIX)
   add_definitions(-DPOSIX)
   if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c)
-        set(EV_SRC llarp/ev_epoll.cpp)
+        set(EV_SRC llarp/ev/ev_epoll.cpp)
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-linux.c)
-        set(EV_SRC llarp/ev_epoll.cpp)
+        set(EV_SRC llarp/ev/ev_epoll.cpp)
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-openbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev_kqueue.cpp)
+        set(EV_SRC llarp/ev/ev_kqueue.cpp)
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-netbsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev_kqueue.cpp)
+        set(EV_SRC llarp/ev/ev_kqueue.cpp)
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-freebsd.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev_kqueue.cpp)
+        set(EV_SRC llarp/ev/ev_kqueue.cpp)
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-darwin.c ${TT_ROOT}/tuntap-unix-bsd.c)
-        set(EV_SRC llarp/ev_kqueue.cpp)
+        set(EV_SRC llarp/ev/ev_kqueue.cpp)
 # TODO: _actually_ port to solaris/illumos (it's fairly complete...except for TUN) -rick
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
         set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-unix-sunos.c)
-        set(EV_SRC llarp/ev_epoll.cpp)
+        set(EV_SRC llarp/ev/ev_epoll.cpp)
     else()
         message(FATAL_ERROR "Your operating system is not supported yet")
     endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 elseif(WIN32)
     set(LIBTUNTAP_IMPL ${TT_ROOT}/tuntap-windows.c)
-    set(EV_SRC llarp/ev_win32.cpp)
+    set(EV_SRC llarp/ev/ev_win32.cpp)
     add_definitions(-DWIN32_LEAN_AND_MEAN -DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500)
 else()
     message(FATAL_ERROR "What operating system _are_ you building on/for?")
@@ -291,8 +291,10 @@ set(LIB_UTIL_SRC
   llarp/util/encode.cpp
   llarp/util/endian.cpp
   llarp/util/fs.cpp
+  llarp/util/ini.cpp
   llarp/util/logger.c
   llarp/util/logger.cpp
+  llarp/util/logic.cpp
   llarp/util/mem.cpp
   llarp/util/queue_manager.cpp
   llarp/util/queue.cpp
@@ -307,13 +309,11 @@ set(LIB_UTIL_SRC
 )
 
 set(LIB_PLATFORM_SRC
-# needed for threading
-  llarp/logic.cpp
 # for networking
-  llarp/ev.cpp
-  llarp/net.cpp
-  llarp/net_addr.cpp
-  llarp/net_inaddr.cpp
+  llarp/ev/ev.cpp
+  llarp/net/net.cpp
+  llarp/net/net_addr.cpp
+  llarp/net/net_inaddr.cpp
 # for android shim
   ${ANDROID_PLATFORM_SRC}
 # process isolation implementation
@@ -323,9 +323,9 @@ set(LIB_PLATFORM_SRC
 # c++17 compat code
   ${CXX_COMPAT_SRC}
 # win32 inline code
-  llarp/win32_inet.c
-  llarp/win32_intrnl.c
-  llarp/win32_upoll.c
+  llarp/win32/win32_inet.c
+  llarp/win32/win32_intrnl.c
+  llarp/win32/win32_upoll.c
 )
 
 set(NTRU_AVX_SRC
@@ -459,11 +459,14 @@ if(WIN32)
 endif(WIN32)
 
 set(DNSLIB_SRC
+  llarp/dns/dotlokilookup.cpp
   llarp/dns/dns.cpp
+  llarp/dns/iptracker.cpp
   llarp/dns/message.cpp
   llarp/dns/name.cpp
   llarp/dns/query.cpp
   llarp/dns/question.cpp
+  llarp/dns/rectypes.cpp
   llarp/dns/rr.cpp
   llarp/dns/serialize.cpp
   llarp/dns/server.cpp
@@ -502,9 +505,6 @@ set(LIB_SRC
   llarp/dht/node.cpp
   llarp/dht/publish_intro.cpp
   llarp/dns.cpp
-  llarp/dns_dotlokilookup.cpp
-  llarp/dns_iptracker.cpp
-  llarp/dns_rectypes.cpp
   llarp/dnsc.cpp
   llarp/dnsd.cpp
   llarp/encrypted.cpp
@@ -522,11 +522,9 @@ set(LIB_SRC
   llarp/exit/transfer_traffic.cpp
   llarp/exit/update_exit.cpp
   llarp/exit_info.cpp
-  llarp/exit_route.cpp
   llarp/handlers/exit.cpp
   llarp/handlers/null.cpp
   llarp/handlers/tun.cpp
-  llarp/ini.cpp
   llarp/ip.cpp
   llarp/link/curvecp.cpp
   llarp/link/encoder.cpp
@@ -537,7 +535,6 @@ set(LIB_SRC
   llarp/link_intro.cpp
   llarp/link_layer.cpp
   llarp/link_message.cpp
-  llarp/messages.cpp
   llarp/messages/dht.cpp
   llarp/messages/dht_immediate.cpp
   llarp/messages/discard.cpp
@@ -549,12 +546,12 @@ set(LIB_SRC
   llarp/messages/relay.cpp
   llarp/messages/relay_commit.cpp
   llarp/messages/transfer_traffic.cpp
-  llarp/net_int.cpp
+  llarp/net/net_int.cpp
   llarp/nodedb.cpp
-  llarp/path.cpp
-  llarp/path_types.cpp
-  llarp/pathbuilder.cpp
-  llarp/pathset.cpp
+  llarp/path/path.cpp
+  llarp/path/path_types.cpp
+  llarp/path/pathbuilder.cpp
+  llarp/path/pathset.cpp
   llarp/pow.cpp
   llarp/profiling.cpp
   llarp/proofofwork.cpp
@@ -601,27 +598,27 @@ set(DNS_SRC
   llarp/dns_iptracker.cpp
   llarp/dns_dotlokilookup.cpp
   llarp/dns_rectypes.cpp
-  llarp/net.cpp
+  llarp/net/net.cpp
   daemon/dns.cpp
 )
 
 set(TEST_SRC
+  test/dht/test_llarp_dht_key.cpp
   test/dht/test_llarp_dht.cpp
   test/dns/test_llarp_dns_dns.cpp
   test/exit/test_llarp_exit_context.cpp
   test/link/test_llarp_link.cpp
   test/main.cpp
+  test/net/test_llarp_net_inaddr.cpp
+  test/net/test_llarp_net.cpp
   test/routing/llarp_routing_transfer_traffic.cpp
   test/routing/test_llarp_routing_obtainexitmessage.cpp
   test/service/test_llarp_service_address.cpp
   test/service/test_llarp_service_identity.cpp
   test/test_llarp_crypto.cpp
-  test/test_llarp_dht_key.cpp
   test/test_llarp_dns.cpp
   test/test_llarp_dnsd.cpp
   test/test_llarp_encrypted_frame.cpp
-  test/test_llarp_net_inaddr.cpp
-  test/test_llarp_net.cpp
   test/test_llarp_router_contact.cpp
   test/util/test_llarp_util_aligned.cpp
   test/util/test_llarp_util_bencode.cpp

daemon/main.cpp

@@ -1,9 +1,10 @@
 #include <config.hpp>  // for ensure_config
-#include <util/fs.hpp>
-#include <getopt.h>
 #include <libgen.h>
 #include <llarp.h>
+#include <util/fs.hpp>
 #include <util/logger.hpp>
+
+#include <getopt.h>
 #include <signal.h>
 
 #include <string>

include/llarp.h

@@ -3,11 +3,11 @@
 
 #ifdef __cplusplus
 #include <constants/version.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <handlers/tun.hpp>     // for handlers
-#include <logic.hpp>
 #include <service/address.hpp>  // for service::address
 #include <service/endpoint.hpp>
+#include <util/logic.hpp>
 #include <util/mem.h>
 
 extern "C"

libabyss/include/abyss/client.hpp

@@ -2,7 +2,7 @@
 #define __ABYSS_CLIENT_HPP__
 
 #include <abyss/json.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <util/string_view.hpp>
 
 #include <deque>

libabyss/include/abyss/server.hpp

@@ -2,8 +2,8 @@
 #define __ABYSS_SERVER_HPP__
 
 #include <abyss/json.hpp>
-#include <ev.h>
-#include <logic.hpp>
+#include <ev/ev.h>
+#include <util/logic.hpp>
 #include <util/string_view.hpp>
 #include <util/time.hpp>
 

libabyss/main.cpp

@@ -1,5 +1,5 @@
 #include <libabyss.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 
 #ifndef _WIN32
 #include <sys/signal.h>

llarp/address_info.cpp

@@ -2,11 +2,11 @@
 #ifndef _WIN32
 #include <arpa/inet.h>
 #endif
+#include <net/net.hpp>
 #include <util/bencode.h>
 #include <util/mem.h>
 
 #include <string.h>
-#include <net.hpp>
 
 namespace llarp
 {

llarp/address_info.hpp

@@ -2,7 +2,7 @@
 #define LLARP_AI_HPP
 
 #include <crypto.hpp>
-#include <net.h>
+#include <net/net.h>
 #include <util/bencode.hpp>
 #include <util/mem.h>
 

llarp/config.cpp

@@ -2,9 +2,9 @@
 #include <config.hpp>
 
 #include <constants/defaults.hpp>
-#include <ini.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <util/fs.hpp>
+#include <util/ini.hpp>
 #include <util/logger.hpp>
 #include <util/mem.hpp>
 
@@ -141,7 +141,7 @@ llarp_generic_ensure_config(std::ofstream &f, std::string basepath)
   f << "bind=127.0.0.1:1190" << std::endl;
   f << std::endl << std::endl;
 
-  f << "# system settings for priviledges and such" << std::endl;
+  f << "# system settings for privileges and such" << std::endl;
   f << "[system]" << std::endl;
 #ifdef _WIN32
   f << "# ";

llarp/config.hpp

@@ -1,5 +1,5 @@
-#ifndef LIBLLARP_CONFIG_HPP
-#define LIBLLARP_CONFIG_HPP
+#ifndef LLARP_CONFIG_HPP
+#define LLARP_CONFIG_HPP
 #include <config.h>
 
 #include <list>

llarp/context.cpp

@@ -2,12 +2,12 @@
 #include <llarp.h>
 
 #include <dht/context.hpp>
-#include <dns_dotlokilookup.hpp>
+#include <dns/dotlokilookup.hpp>
 #include <dnsd.hpp>
-#include <ev.hpp>
-#include <util/logger.h>
-#include <router.hpp>
+#include <ev/ev.hpp>
 #include <nodedb.hpp>
+#include <router.hpp>
+#include <util/logger.h>
 
 #include <getopt.h>
 #include <signal.h>

llarp/dht/message.hpp

@@ -3,7 +3,7 @@
 
 #include <dht.h>
 #include <dht/key.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <util/bencode.hpp>
 
 #include <vector>

llarp/dns.hpp

@@ -1,5 +1,5 @@
-#ifndef LIBLLARP_DNS_HPP
-#define LIBLLARP_DNS_HPP
+#ifndef LLARP_DNS_HPP
+#define LLARP_DNS_HPP
 
 #include <dns.h>
 #include <sys/types.h>  // for uint & ssize_t
@@ -8,8 +8,8 @@
 #include <sys/socket.h>
 #endif
 
-#include <net.hpp>  // for llarp::Addr , llarp::huint32_t
-#include <dns_rectypes.hpp>
+#include <dns/rectypes.hpp>
+#include <net/net.hpp>  // for llarp::Addr , llarp::huint32_t
 
 #include <map>
 #include <string>
@@ -23,6 +23,7 @@
 #define LLARP_DNS_RECTYPE_MX 15
 #define LLARP_DNS_RECTYPE_TXT 16
 
+struct dnsc_answer_request;
 struct dnsd_context;
 
 // dnsc can work over any UDP socket

llarp/dns/dotlokilookup.cpp

@@ -1,7 +1,8 @@
-#include <dns_dotlokilookup.hpp>
+#include <dns/dotlokilookup.hpp>
+
 #include <handlers/tun.hpp>
-#include <logic.hpp>
 #include <service/context.hpp>
+#include <util/logic.hpp>
 
 std::string const default_chars =
     "abcdefghijklmnaoqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";

llarp/dns/dotlokilookup.hpp

@@ -1,5 +1,5 @@
-#ifndef LIBLLARP_DNS_DOTLOKILOOKUP_HPP
-#define LIBLLARP_DNS_DOTLOKILOOKUP_HPP
+#ifndef LLARP_DNS_DOTLOKILOOKUP_HPP
+#define LLARP_DNS_DOTLOKILOOKUP_HPP
 
 #include <dnsd.hpp>
 #include <service/address.hpp>

llarp/dns/iptracker.cpp

@@ -1,4 +1,4 @@
-#include <dns_iptracker.hpp>
+#include <dns/iptracker.hpp>
 
 dns_iptracker g_dns_iptracker;
 

llarp/dns/iptracker.hpp

@@ -1,8 +1,8 @@
-#ifndef LIBLLARP_DNSIPTRACKER_HPP
-#define LIBLLARP_DNSIPTRACKER_HPP
+#ifndef LLARP_DNSIPTRACKER_HPP
+#define LLARP_DNSIPTRACKER_HPP
 
-#include <dns_dotlokilookup.hpp>
-#include <net.hpp>
+#include <dns/dotlokilookup.hpp>
+#include <net/net.hpp>
 #include <service/address.hpp>
 
 #include <map>

llarp/dns/name.cpp

@@ -1,5 +1,5 @@
 #include <dns/name.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 
 #include <algorithm>
 #include <sstream>

llarp/dns/name.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_DNS_NAME_HPP
 #define LLARP_DNS_NAME_HPP
 
-#include <net_int.hpp>
+#include <net/net_int.hpp>
 #include <util/buffer.h>
 
 #include <string>

llarp/dns/question.hpp

@@ -3,7 +3,7 @@
 
 #include <dns/serialize.hpp>
 #include <dns/name.hpp>
-#include <net_int.hpp>
+#include <net/net_int.hpp>
 
 namespace llarp
 {

llarp/dns/rectypes.cpp

@@ -1,5 +1,5 @@
 #include <dns.hpp>  // for vput16bits()
-#include <dns_rectypes.hpp>
+#include <dns/rectypes.hpp>
 
 namespace llarp
 {

llarp/dns/rectypes.hpp

@@ -1,7 +1,7 @@
-#ifndef LIBLLARP_DNS_REC_TYPES_HPP
-#define LIBLLARP_DNS_REC_TYPES_HPP
+#ifndef LLARP_DNS_REC_TYPES_HPP
+#define LLARP_DNS_REC_TYPES_HPP
 
-#include <net.hpp>   // for llarp::Addr , llarp::huint32_t
+#include <net/net.hpp>    // for llarp::Addr , llarp::huint32_t
 #include <util/buffer.h>  // for byte_t
 
 #include <vector>

llarp/dns/rr.hpp

@@ -3,7 +3,7 @@
 
 #include <dns/name.hpp>
 #include <dns/serialize.hpp>
-#include <net_int.hpp>
+#include <net/net_int.hpp>
 
 #include <memory>
 #include <vector>

llarp/dns/serialize.cpp

@@ -1,5 +1,5 @@
 #include <dns/serialize.hpp>
-#include <net_int.hpp>
+#include <net/net_int.hpp>
 
 namespace llarp
 {

llarp/dns/server.hpp

@@ -2,8 +2,8 @@
 #define LLARP_DNS_SERVER_HPP
 
 #include <dns/message.hpp>
-#include <ev.h>
-#include <net.hpp>
+#include <ev/ev.h>
+#include <net/net.hpp>
 #include <util/string_view.hpp>
 
 #include <unordered_map>

llarp/dnsc.cpp

@@ -1,5 +1,5 @@
 #include <dnsc.hpp>
-#include <net.hpp>  // for llarp::Addr
+#include <net/net.hpp>  // for llarp::Addr
 #include <util/logger.hpp>
 
 #ifndef _WIN32

llarp/dnsc.hpp

@@ -1,8 +1,8 @@
-#ifndef LIBLLARP_DNSC_HPP
-#define LIBLLARP_DNSC_HPP
+#ifndef LLARP_DNSC_HPP
+#define LLARP_DNSC_HPP
 
-#include <ev.h>     // for sockaadr
 #include <dns.hpp>  // get protocol structs
+#include <ev/ev.h>  // for sockaadr
 
 // internal, non-public functions
 // well dnsc init/stop are public...

llarp/dnsd.cpp

@@ -1,5 +1,5 @@
 #include <dnsd.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 
 extern dns_tracker dns_udp_tracker;
 

llarp/dnsd.hpp

@@ -1,9 +1,9 @@
-#ifndef LIBLLARP_DNSD_HPP
-#define LIBLLARP_DNSD_HPP
+#ifndef LLARP_DNSD_HPP
+#define LLARP_DNSD_HPP
 
-#include <ev.h>     // for sockaadr
 #include <dns.hpp>  // question and dnsc
 #include <dnsc.hpp>
+#include <ev/ev.h>  // for sockaadr
 
 #include <string>
 

llarp/ev/ev.cpp

@@ -1,5 +1,5 @@
-#include <ev.h>
-#include <logic.hpp>
+#include <ev/ev.h>
+#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
 
@@ -7,12 +7,12 @@
 
 // apparently current Solaris will emulate epoll.
 #if __linux__ || __sun__
-#include "ev_epoll.hpp"
+#include <ev/ev_epoll.hpp>
 #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
     || (__APPLE__ && __MACH__)
-#include "ev_kqueue.hpp"
+#include <ev/ev_kqueue.hpp>
 #elif defined(_WIN32) || defined(_WIN64) || defined(__NT__)
-#include "ev_win32.hpp"
+#include <ev/ev_win32.hpp>
 #else
 #error No async event loop for your platform, subclass llarp_ev_loop
 #endif

llarp/ev/ev.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_EV_HPP
 #define LLARP_EV_HPP
 
-#include <ev.h>
+#include <ev/ev.h>
 #include <codel.hpp>
 #include <util/buffer.h>
 #include <util/threading.hpp>
@@ -17,8 +17,8 @@
 #include <unistd.h>
 
 #ifdef _WIN32
-#include <win32_up.h>
-#include <win32_upoll.h>
+#include <win32/win32_up.h>
+#include <win32/win32_upoll.h>
 // From the preview SDK, should take a look at that
 // periodically in case its definition changes
 #define UNIX_PATH_MAX 108

llarp/ev/ev_epoll.cpp

@@ -0,0 +1 @@
+#include <ev/ev_epoll.hpp>

llarp/ev/ev_epoll.hpp

@@ -1,9 +1,9 @@
 #ifndef EV_EPOLL_HPP
 #define EV_EPOLL_HPP
 
-#include <ev.hpp>
-#include <net.h>
-#include <net.hpp>
+#include <ev/ev.hpp>
+#include <net/net.h>
+#include <net/net.hpp>
 #include <util/buffer.h>
 #include <util/buffer.hpp>
 #include <util/logger.hpp>
@@ -25,7 +25,7 @@
 
 namespace llarp
 {
-  int
+  inline int
   tcp_conn::read(byte_t* buf, size_t sz)
   {
     if(_shouldClose)
@@ -47,14 +47,14 @@ namespace llarp
     return 0;
   }
 
-  void
+  inline void
   tcp_conn::flush_write()
   {
     connected();
     ev_io::flush_write();
   }
 
-  ssize_t
+  inline ssize_t
   tcp_conn::do_write(void* buf, size_t sz)
   {
     if(_shouldClose)
@@ -65,7 +65,7 @@ namespace llarp
     return ::send(fd, buf, sz, MSG_NOSIGNAL);  // ignore sigpipe
   }
 
-  void
+  inline void
   tcp_conn::connect()
   {
     socklen_t slen = sizeof(sockaddr_in);
@@ -94,7 +94,7 @@ namespace llarp
     }
   }
 
-  int
+  inline int
   tcp_serv::read(byte_t*, size_t)
   {
     int new_fd = ::accept(fd, nullptr, nullptr);

llarp/ev/ev_kqueue.cpp

@@ -0,0 +1 @@
+#include <ev/ev_kqueue.hpp>

llarp/ev/ev_kqueue.hpp

@@ -1,9 +1,9 @@
 #ifndef EV_KQUEUE_HPP
 #define EV_KQUEUE_HPP
 
-#include <ev.hpp>
-#include <net.h>
-#include <net.hpp>
+#include <ev/ev.hpp>
+#include <net/net.h>
+#include <net/net.hpp>
 #include <util/buffer.h>
 #include <util/logger.hpp>
 

llarp/ev/ev_win32.cpp

@@ -0,0 +1 @@
+#include <ev/ev_win32.hpp>

llarp/ev/ev_win32.hpp

@@ -2,10 +2,10 @@
 #define EV_WIN32_HPP
 
 #include <buffer.h>
-#include <ev.hpp>
-#include <logger.hpp>
-#include <net.h>
-#include <net.hpp>
+#include <ev/ev.hpp>
+#include <util/logger.hpp>
+#include <net/net.h>
+#include <net/net.hpp>
 #include <windows.h>
 #include <process.h>
 

llarp/ev_epoll.cpp

@@ -1 +0,0 @@
-

llarp/ev_kqueue.cpp

@@ -1 +0,0 @@
-#include <ev_kqueue.hpp>

llarp/ev_win32.cpp

@@ -1 +0,0 @@
-#include <ev_win32.hpp>

llarp/exit/endpoint.hpp

@@ -3,7 +3,7 @@
 
 #include <crypto.hpp>
 #include <ip.hpp>
-#include <path.hpp>
+#include <path/path.hpp>
 #include <util/time.hpp>
 
 namespace llarp

llarp/exit/session.cpp

@@ -1,5 +1,5 @@
 #include <exit/session.hpp>
-#include <path.hpp>
+#include <path/path.hpp>
 #include <router.hpp>
 
 namespace llarp

llarp/exit/session.hpp

@@ -4,7 +4,7 @@
 #include <ip.hpp>
 #include <messages/exit.hpp>
 #include <messages/transfer_traffic.hpp>
-#include <pathbuilder.hpp>
+#include <path/pathbuilder.hpp>
 
 #include <deque>
 #include <queue>

llarp/exit_info.hpp

@@ -2,7 +2,7 @@
 #define LLARP_XI_HPP
 
 #include <crypto.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <util/bencode.hpp>
 #include <util/bits.hpp>
 

llarp/exit_route.cpp

@@ -1,58 +0,0 @@
-#ifndef _WIN32
-#include <arpa/inet.h>
-#endif
-
-#include <exit_route.h>
-#include <util/bencode.h>
-
-#include <llarp/string.h>
-
-bool
-llarp_xr_bencode(struct llarp_xr* xr, llarp_buffer_t* buff)
-{
-  char addr_buff[128] = {0};
-  const char* addr;
-
-  if(!bencode_start_dict(buff))
-    return false;
-
-  /** gateway */
-  addr = inet_ntop(AF_INET6, &xr->gateway, addr_buff, sizeof(addr_buff));
-  if(!addr)
-    return false;
-  if(!bencode_write_bytestring(buff, "a", 1))
-    return false;
-  if(!bencode_write_bytestring(buff, addr, strnlen(addr, sizeof(addr_buff))))
-    return false;
-
-  /** netmask */
-  addr = inet_ntop(AF_INET6, &xr->netmask, addr_buff, sizeof(addr_buff));
-  if(!addr)
-    return false;
-  if(!bencode_write_bytestring(buff, "b", 1))
-    return false;
-  if(!bencode_write_bytestring(buff, addr, strnlen(addr, sizeof(addr_buff))))
-    return false;
-
-  /** source */
-  addr = inet_ntop(AF_INET6, &xr->source, addr_buff, sizeof(addr_buff));
-  if(!addr)
-    return false;
-  if(!bencode_write_bytestring(buff, "c", 1))
-    return false;
-  if(!bencode_write_bytestring(buff, addr, strnlen(addr, sizeof(addr_buff))))
-    return false;
-
-  /** lifetime */
-  if(!bencode_write_bytestring(buff, "l", 1))
-    return false;
-  if(!bencode_write_uint64(buff, xr->lifetime))
-    return false;
-
-  /** version */
-  if(!bencode_write_version_entry(buff))
-    return false;
-
-  /* end */
-  return bencode_end(buff);
-}

llarp/exit_route.h

@@ -1,22 +0,0 @@
-#ifndef LLARP_XR_H
-#define LLARP_XR_H
-
-#include <net.h>
-#include <util/buffer.h>
-
-#include <stdint.h>
-
-struct llarp_xr
-{
-  struct in6_addr gateway;
-  struct in6_addr netmask;
-  struct in6_addr source;
-  uint64_t lifetime;
-};
-
-bool
-llarp_xr_bencode(struct llarp_xr* xr, llarp_buffer_t* buff);
-bool
-llarp_xr_bdecode(struct llarp_xr* xr, llarp_buffer_t* buff);
-
-#endif

llarp/handlers/exit.cpp

@@ -1,7 +1,7 @@
 #include <handlers/exit.hpp>
 
 #include <dns/dns.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <router.hpp>
 #include <util/str.hpp>
 

llarp/handlers/tun.cpp

@@ -8,9 +8,9 @@
 #include <netdb.h>
 #endif
 
-#include <ev.hpp>
-#include <router.hpp>
 #include <dns/dns.hpp>
+#include <ev/ev.hpp>
+#include <router.hpp>
 
 namespace llarp
 {

llarp/handlers/tun.hpp

@@ -3,9 +3,9 @@
 
 #include <codel.hpp>
 #include <dns/server.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <ip.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <service/endpoint.hpp>
 #include <util/threading.hpp>
 

llarp/ini.cpp

@@ -1 +0,0 @@
-#include <ini.hpp>

llarp/ip.hpp

@@ -1,8 +1,8 @@
 #ifndef LLARP_IP_HPP
 #define LLARP_IP_HPP
 
-#include <ev.h>
-#include <net.hpp>
+#include <ev/ev.h>
+#include <net/net.hpp>
 #include <util/buffer.h>
 #include <util/time.hpp>
 

llarp/link/server.hpp

@@ -2,11 +2,11 @@
 #define LLARP_LINK_SERVER_HPP
 
 #include <crypto.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <link/session.hpp>
-#include <logic.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <router_contact.hpp>
+#include <util/logic.hpp>
 #include <util/threading.hpp>
 
 #include <list>
@@ -188,7 +188,7 @@ namespace llarp
 
     /// called by link session to remove a pending session who is timed out
     void
-    RemovePending(ILinkSession * s);
+    RemovePending(ILinkSession* s);
 
    private:
     static void

llarp/link/session.hpp

@@ -2,7 +2,7 @@
 #define LLARP_LINK_SESSION_HPP
 
 #include <crypto.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <router_contact.hpp>
 #include <util/types.hpp>
 

llarp/link_message.cpp

@@ -1,5 +1,5 @@
 #include <link_message_parser.hpp>
-#include <messages.hpp>
+
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
 #include <util/logger.hpp>

llarp/link_message_parser.hpp

@@ -1,7 +1,12 @@
 #ifndef LLARP_LINK_MESSAGE_PARSER_HPP
 #define LLARP_LINK_MESSAGE_PARSER_HPP
+
 #include <link_message.hpp>
-#include <messages.hpp>
+#include <messages/discard.hpp>
+#include <messages/dht_immediate.hpp>
+#include <messages/link_intro.hpp>
+#include <messages/relay.hpp>
+#include <messages/relay_commit.hpp>
 
 namespace llarp
 {

llarp/messages.cpp

@@ -1 +0,0 @@
-#include <messages.hpp>

llarp/messages.hpp

@@ -1,17 +0,0 @@
-#ifndef LLARP_MESSAGES_HPP
-#define LLARP_MESSAGES_HPP
-
-/**
-   include shortcut for all link and routing messages
- */
-
-#include <messages/dht_immediate.hpp>
-#include <messages/discard.hpp>
-#include <messages/exit.hpp>
-#include <messages/link_intro.hpp>
-#include <messages/path_confirm.hpp>
-#include <messages/relay.hpp>
-#include <messages/relay_commit.hpp>
-#include <messages/transfer_traffic.hpp>
-
-#endif

llarp/messages/relay.hpp

@@ -4,7 +4,7 @@
 #include <crypto.hpp>
 #include <encrypted.hpp>
 #include <link_message.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 
 #include <vector>
 

llarp/messages/relay_commit.hpp

@@ -5,7 +5,7 @@
 #include <encrypted_ack.hpp>
 #include <encrypted_frame.hpp>
 #include <link_message.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <pow.hpp>
 
 #include <array>

llarp/net/net.cpp

@@ -1,4 +1,4 @@
-#include <net.hpp>
+#include <net/net.hpp>
 #ifdef ANDROID
 #include "android/ifaddrs.h"
 #endif
@@ -9,7 +9,7 @@
 #endif
 #include <net/if.h>
 #endif
-#include <net_addr.hpp>
+#include <net/net_addr.hpp>
 #include <util/logger.hpp>
 #include <util/str.hpp>
 

llarp/net/net.hpp

@@ -2,8 +2,8 @@
 #define LLARP_NET_HPP
 
 #include <address_info.hpp>
-#include <net_int.hpp>
-#include <net.h>
+#include <net/net_int.hpp>
+#include <net/net.h>
 #include <util/logger.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
@@ -147,7 +147,7 @@ namespace llarp
 
 }  // namespace llarp
 
-#include <net_addr.hpp>
-#include <net_inaddr.hpp>
+#include <net/net_addr.hpp>
+#include <net/net_inaddr.hpp>
 
 #endif

llarp/net/net_addr.cpp

@@ -1,5 +1,5 @@
-#include <net.hpp>
-#include <net_addr.hpp>
+#include <net/net.hpp>
+#include <net/net_addr.hpp>
 #include <util/string_view.hpp>
 
 // for addrinfo

llarp/net/net_addr.hpp

@@ -2,8 +2,8 @@
 #define LLARP_NET_ADDR_HPP
 
 #include <address_info.hpp>
-#include <net.h>
-#include <net.hpp>
+#include <net/net.h>
+#include <net/net.hpp>
 #include <util/string_view.hpp>
 
 #include <string>

llarp/net/net_inaddr.cpp

@@ -1,4 +1,4 @@
-#include <net_inaddr.hpp>
+#include <net/net_inaddr.hpp>
 
 std::ostream&
 operator<<(std::ostream& out, const llarp::inAddr& a)

llarp/net/net_inaddr.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_NET_INADDR_HPP
 #define LLARP_NET_INADDR_HPP
 
-#include <net.hpp>
+#include <net/net.hpp>
 
 namespace llarp
 {

llarp/net/net_int.cpp

@@ -0,0 +1 @@
+#include <net/net_int.hpp>

llarp/net/net_int.hpp

@@ -12,7 +12,7 @@
 #define inet_aton(x, y) inet_pton(AF_INET, x, y)
 #endif
 
-#include <net.h>
+#include <net/net.h>
 
 #include <stdlib.h>  // for itoa
 #include <iostream>

llarp/net_int.cpp

@@ -1 +0,0 @@
-#include <net_int.hpp>

llarp/nodedb.cpp

@@ -1,12 +1,12 @@
 #include <nodedb.hpp>
 
 #include <crypto.hpp>
-#include <logic.hpp>
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
 #include <util/fs.hpp>
 #include <util/logger.hpp>
+#include <util/logic.hpp>
 #include <util/mem.hpp>
 
 #include <fstream>

llarp/path/path.cpp

@@ -1,9 +1,9 @@
-#include <path.hpp>
+#include <path/path.hpp>
 
 #include <encrypted_frame.hpp>
 #include <messages/dht.hpp>
 #include <messages/discard.hpp>
-#include <pathbuilder.hpp>
+#include <path/pathbuilder.hpp>
 #include <router.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>

llarp/path/path.hpp

@@ -4,9 +4,9 @@
 #include <crypto.hpp>
 #include <messages/relay_commit.hpp>
 #include <messages/relay.hpp>
-#include <path_types.hpp>
-#include <pathbuilder.hpp>
-#include <pathset.hpp>
+#include <path/path_types.hpp>
+#include <path/pathbuilder.hpp>
+#include <path/pathset.hpp>
 #include <router_id.hpp>
 #include <routing/handler.hpp>
 #include <routing/message.hpp>

llarp/path/path_types.cpp

@@ -0,0 +1 @@
+#include <path/path_types.hpp>

llarp/path/pathbuilder.cpp

@@ -1,7 +1,7 @@
-#include <pathbuilder.hpp>
+#include <path/pathbuilder.hpp>
 
 #include <nodedb.hpp>
-#include <path.hpp>
+#include <path/path.hpp>
 #include <router.hpp>
 #include <util/buffer.hpp>
 

llarp/path/pathbuilder.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_PATHBUILDER_HPP_
 #define LLARP_PATHBUILDER_HPP_
 
-#include <pathset.hpp>
+#include <path/pathset.hpp>
 #include <atomic>
 
 namespace llarp

llarp/path/pathset.cpp

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

llarp/path/pathset.hpp

@@ -2,7 +2,7 @@
 #define LLARP_PATHSET_HPP
 
 #include <dht/messages/all.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <router_id.hpp>
 #include <routing/message.hpp>
 #include <service/IntroSet.hpp>

llarp/path_types.cpp

@@ -1 +0,0 @@
-#include <path_types.hpp>

llarp/profiling.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_PROFILING_HPP
 #define LLARP_PROFILING_HPP
 
-#include <path.hpp>
+#include <path/path.hpp>
 #include <router_id.hpp>
 #include <util/bencode.hpp>
 #include <util/threading.hpp>

llarp/relay_commit.cpp

@@ -1,6 +1,6 @@
 #include <messages/path_confirm.hpp>
 #include <messages/relay_commit.hpp>
-#include <path.hpp>
+#include <path/path.hpp>
 #include <router.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>

llarp/router.cpp

@@ -7,7 +7,7 @@
 #include <link/iwp.hpp>
 #include <link/server.hpp>
 #include <link/utp.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <rpc.hpp>
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
@@ -127,7 +127,7 @@ llarp_findOrCreateEncryption(llarp::Crypto *crypto, const fs::path &path,
                              llarp::SecretKey &encryption)
 {
   std::string fpath = path.string();
-  llarp::LogDebug("find or create ",fpath);
+  llarp::LogDebug("find or create ", fpath);
   std::error_code ec;
   if(!fs::exists(path, ec))
   {
@@ -1041,7 +1041,7 @@ namespace llarp
     {
       if(!link->Start(logic))
       {
-        llarp::LogWarn("outbound link '", link->Name(),"' failed to start");
+        llarp::LogWarn("outbound link '", link->Name(), "' failed to start");
         return false;
       }
     }

llarp/router.hpp

@@ -5,14 +5,13 @@
 #include <crypto.hpp>
 #include <dht.h>
 #include <establish_job.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <exit/context.hpp>
 #include <handlers/tun.hpp>
 #include <link_layer.hpp>
 #include <link_message_parser.hpp>
-#include <logic.hpp>
 #include <nodedb.hpp>
-#include <path.hpp>
+#include <path/path.hpp>
 #include <profiling.hpp>
 #include <router_contact.hpp>
 #include <routing/handler.hpp>
@@ -21,6 +20,7 @@
 #include <service/context.hpp>
 #include <util/buffer.h>
 #include <util/fs.hpp>
+#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/str.hpp>
 #include <util/threadpool.hpp>

llarp/router_contact.cpp

@@ -2,7 +2,7 @@
 
 #include <constants/version.hpp>
 #include <crypto.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
 #include <util/logger.hpp>

llarp/routing/message.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_ROUTING_MESSAGE_HPP
 #define LLARP_ROUTING_MESSAGE_HPP
 
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.h>
 

llarp/routing/message_parser.hpp

@@ -6,7 +6,7 @@
 #include <messages/path_confirm.hpp>
 #include <messages/path_latency.hpp>
 #include <messages/path_transfer.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.h>
 

llarp/rpc.hpp

@@ -2,7 +2,7 @@
 #define LLARP_RPC_HPP
 
 #include <crypto.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <util/time.hpp>
 
 #include <string>

llarp/service/Intro.hpp

@@ -2,7 +2,7 @@
 #define LLARP_SERVICE_INTRO_HPP
 
 #include <crypto.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <util/bencode.hpp>
 
 #include <iostream>

llarp/service/IntroSet.cpp

@@ -1,6 +1,6 @@
 #include <service/IntroSet.hpp>
 
-#include <path.hpp>
+#include <path/path.hpp>
 
 namespace llarp
 {

llarp/service/config.cpp

@@ -1,6 +1,6 @@
 #include <service/config.hpp>
 
-#include <ini.hpp>
+#include <util/ini.hpp>
 
 namespace llarp
 {

llarp/service/context.hpp

@@ -2,7 +2,7 @@
 #define LLARP_SERVICE_CONTEXT_HPP
 
 #include <handlers/tun.hpp>
-#include <net.hpp>
+#include <net/net.hpp>
 #include <service/config.hpp>
 #include <service/endpoint.hpp>
 

llarp/service/endpoint.cpp

@@ -1,10 +1,10 @@
 #include <service/endpoint.hpp>
 
 #include <dht/messages/findintro.hpp>
-#include <logic.hpp>
 #include <messages/dht.hpp>
 #include <router.hpp>
 #include <service/protocol.hpp>
+#include <util/logic.hpp>
 
 #include <util/buffer.hpp>
 

llarp/service/endpoint.hpp

@@ -2,11 +2,11 @@
 #define LLARP_SERVICE_ENDPOINT_HPP
 
 #include <codel.hpp>
-#include <ev.h>
+#include <ev/ev.h>
 #include <exit/session.hpp>
-#include <net.hpp>
-#include <path.hpp>
-#include <pathbuilder.hpp>
+#include <net/net.hpp>
+#include <path/path.hpp>
+#include <path/pathbuilder.hpp>
 #include <service/address.hpp>
 #include <service/Identity.hpp>
 #include <service/handler.hpp>

llarp/service/handler.hpp

@@ -2,7 +2,7 @@
 #define LLARP_SERVICE_HANDLER_HPP
 
 #include <crypto.hpp>
-#include <path_types.hpp>
+#include <path/path_types.hpp>
 #include <service/IntroSet.hpp>
 #include <util/aligned.hpp>
 

llarp/service/lookup.cpp

@@ -1,6 +1,7 @@
-#include <path.hpp>
-#include <service/endpoint.hpp>
 #include <service/lookup.hpp>
+
+#include <path/path.hpp>
+#include <service/endpoint.hpp>
 #include <util/time.hpp>
 
 namespace llarp

llarp/service/protocol.cpp

@@ -1,8 +1,8 @@
 #include <service/protocol.hpp>
 
-#include <logic.hpp>
 #include <routing/handler.hpp>
 #include <util/buffer.hpp>
+#include <util/logic.hpp>
 #include <util/mem.hpp>
 
 namespace llarp

llarp/transit_hop.cpp

@@ -1,4 +1,4 @@
-#include <path.hpp>
+#include <path/path.hpp>
 
 #include <dht/context.hpp>
 #include <messages/discard.hpp>

llarp/util/ini.cpp

@@ -0,0 +1 @@
+#include <util/ini.hpp>