From 876a5a65ec258aba1173996b13d3806d87a8924c Mon Sep 17 00:00:00 2001
From: evgeny <evgeny@adaptto.ru>
Date: Wed, 14 Oct 2026 01:20:00 +0200
Subject: [PATCH] Test aggregate send windows with duplicate ACKs and
 connection teardown

---
 tests/Makefile.am            |  3 +++
 tests/test_stream_tx_stats.c | 49 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 tests/test_stream_tx_stats.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 371296bc..80522f4e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -100,6 +100,7 @@ check_PROGRAMS += \
     test_stream_core \
     test_stream_media \
     test_stream_playback \
+    test_stream_tx_stats \
     test_android_stream \
     test_stream_service \
     test_u_async_comprehensive \
@@ -477,6 +478,8 @@ test_stream_media_LDADD = $(LIBUTUN) $(COMMON_LIBS)
 
 test_stream_playback_SOURCES = test_stream_playback.c
 test_stream_playback_LDADD = $(LIBUTUN) $(COMMON_LIBS)
+test_stream_tx_stats_SOURCES = test_stream_tx_stats.c
+test_stream_tx_stats_LDADD = $(LIBUTUN) $(COMMON_LIBS)
 
 test_android_stream_SOURCES = test_android_stream.c $(test_clock_sources) ../tools/chatgui-android/libutun_lite/stream_bridge.c
 test_android_stream_LDADD = $(LIBUTUN) $(COMMON_LIBS)
diff --git a/tests/test_stream_tx_stats.c b/tests/test_stream_tx_stats.c
new file mode 100644
index 00000000..a3e9cc1d
--- /dev/null
+++ b/tests/test_stream_tx_stats.c
@@ -0,0 +1,49 @@
+#include <stdlib.h>
+#include <string.h>
+#include "../src/utun_instance.h"
+#include "../src/transport_layer/etcp.h"
+#include "../src/transport_layer/pkt_normalizer.h"
+#include "../lib/mem.h"
+#include "../lib/debug_config.h"
+#define CHECK(x) do { if (!(x)) { DEBUG_ERROR(DEBUG_CATEGORY_ETCP, "TX stats test line=%d: %s", __LINE__, #x); exit(1); } } while (0)
+
+static void test_window(void) {
+    struct etcp_tx_history h = {0};
+    for (unsigned i = 0; i < 10; i++) etcp_tx_record_ack(&h, i * 100000 + 99999, i + 1);
+    CHECK(etcp_tx_acked_window(&h, 1000000) == 55);
+    etcp_tx_record_ack(&h, 1000000, 100);
+    CHECK(etcp_tx_acked_window(&h, 1000001) == 55);
+    CHECK(etcp_tx_acked_window(&h, 1100000) == 154);
+    CHECK(etcp_tx_acked_window(&h, 2100000) == 0 && h.total == 155);
+    etcp_tx_record_ack(&h, 5000000, 7);
+    CHECK(etcp_tx_acked_window(&h, 5100000) == 7);
+}
+
+static void packet(struct ETCP_CONN *c, struct ll_queue *q, unsigned seq, unsigned size) {
+    struct INFLIGHT_PACKET *p = (struct INFLIGHT_PACKET *)queue_entry_new_from_pool(c->inflight_pool); CHECK(p);
+    p->seq = seq; p->last_link = NULL; p->ll.len = size;
+    p->ll.dgram = memory_pool_alloc(c->instance->data_pool); CHECK(p->ll.dgram);
+    p->ll.dgram_pool = c->instance->data_pool;
+    CHECK(queue_data_put_with_index(q, &p->ll) == 0); c->unacked_bytes += size;
+}
+
+int main(void) {
+    debug_config_init(); debug_set_level(DEBUG_LEVEL_ERROR); size_t before = u_get_allocated_count();
+    test_window(); utun_instance_set_tun_init_enabled(0);
+    struct UASYNC *ua = uasync_create(); CHECK(ua);
+    struct UTUN_INSTANCE *inst = utun_instance_create_from_str(ua, "[global]\nauto_sockets=no\n"); CHECK(inst);
+    struct ETCP_CONN *a = etcp_connection_create(inst, "stats-a"), *b = etcp_connection_create(inst, "stats-b"); CHECK(a && b);
+    queue_set_callback(a->input_send_q, NULL, NULL); queue_set_callback(b->input_wait_ack, NULL, NULL);
+    packet(a, a->input_send_q, 1, 80); packet(b, b->input_wait_ack, 2, 120);
+    a->normalizer->data = memory_pool_alloc(inst->data_pool); CHECK(a->normalizer->data); a->normalizer->data_ptr = 10;
+    struct etcp_tx_snapshot s; uint64_t now = get_time_us();
+    CHECK(etcp_tx_get_snapshot(inst, now, &s) == 0 && s.connections == 2 && s.inflight_bytes == 200 && s.queued_bytes == 10);
+    etcp_ack_recv(a, 1, 0, 0); etcp_ack_recv(a, 1, 0, 0);
+    CHECK(inst->tx_history.total == 80 && !a->unacked_bytes);
+    etcp_ack_recv(b, 2, 0, 0); CHECK(inst->tx_history.total == 200);
+    etcp_connection_close(a); etcp_connection_close(b);
+    CHECK(etcp_tx_get_snapshot(inst, get_time_us() + 100000, &s) == 0 && !s.connections && !s.inflight_bytes && s.acked_1s == 200);
+    utun_instance_destroy(inst); uasync_destroy(ua, 1); CHECK(u_get_allocated_count() == before);
+    DEBUG_INFO(DEBUG_CATEGORY_ETCP, "PASS TX stats: aligned windows, unique ACK, closed connections, queued/inflight separation");
+    return 0;
+}