From 44522027e72fee0f6b4efbded0aec4149ec13cff Mon Sep 17 00:00:00 2001 From: evgeny Date: Sat, 10 Oct 2026 15:29:46 +0200 Subject: [PATCH] tests: use ephemeral ports for ETCP traffic fixtures --- tests/test_etcp_100_packets.c | 8 +++++--- tests/test_etcp_api.c | 12 +++++++----- tests/test_pkt_normalizer_etcp.c | 8 +++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/test_etcp_100_packets.c b/tests/test_etcp_100_packets.c index d7269739..0286630c 100644 --- a/tests/test_etcp_100_packets.c +++ b/tests/test_etcp_100_packets.c @@ -3,6 +3,7 @@ #include #include "../lib/platform_compat.h" #include "test_utils.h" +#include "test_net.h" #ifdef _WIN32 #include #include @@ -47,7 +48,7 @@ static const char* server_config_content = "tun_ifname=tun99\n" "\n" "[server: test]\n" - "addr=127.0.0.1:9021\n" + "addr=127.0.0.1:0\n" "type=public\n" "\n" "[allowed_keys]\n" @@ -63,13 +64,13 @@ static const char* client_config_content = "tun_ifname=tun98\n" "\n" "[server: test]\n" - "addr=127.0.0.1:9022\n" + "addr=127.0.0.1:0\n" "type=public\n" "\n" "[client: test_client]\n" "keepalive=1\n" "peer_public_key=ce8871f07fa056c636d297115f231b08c29cdf94e0d440fce83a07c34416d36a\n" - "link=test:127.0.0.1:9021\n"; + "link=test:127.0.0.1:0\n"; // Create temp config files static int create_temp_configs(void) { @@ -417,6 +418,7 @@ int main() { printf("Creating client...\n"); client_instance = utun_instance_create(ua, client_config_path); + if (client_instance) test_etcp_set_peer(client_instance, "test_client", server_instance, "test"); if (!client_instance || utun_instance_init(client_instance) < 0) { printf("Failed to create client\n"); return 1; diff --git a/tests/test_etcp_api.c b/tests/test_etcp_api.c index 0f8b4a97..de7a9a22 100644 --- a/tests/test_etcp_api.c +++ b/tests/test_etcp_api.c @@ -12,6 +12,7 @@ #include #include "../lib/platform_compat.h" #include "test_utils.h" +#include "test_net.h" #ifdef _WIN32 #include #include @@ -44,7 +45,7 @@ static char temp_dir[] = "/tmp/utun_test_XXXXXX"; static char server_config_path[256]; static char client_config_path[256]; -// Server config content (uses ports 9031) +// ОС выбирает порт слушателя при bind(0). static const char* server_config_content = "[global]\n" "my_node_id=0x1111111111111111\n" @@ -54,13 +55,13 @@ static const char* server_config_content = "tun_ifname=tun99\n" "\n" "[server: test]\n" - "addr=127.0.0.1:9031\n" + "addr=127.0.0.1:0\n" "type=public\n" "\n" "[allowed_keys]\n" "allow_all=1\n"; -// Client config content (uses ports 9032) +// Endpoint пира заполняется после создания слушателя. static const char* client_config_content = "[global]\n" "my_node_id=0x2222222222222222\n" @@ -70,13 +71,13 @@ static const char* client_config_content = "tun_ifname=tun98\n" "\n" "[server: test]\n" - "addr=127.0.0.1:9032\n" + "addr=127.0.0.1:0\n" "type=public\n" "\n" "[client: test_client]\n" "keepalive=1\n" "peer_public_key=ce8871f07fa056c636d297115f231b08c29cdf94e0d440fce83a07c34416d36a\n" - "link=test:127.0.0.1:9031\n"; + "link=test:127.0.0.1:0\n"; // Create temp config files static int create_temp_configs(void) { @@ -572,6 +573,7 @@ int main() { printf("Creating client...\n"); client_instance = utun_instance_create(ua, client_config_path); + if (client_instance) test_etcp_set_peer(client_instance, "test_client", server_instance, "test"); if (!client_instance || utun_instance_init(client_instance) < 0) { printf("Failed to create client\n"); return 1; diff --git a/tests/test_pkt_normalizer_etcp.c b/tests/test_pkt_normalizer_etcp.c index edbac38c..57f411d5 100644 --- a/tests/test_pkt_normalizer_etcp.c +++ b/tests/test_pkt_normalizer_etcp.c @@ -3,6 +3,7 @@ #include #include "../lib/platform_compat.h" #include "test_utils.h" +#include "test_net.h" #ifdef _WIN32 #include #include @@ -46,7 +47,7 @@ static const char* server_config_content = "tun_ifname=tun99\n" "\n" "[server: test]\n" - "addr=127.0.0.1:9041\n" + "addr=127.0.0.1:0\n" "type=public\n" "\n" "[allowed_keys]\n" @@ -61,13 +62,13 @@ static const char* client_config_content = "tun_ifname=tun98\n" "\n" "[server: test]\n" - "addr=127.0.0.1:9042\n" + "addr=127.0.0.1:0\n" "type=public\n" "\n" "[client: test_client]\n" "keepalive=1\n" "peer_public_key=ce8871f07fa056c636d297115f231b08c29cdf94e0d440fce83a07c34416d36a\n" - "link=test:127.0.0.1:9041\n"; + "link=test:127.0.0.1:0\n"; static struct UTUN_INSTANCE* server_instance = NULL; static struct UTUN_INSTANCE* client_instance = NULL; @@ -253,6 +254,7 @@ int main(void) { if (!server_instance || utun_instance_init(server_instance) < 0) { fprintf(stderr, "Failed to create server\n"); return 1; } client_instance = utun_instance_create(ua, client_config_path); + if (client_instance) test_etcp_set_peer(client_instance, "test_client", server_instance, "test"); if (!client_instance || utun_instance_init(client_instance) < 0) { fprintf(stderr, "Failed to create client\n"); return 1; } packet_timeout_id = uasync_set_timeout(ua, 500, NULL, monitor_and_send, "test_monitor");