refactor: move transport (etcp/stcp/normalizer) to transport_layer/, routing (bgp/pings/topo*) to routing_layer/

tests/Makefile.am

@@ -64,7 +64,8 @@ check_PROGRAMS = \
 noinst_PROGRAMS =
 
 # Basic includes
-AM_CFLAGS = -g -I$(top_srcdir)/src -I$(top_srcdir)/lib
+AM_CFLAGS = -g
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/transport_layer -I$(top_srcdir)/src/routing_layer -I$(top_srcdir)/lib
 LIBUTUN = $(top_builddir)/src/libutun.a
 
 # Windows-specific libraries

tests/bbr_integration/test_bbr_integration.c

@@ -25,17 +25,17 @@
 #include "../lib/debug_config.h"
 #include "../lib/platform_compat.h"
 #include "../lib/mem.h"
-#include "../src/dummynet.h"
+#include "dummynet.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/etcp.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_bbr.h"
-#include "../src/secure_channel.h"
+#include "etcp.h"
+#include "etcp_api.h"
+#include "etcp_connections.h"
+#include "etcp_bbr.h"
+#include "secure_channel.h"
 #include "../src/config_updater.h"
-#include "../src/routing.h"
-#include "../src/crc32.h"
+#include "routing.h"
+#include "crc32.h"
 
 /* ===== Test constants ===== */
 #define DN_PORT          21001

tests/test_bgp_route_exchange.c

@@ -32,17 +32,17 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
-#include "../src/route_lib.h"
-#include "../src/topo_group.h"
-#include "../src/dummynet.h"
+#include "routing.h"
+#include "route_lib.h"
+#include "topo_group.h"
+#include "dummynet.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 #include "../lib/mem.h"

tests/test_bgp_triangle.c

@@ -36,18 +36,18 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
-#include "../src/route_lib.h"
-#include "../src/topo_group.h"
-#include "../src/topo_node.h"
-#include "../src/dummynet.h"
+#include "routing.h"
+#include "route_lib.h"
+#include "topo_group.h"
+#include "topo_node.h"
+#include "dummynet.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 #include "../lib/mem.h"

tests/test_chat_sync_stress.c

@@ -17,7 +17,7 @@
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/db_sync.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 

tests/test_conn_mgr.c

@@ -20,13 +20,13 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/topo_group.h"
-#include "../src/conn_mgr.h"
+#include "topo_group.h"
+#include "conn_mgr.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 #include "../lib/mem.h"

tests/test_db_sync.c

@@ -14,15 +14,15 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
+#include "secure_channel.h"
 #include "../src/db_sync.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"

tests/test_dummynet.c

@@ -18,7 +18,7 @@
 #include "../lib/u_async.h"
 #include "../lib/socket_compat.h"
 #include "../lib/debug_config.h"
-#include "../src/dummynet.h"
+#include "dummynet.h"
 
 #define LISTEN_PORT             18000
 #define PKT_COUNT               1000

tests/test_etcp_100_packets.c

@@ -12,13 +12,13 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_api.c

@@ -21,15 +21,15 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_api.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_api.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
-#include "../src/pkt_normalizer.h"
+#include "secure_channel.h"
+#include "pkt_normalizer.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_bbr.c

@@ -1,4 +1,4 @@
-#include "../src/etcp_bbr.h"
+#include "etcp_bbr.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

tests/test_etcp_congestion.c

@@ -26,16 +26,16 @@
 #include "../lib/debug_config.h"
 #include "../lib/platform_compat.h"
 #include "../lib/mem.h"
-#include "../src/dummynet.h"
+#include "dummynet.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/etcp.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_connections.h"
-#include "../src/secure_channel.h"
+#include "etcp.h"
+#include "etcp_api.h"
+#include "etcp_connections.h"
+#include "secure_channel.h"
 #include "../src/config_updater.h"
-#include "../src/routing.h"
-#include "../src/crc32.h"
+#include "routing.h"
+#include "crc32.h"
 
 /* ===== Конфигурация теста ===== */
 #define TEST_DURATION_MS   25000

tests/test_etcp_connect.c

@@ -8,15 +8,15 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_api.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_api.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/topo_group.h"
-#include "../src/topo_node.h"
-#include "../src/secure_channel.h"
+#include "topo_group.h"
+#include "topo_node.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_crypto.c

@@ -1,5 +1,5 @@
 // test_etcp_crypto.c - ETCP encryption/decryption test
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

tests/test_etcp_dummynet.c

@@ -18,16 +18,16 @@
 #include "../lib/memory_pool.h"
 #include "../lib/debug_config.h"
 #include "../lib/platform_compat.h"
-#include "../src/dummynet.h"
+#include "dummynet.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/etcp.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_connections.h"
-#include "../src/secure_channel.h"
+#include "etcp.h"
+#include "etcp_api.h"
+#include "etcp_connections.h"
+#include "secure_channel.h"
 #include "../src/config_updater.h"
-#include "../src/routing.h"
-#include "../src/crc32.h"
+#include "routing.h"
+#include "crc32.h"
 #include "../lib/mem.h"
 
 #define SEND_MS         1000

