- Added CFG_ALLOWED_KEY struct with binary key storage (64 bytes) for fast memcmp comparison
- Implemented parsing of [allowed_keys] section with allow_all flag and per-key entries
- Added key validation in etcp_connections.c server handler (errorcode=8 for rejected keys)
- Default behavior: deny all if [allowed_keys] section is missing or allow_all=0 with no keys
- Added proper memory cleanup and debug logging for allowed_keys configuration
- Updated all test configs to include [allowed_keys] allow_all=1 for backward compatibility
- etcp_connections.c: парсинг NAT IP через memcpy (сохраняет NBO)
- route_bgp.c: убраны ntohl() для IP в NAT detection и route_bgp_send_nat_info
- route_ping.c: убран htonl() для IP в ping request
- тесты: обновлены ожидания NBO для nat_ip
- Refactored test_routing_mesh to use proper ETCP + normalizer flow
- Removed duplicate init_connections() calls that caused 'Address already in use'
- Improved error reporting in etcp_link_new()
- Test now respects single mainloop architecture
- Remove sys/socket.h include from test_etcp_two_instances.c (Linux-only)
- Fix test_mkdtemp buffer overflow - use memcpy instead of strncpy
- Fix test_mkdtemp return value check (replace == NULL with != 0)
- Add Windows socket libraries (-lws2_32 -liphlpapi) to test builds
- All tests build successfully on Linux
- Create test_utils.h with cross-platform utility functions:
* test_mkdtemp() - Windows uses GetTempPath + _mkdir, Linux uses mkdtemp
* test_unlink() - Windows _unlink, Linux unlink
* test_rmdir() - Windows _rmdir, Linux rmdir
- Update all test files to use test_utils.h
- Replace arpa/inet.h and netinet/in.h with platform_compat.h
- Replace unistd.h with conditional includes
- Replace mkdtemp(), unlink(), rmdir() with test_* versions
- Tests now build on both Linux and Windows
- Note: Some integration tests may fail on Linux due to test environment
Test now verifies that NAT IP:port exactly matches client's local bind:
- Gets expected port from client socket using getsockname()
- Compares nat_port with expected_client_port for exact match
- Validates nat_ip equals 127.0.0.1 (localhost test)
- Fails test if values don't match exactly
This ensures the server correctly returns the client's actual address
in the INIT_RESPONSE handshake without any modification.
Test output:
[TEST] Client socket bound to port 9012 (expected NAT port)
[CLIENT] PASS: NAT address is set: 127.0.0.1:9012
[CLIENT] PASS: nat_changes_count=0, nat_hits_count=0
[CLIENT] PASS: NAT IP and port match exactly (127.0.0.1:9012)
Test now verifies that NAT fields contain CORRECT data, not just non-zero:
- Verifies nat_ip equals 127.0.0.1 (0x7F000001) - expected for localhost test
- Verifies nat_port is in valid ephemeral port range (> 1024 and <= 65535)
- Fails test if values are incorrect (not just warning)
This ensures the server correctly returns the client's external address
in the INIT_RESPONSE handshake packet.
Test output:
[CLIENT] PASS: NAT address is set: 127.0.0.1:9012
[CLIENT] PASS: nat_changes_count=0, nat_hits_count=0
[CLIENT] PASS: NAT IP and port contain valid values (127.0.0.1:9012)
- Added check that NAT fields are populated after connection establishment
- Verifies nat_ip is non-zero and contains correct IP (127.0.0.1)
- Verifies nat_port is non-zero and contains correct port
- Checks nat_changes_count=0 (first initialization)
- Checks nat_hits_count=0 (no repeated matches yet)
Test output shows:
[CLIENT] PASS: NAT address is set: 127.0.0.1:9012
[CLIENT] PASS: nat_changes_count=0, nat_hits_count=0
- New struct tun_if with internal queue for incoming packets
- Single tun_init() does everything: create TUN, set MTU=1500, up, register in uasync
- tun_write() for outgoing packets
- tun_close() cleans up everything including queue
- Removed: tun_create, tun_set_ip, tun_set_up, tun_set_mtu, tun_read, tun_get_config
- Removed: utun_instance_register/unregister_sockets (now internal)
- Updated utun_instance to use new tun_if* pointer
- Updated test_etcp_two_instances for new API
- Changed to use single shared uasync instead of two separate instances
- Removed usleep from event loops for faster execution
- Added missing init_connections() calls when TUN is disabled
- Fixed monitor timeout to work correctly with poll intervals
- Fixed references to server_instance->ua to use shared ua
Tests now complete in ~18ms instead of waiting seconds for init.
- Removed usleep(5000) from all test event loops
- Changed to use single shared uasync for server and client instances
- Removed uasync_destroy from utun_instance_destroy to prevent double-free
- Added explicit uasync_destroy calls in all tests and main program
- Fixed segfault in test_pkt_normalizer_etcp and test_etcp_100_packets
- Added DEBUG_TRACE to all functions in etcp.c and etcp_connections.c
Tests now run without artificial delays and complete successfully.
- Добавлен вызов utun_instance_set_tun_init_enabled(0) в начале теста
- Теперь тест явно отключает TUN перед созданием экземпляров
- Это гарантирует, что тест работает корректно в среде без прав root
- Добавлена глобальная переменная g_tun_init_enabled = 0 (отключена по умолчанию)
- Добавлена функция utun_instance_set_tun_init_enabled() для управления
- TUN инициализируется только если g_tun_init_enabled = 1
- При отключенном TUN структура инициализируется с fd = -1
- Тест test_etcp_two_instances адаптирован для работы без TUN
- Все основные тесты проходят с отключенным TUN
- Сохранена обратная совместимость с существующим кодом
- Reduced test timeout from 10s to 3s
- Decreased monitoring interval from 1000ms to 200ms
- Shortened server initialization wait from 2s to 0.5s
- Added immediate exit on successful connection
- Test now completes in ~0.5s vs ~10s previously
- All tests pass without crashes or memory leaks
The test_etcp_two_instances now runs 20x faster and exits immediately
upon successful connection establishment.
✅ Fixed critical segmentation fault (SIGABRT) in test_etcp_two_instances
✅ Added comprehensive timer debug logging with DEBUG_CATEGORY_TIMERS
✅ Created uasync_print_resources() function for resource diagnostics
✅ Created utun_instance_diagnose_leaks() function for leak analysis
✅ Fixed cleanup order - cancel timers before destroying uasync instances
✅ Fixed timer cancellation to properly update counters
✅ Fixed socket cleanup to unregister from uasync before destruction
✅ Added detailed diagnostic output for memory leak tracking
✅ All tests now pass without crashes
Key fixes:
- Fixed use-after-free in test cleanup sequence
- Added proper timer leak detection and cleanup
- Enhanced debug capabilities for future debugging
- Fixed ETCP socket cleanup to prevent resource leaks
The test_etcp_two_instances now runs successfully without segmentation faults.
Добавлены комплексные DEBUG сообщения в критические точки проекта:
- **ETCP протокол** (etcp.c): ошибки инициализации криптоконтекста, выделения памяти для очередей, коротких пакетов, сбоев шифрования
- **ETCP соединения** (etcp_connections.c): ошибки установки публичных ключей, расшифровки пакетов, шифрования при отправке
- **TUN интерфейс** (tun_if.c): ошибки создания устройства, настройки IP/MTU, чтения/записи
- **Конфигурация** (config_parser.c): ошибки выделения памяти для структур конфигурации, парсинга IP-адресов
- **Маршрутизация** (routing.c): ошибки выделения памяти для таблиц, отсутствие маршрутов
Все DEBUG сообщения используют существующую систему категорий (CRYPTO, MEMORY, CONFIG, ROUTING, TUN, CONNECTION, ETCP) и предоставляют детальную информацию для диагностики проблем.
- test_etcp_two_instances_fixed.c: two UTUN instances in single process
- Creates server and client configs in /tmp
- Uses uasync polling for both instances
- Periodic monitoring via settimeout
- Exits after handshake success/failure
- Debug output in SEND/RECV functions
Evgeny