jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evgeny committed 2026-07-21 20:25:41 +03:00
1 parent 3dda701c67
commit fcf3fb7f51
146 files changed
+582 -333
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/chatgui/libutun/CMakeLists.txt
+30 -28
View File
@@ -56,47 +56,47 @@ set(UTUN_COMMON_SOURCES
${SRC_DIR}/utun_instance.c
${SRC_DIR}/config_parser.c
${SRC_DIR}/config_updater.c
${SRC_DIR}/route_lib.c
${SRC_DIR}/route6_lib.c
${SRC_DIR}/topo_group.c
${SRC_DIR}/route_ping.c
${SRC_DIR}/nat_detection.c
${SRC_DIR}/topo_node.c
${SRC_DIR}/topo_node_sqlite.c
${SRC_DIR}/route_connectivity.c
${SRC_DIR}/routing_layer/route_lib.c
${SRC_DIR}/routing_layer/route6_lib.c
${SRC_DIR}/routing_layer/topo_group.c
${SRC_DIR}/routing_layer/route_ping.c
${SRC_DIR}/routing_layer/nat_detection.c
${SRC_DIR}/routing_layer/topo_node.c
${SRC_DIR}/routing_layer/topo_node_sqlite.c
${SRC_DIR}/routing_layer/route_connectivity.c
${SRC_DIR}/db_sync.c
${SRC_DIR}/conn_mgr.c
${SRC_DIR}/routing_layer/conn_mgr.c
${TRANSPORT_DIR}/chat_sync.c
${TRANSPORT_DIR}/merkle_sync.c
${TRANSPORT_DIR}/member_sync.c
${SRC_DIR}/routing.c
${SRC_DIR}/routing_layer/routing.c
${SRC_DIR}/tun_if.c
${SRC_DIR}/tun_route.c
${SRC_DIR}/etcp.c
${SRC_DIR}/etcp_connections.c
${SRC_DIR}/etcp_bbr.c
${SRC_DIR}/etcp_loadbalancer.c
${SRC_DIR}/etcp_debug.c
${SRC_DIR}/etcp_dump.c
${SRC_DIR}/secure_channel.c
${SRC_DIR}/crc32.c
${SRC_DIR}/stcp_link.c
${SRC_DIR}/stcp.c
${SRC_DIR}/stcp_server.c
${SRC_DIR}/stcp_client.c
${SRC_DIR}/pkt_normalizer.c
${SRC_DIR}/packet_dump.c
${SRC_DIR}/etcp_api.c
${SRC_DIR}/etcp_connect.c
${SRC_DIR}/transport_layer/etcp.c
${SRC_DIR}/transport_layer/etcp_connections.c
${SRC_DIR}/transport_layer/etcp_bbr.c
${SRC_DIR}/transport_layer/etcp_loadbalancer.c
${SRC_DIR}/transport_layer/etcp_debug.c
${SRC_DIR}/transport_layer/etcp_dump.c
${SRC_DIR}/transport_layer/secure_channel.c
${SRC_DIR}/transport_layer/crc32.c
${SRC_DIR}/transport_layer/stcp_link.c
${SRC_DIR}/transport_layer/stcp.c
${SRC_DIR}/transport_layer/stcp_server.c
${SRC_DIR}/transport_layer/stcp_client.c
${SRC_DIR}/transport_layer/pkt_normalizer.c
${SRC_DIR}/transport_layer/packet_dump.c
${SRC_DIR}/transport_layer/etcp_api.c
${SRC_DIR}/transport_layer/etcp_connect.c
${SRC_DIR}/control_server.c
${SRC_DIR}/msg_transport.c
${SRC_DIR}/firewall.c
${SRC_DIR}/eim_nat.c
${SRC_DIR}/nat_transport.c
${SRC_DIR}/dummynet.c
${SRC_DIR}/transport_layer/dummynet.c
${SRC_DIR}/ntp_time.c
${SRC_DIR}/ntp_node_time.c
${SRC_DIR}/etcp_router.c
${SRC_DIR}/routing_layer/etcp_router.c
${SRC_DIR}/proxy/tcp_proxy_client.c
${SRC_DIR}/proxy/tcp_proxy_server.c
${SRC_DIR}/proxy/udp_proxy.c
@@ -123,6 +123,8 @@ add_library(utun STATIC ${UTUN_COMMON_SOURCES} ${UTUN_TUN_SOURCES})
target_include_directories(utun PUBLIC
${SRC_DIR}
${SRC_DIR}/transport_layer
${SRC_DIR}/routing_layer
${LIB_DIR}
${TRANSPORT_DIR}
${SRC_DIR}/uip
tools/chatgui/src/joindialog.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <cstring>
extern "C" {
#include "../../../src/secure_channel.h"
#include "secure_channel.h"
#include "../../../lib/sha256.h"
}
tools/chatgui/transport/chat_conn_mgr.c
+5 -5
View File
@@ -11,10 +11,10 @@
#include "gui_bridge.h"
#include "../../../src/utun_instance.h"
#include "../../../src/etcp_api.h"
#include "../../../src/etcp.h"
#include "../../../src/etcp_connections.h"
#include "../../../src/secure_channel.h"
#include "etcp_api.h"
#include "etcp.h"
#include "etcp_connections.h"
#include "secure_channel.h"
#include "../../../lib/u_async.h"
#include "../../../lib/ll_queue.h"
#include "../../../lib/mem.h"
@@ -516,7 +516,7 @@ static void cm_ping_timer_cb(void* arg) {
if (cm_addr_taken(node, ai)) { mgr->ping_timer = uasync_set_timeout(mgr->inst->ua, CM_PING_TB, mgr, cm_ping_timer_cb, "cm_ping"); return; }
struct ETCP_SOCKET* sock = cm_best_socket(mgr);
if (sock) etcp_send_ping_to_socket(mgr->inst, sock, node->pubkey, &node->addrs[ai].sa, CM_PING_TIMEOUT_MS, cm_ping_result_cb, &node->addrs[ai], NULL, 0);
if (sock) etcp_send_ping_to_socket(mgr->inst, sock, node->pubkey, &node->addrs[ai].sa, CM_PING_TIMEOUT_MS, cm_ping_result_cb, &node->addrs[ai], NULL, 0, 0);
mgr->ping_timer = uasync_set_timeout(mgr->inst->ua, CM_PING_TB, mgr, cm_ping_timer_cb, "cm_ping");
}
tools/chatgui/transport/chat_core.c
+4 -4
View File
@@ -14,10 +14,10 @@
#include "member_sync.h"
#include "../../../src/utun_instance.h"
#include "../../../src/etcp_api.h"
#include "../../../src/etcp.h"
#include "../../../src/etcp_connections.h"
#include "../../../src/secure_channel.h"
#include "etcp_api.h"
#include "etcp.h"
#include "etcp_connections.h"
#include "secure_channel.h"
#include "../../../src/ntp_time.h"
#include "../../../lib/u_async.h"
#include "../../../lib/ll_queue.h"
tools/chatgui/transport/chat_sync.c
+3 -3
View File
@@ -8,9 +8,9 @@
#include "merkle_sync.h"
#include "../../../src/utun_instance.h"
#include "../../../src/etcp_api.h"
#include "../../../src/etcp.h"
#include "../../../src/secure_channel.h"
#include "etcp_api.h"
#include "etcp.h"
#include "secure_channel.h"
#include "../../../src/ntp_time.h"
#include "../../../lib/u_async.h"
#include "../../../lib/ll_queue.h"
tools/chatgui/transport/merkle_sync.c
+2 -2
View File
@@ -1,8 +1,8 @@
#include "merkle_sync.h"
#include "../../../src/utun_instance.h"
#include "../../../src/etcp_api.h"
#include "../../../src/etcp.h"
#include "etcp_api.h"
#include "etcp.h"
#include "../../../lib/debug_config.h"
#include "../../../lib/mem.h"
#include "../../../lib/u_async.h"
tools/chatgui/transport/utun_node.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ extern "C" {
#include "chat_core.h"
#include "db_sync.h"
#include "gui_bridge.h"
#include "../src/topo_node_sqlite.h"
#include "topo_node_sqlite.h"
}
#define ETCP_RT_ID_CHAT 0x11