tests/test_etcp_link_id.c

@@ -1,8 +1,8 @@
 // test_etcp_link_id.c - Unit test for etcp_find_free_local_link_id function
 // Tests: empty connection, full allocation, random deletion/addition cycles
 
-#include "../src/etcp_connections.h"
-#include "../src/etcp.h"
+#include "etcp_connections.h"
+#include "etcp.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

tests/test_etcp_minimal.c

@@ -1,7 +1,7 @@
 // test_etcp_minimal.c - Minimal ETCP traffic debugging test
 // This is the most basic test to verify ETCP packet processing works
 
-#include "../src/etcp.h"
+#include "etcp.h"
 #include "../lib/debug_config.h"
 #include <stdio.h>
 #include <stdlib.h>

tests/test_etcp_ping.c

@@ -6,13 +6,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "test_utils.h"
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 

tests/test_etcp_reconnect.c

@@ -14,14 +14,14 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
-#include "../src/etcp_dump.h"
+#include "secure_channel.h"
+#include "etcp_dump.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_reinit_inflight.c

@@ -14,15 +14,15 @@
 #include "../lib/debug_config.h"
 #include "../lib/platform_compat.h"
 #include "../lib/mem.h"
-#include "../src/dummynet.h"
+#include "dummynet.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/etcp.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_connections.h"
-#include "../src/secure_channel.h"
+#include "etcp.h"
+#include "etcp_api.h"
+#include "etcp_connections.h"
+#include "secure_channel.h"
 #include "../src/config_updater.h"
-#include "../src/routing.h"
+#include "routing.h"
 
 #define CLI_PORT 31000
 #define DN_PORT  31001

tests/test_etcp_router.c

@@ -19,18 +19,18 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_router.h"
-#include "../src/dummynet.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_api.h"
+#include "etcp_router.h"
+#include "dummynet.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
-#include "../src/pkt_normalizer.h"
-#include "../src/topo_group.h"
+#include "secure_channel.h"
+#include "pkt_normalizer.h"
+#include "topo_group.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_router_reconnect.c

@@ -16,17 +16,17 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_router.h"
-#include "../src/etcp_api.h"
-#include "../src/topo_group.h"
-#include "../src/topo_node.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_router.h"
+#include "etcp_api.h"
+#include "topo_group.h"
+#include "topo_node.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_router_unit.c

@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_router.h"
-#include "../src/topo_group.h"
+#include "etcp.h"
+#include "etcp_api.h"
+#include "etcp_router.h"
+#include "topo_group.h"
 #include "../src/utun_instance.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"

tests/test_etcp_simple_traffic.c

@@ -14,13 +14,13 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_etcp_stcp.c

@@ -1,8 +1,8 @@
 // test_etcp_stcp.c — integration: etcp_send + etcp_bind over STCP link
-#include "../src/stcp_link.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp.h"
-#include "../src/secure_channel.h"
+#include "stcp_link.h"
+#include "etcp_api.h"
+#include "etcp.h"
+#include "secure_channel.h"
 #include "../src/utun_instance.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"

tests/test_etcp_two_instances.c

@@ -12,13 +12,13 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 

tests/test_icmp_proxy.c

@@ -17,15 +17,15 @@
 #endif
 #include <time.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_router.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_api.h"
+#include "etcp_router.h"
 #include "../src/proxy/icmp_proxy.h"
 #include "../src/proxy/tcp_proxy_server.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"

tests/test_ipv6_sockets.c

@@ -28,16 +28,16 @@
 #include <unistd.h>
 #endif
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
-#include "../src/route_lib.h"
-#include "../src/topo_group.h"
-#include "../src/topo_node.h"
+#include "routing.h"
+#include "route_lib.h"
+#include "topo_group.h"
+#include "topo_node.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 

tests/test_nat_detection.c

@@ -15,18 +15,18 @@
 #include <string.h>
 #include <unistd.h>
 #include "test_utils.h"
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
-#include "../src/topo_group.h"
-#include "../src/route_ping.h"
-#include "../src/nat_detection.h"
-#include "../src/topo_node.h"
+#include "routing.h"
+#include "topo_group.h"
+#include "route_ping.h"
+#include "nat_detection.h"
+#include "topo_node.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 

tests/test_nat_engine.c

@@ -13,7 +13,7 @@
 #include <string.h>
 #include "../lib/debug_config.h"
 #include "../src/eim_nat.h"
-#include "../src/etcp.h"
+#include "etcp.h"
 #include "../src/config_parser.h"
 
 #ifdef ENABLE_STATIC_ASSERT

tests/test_nat_stress.c

@@ -12,7 +12,7 @@
 #include <sys/time.h>
 #include "../lib/debug_config.h"
 #include "../src/eim_nat.h"
-#include "../src/etcp.h"
+#include "etcp.h"
 #include "../src/config_parser.h"
 
 static struct {

tests/test_nat_transport.c

@@ -15,18 +15,18 @@
 #include <string.h>
 #include <unistd.h>
 #include "test_utils.h"
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
-#include "../src/topo_group.h"
+#include "routing.h"
+#include "topo_group.h"
 #include "../src/tun_if.h"
 #include "../src/nat_transport.h"
 #include "../src/eim_nat.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_router.h"
+#include "etcp_api.h"
+#include "etcp_router.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 #include "../lib/mem.h"

tests/test_pkt_normalizer_etcp.c

@@ -12,14 +12,14 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
-#include "../src/pkt_normalizer.h"
+#include "secure_channel.h"
+#include "pkt_normalizer.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_pkt_normalizer_standalone.c

@@ -9,8 +9,8 @@
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/memory_pool.h"
-#include "../src/pkt_normalizer.h"
-#include "../src/etcp.h"
+#include "pkt_normalizer.h"
+#include "etcp.h"
 
 // Weak stub for etcp_conn_reinit — overridden if real ETCP is linked
 // Weak stub for etcp_conn_reinit - can be overridden by real ETCP implementation

tests/test_route6_lib.c

@@ -3,8 +3,8 @@
 #include <string.h>
 #include <time.h>
 #include <assert.h>
-#include "../src/topo_node.h"
-#include "../src/route6_lib.h"
+#include "topo_node.h"
+#include "route6_lib.h"
 #include "../lib/debug_config.h"
 #include "../lib/mem.h"
 #include "../lib/u_async.h"

tests/test_route_ping.c

@@ -15,16 +15,16 @@
 #include <string.h>
 #include <unistd.h>
 #include "test_utils.h"
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
+#include "etcp.h"
+#include "etcp_connections.h"
 #include "../src/config_parser.h"
 #include "../src/config_updater.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
-#include "../src/topo_group.h"
-#include "../src/route_ping.h"
+#include "routing.h"
+#include "topo_group.h"
+#include "route_ping.h"
 #include "../src/tun_if.h"
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/debug_config.h"
 

tests/test_socks_http_proxy.c

@@ -23,13 +23,13 @@
 #include "../lib/debug_config.h"
 #include "../lib/ll_queue.h"
 #include "../lib/mem.h"
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_router.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_api.h"
+#include "etcp_router.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
 
 #define TIMEOUT_MS 300000

tests/test_stcp.c

@@ -1,8 +1,8 @@
 // test_stcp.c — comprehensive STCP integration tests
-#include "../src/stcp.h"
-#include "../src/stcp_server.h"
-#include "../src/stcp_client.h"
-#include "../src/secure_channel.h"
+#include "stcp.h"
+#include "stcp_server.h"
+#include "stcp_client.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_stcp_link.c

@@ -1,6 +1,6 @@
 // test_stcp_link.c — integration test for stcp_link API (TCP via STCP)
-#include "../src/stcp_link.h"
-#include "../src/secure_channel.h"
+#include "stcp_link.h"
+#include "secure_channel.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"
 #include "../lib/debug_config.h"

tests/test_stcp_traffic.c

@@ -1,11 +1,11 @@
 // test_stcp_traffic.c — STCP transport test: 2 nodes, 1MB bidirectional, random packets, content verify
-#include "../src/stcp_link.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp.h"
-#include "../src/secure_channel.h"
-#include "../src/etcp_connections.h"
-#include "../src/topo_group.h"
-#include "../src/topo_node.h"
+#include "stcp_link.h"
+#include "etcp_api.h"
+#include "etcp.h"
+#include "secure_channel.h"
+#include "etcp_connections.h"
+#include "topo_group.h"
+#include "topo_node.h"
 #include "../src/utun_instance.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"

tests/test_stream_cipher.c

@@ -1,5 +1,5 @@
 // test_stream_cipher.c — tests for streaming cipher (AES-128-CTR)
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/debug_config.h"
 #include <stdio.h>
 #include <string.h>

tests/test_stream_sign.c

@@ -1,5 +1,5 @@
 // test_stream_sign.c — tests for streaming Ed25519 signature
-#include "../src/secure_channel.h"
+#include "secure_channel.h"
 #include "../lib/debug_config.h"
 #include <stdio.h>
 #include <string.h>

tests/test_tcp_proxy_remote.c

@@ -17,8 +17,8 @@
 #include <time.h>
 
 #include "../src/proxy/tcp_proxy_client.h"
-#include "../src/etcp.h"
-#include "../src/etcp_router.h"
+#include "etcp.h"
+#include "etcp_router.h"
 #include "../src/proxy/tcp_proxy_server.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"

tests/test_udp_proxy.c

@@ -15,15 +15,15 @@
 #endif
 #include <time.h>
 
-#include "../src/etcp.h"
-#include "../src/etcp_connections.h"
-#include "../src/etcp_api.h"
-#include "../src/etcp_router.h"
+#include "etcp.h"
+#include "etcp_connections.h"
+#include "etcp_api.h"
+#include "etcp_router.h"
 #include "../src/proxy/udp_proxy.h"
 #include "../src/proxy/tcp_proxy_server.h"
 #include "../src/config_parser.h"
 #include "../src/utun_instance.h"
-#include "../src/routing.h"
+#include "routing.h"
 #include "../src/tun_if.h"
 #include "../lib/u_async.h"
 #include "../lib/ll_queue.h"