dm: прямой обмен сообщениями (DM) + soundtouch + архитектура звонков

- src/dm/: dm_core/dm_crypto/dm_mailbox — прямой обмен сообщениями (DM)
- lib/soundtouch-master/: vendored SoundTouch (изменение темпа/высоты аудио)
- doc/dm_arch.md, doc/chat_call_arch.md: архитектура DM и звонков
- tests: test_dm.c, test_dm_e2e.c
- chat: рефакторинг chat_* модулей, member_sync, invite_build
- chatgui/chatgui-android: синхронизация с новым API чата
- lib/u_async, debug_config, utun_instance: сопутствующие изменения

tests/Makefile.am

@@ -62,6 +62,7 @@ check_PROGRAMS = \
 	test_chat_sync_stress \
 	test_chat_join \
 	test_chat_join_e2e \
+	test_dm_e2e \
 	test_stcp_traffic \
 	test_bbr_integration \
 	test_audio_compressor \
@@ -83,6 +84,7 @@ check_PROGRAMS = \
 	test_reality_hello \
 	test_reality_bgp \
 	test_reality_config \
+	test_dm \
 	bench_timeout_heap \
 	bench_uasync_timeouts
 
@@ -142,6 +144,10 @@ test_reality_config_SOURCES = test_reality_config.c
 test_reality_config_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/transport_layer -I$(top_srcdir)/lib
 test_reality_config_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
 
+test_dm_SOURCES = test_dm.c
+test_dm_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/transport_layer -I$(top_srcdir)/lib
+test_dm_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
+
 test_transport_SOURCES = test_stcp_link.c
 test_transport_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
 test_transport_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
@@ -377,6 +383,10 @@ test_chat_join_e2e_SOURCES = test_chat_join_e2e.c
 test_chat_join_e2e_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/chat -I$(top_srcdir)/src/routing_layer -I$(top_srcdir)/src/transport_layer -I$(top_srcdir)/lib
 test_chat_join_e2e_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
 
+test_dm_e2e_SOURCES = test_dm_e2e.c
+test_dm_e2e_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/chat -I$(top_srcdir)/src/dm -I$(top_srcdir)/src/routing_layer -I$(top_srcdir)/src/transport_layer -I$(top_srcdir)/lib
+test_dm_e2e_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)
+
 test_stcp_traffic_SOURCES = test_stcp_traffic.c
 test_stcp_traffic_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
 test_stcp_traffic_LDADD = $(LIBUTUN) $(CRYPTO_LIBS) $(COMMON_LIBS)

tests/test_chat_join_e2e.c

@@ -258,7 +258,7 @@ static void channel_put_shared(struct UTUN_INSTANCE* inst, int has_priv) {
     topo_node_sqlite_channel_put(inst->topo_sqlite_db, g_sh.ch_id, CH_NAME, g_sh.owner,
         g_sh.ch_x_pub, has_priv ? g_sh.ch_x_priv : NULL,
         g_sh.ch_ed_pub, has_priv ? g_sh.ch_ed_priv : NULL, g_sh.ch_sig);
-    chat_core_ensure_channel_ready(g_sh.ch_id);
+    chat_core_ensure_channel_ready(inst, g_sh.ch_id);
 }
 
 static void member_put_self(struct UTUN_INSTANCE* inst, const char* name) {
@@ -317,7 +317,7 @@ static int child_main(const char* role, const char* dir, int invalid_key) {
         /* invite_build требует conn_presence узла — может отставать от paths; ретраим */
         { int built = 0;
           for (int a = 0; a < 1000; a++) {
-              if (chat_invite_build_link(ch_num, target, NULL, link, sizeof(link)) == 0) { built = 1; break; }
+              if (chat_invite_build_link(inst, ch_num, target, NULL, link, sizeof(link)) == 0) { built = 1; break; }
               uasync_poll(inst->ua, POLL_MS);
           }
           if (!built) { fprintf(stderr, "A: invite_build_link failed (target=0x%016llx)\n", (unsigned long long)target); goto out; }
@@ -390,7 +390,7 @@ static int child_main(const char* role, const char* dir, int invalid_key) {
         if (addrs_len <= 0) { fprintf(stderr, "J: serialize addrs failed\n"); goto out; }
 
         uint64_t key = invalid_key ? (d.join_key ^ 0xDEADBEEFCAFEBABEULL) : d.join_key;
-        chat_sync_connect_from_invite(d.channelId, d.nodeId, d.pubkey,
+        chat_sync_connect_from_invite(inst, d.channelId, d.nodeId, d.pubkey,
             addrs_buf, d.addrCount, addrs_len, d.password_len ? d.password : NULL, key);
 
         if (invalid_key) {

tests/test_dm.c

@@ -0,0 +1,109 @@
+/*
+ * test_dm.c — тест криптографии прямого чата (dm_crypto)
+ *
+ * Проверяет:
+ *   - детерминированность и симметричность conv_id (одинаков на обеих сторонах);
+ *   - симметричность content_key (ECDH: обе стороны выводят одинаковый ключ);
+ *   - round-trip шифрования AES-256-CCM и детекцию неверного ключа.
+ */
+
+#include "../src/dm/dm_crypto.h"
+#include "../src/transport_layer/secure_channel.h"
+#include "../lib/debug_config.h"
+
+#include <string.h>
+#include <stdio.h>
+
+int main(void) {
+    debug_config_init();
+    debug_set_level(DEBUG_LEVEL_ERROR);
+
+    int failures = 0;
+
+    /* ── 1. conv_id: симметричность и уникальность ── */
+    uint64_t a = 0x1122334455667788ULL;
+    uint64_t b = 0x8877665544332211ULL;
+    uint64_t id_ab = dm_derive_conv_id(a, b);
+    uint64_t id_ba = dm_derive_conv_id(b, a);
+    if (id_ab == 0 || id_ab != id_ba) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "conv_id not symmetric: ab=%llu ba=%llu",
+                    (unsigned long long)id_ab, (unsigned long long)id_ba);
+        failures++;
+    } else {
+        DEBUG_INFO(DEBUG_CATEGORY_DM, "conv_id symmetric: %llu == %llu",
+                   (unsigned long long)id_ab, (unsigned long long)id_ba);
+    }
+
+    uint64_t c = 0xDEADBEEF00000001ULL;
+    if (dm_derive_conv_id(a, c) == id_ab) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "conv_id collision for different pairs");
+        failures++;
+    }
+
+    /* ── 2. content_key: симметричность ECDH ── */
+    struct SC_MYKEYS k1, k2;
+    if (sc_generate_keypair(&k1) != SC_OK || sc_generate_keypair(&k2) != SC_OK) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "keypair generation failed");
+        return 1;
+    }
+    uint8_t key1[DM_CONTENT_KEY_SIZE], key2[DM_CONTENT_KEY_SIZE];
+    if (dm_derive_content_key(k1.private_key, k2.public_key, key1) != 0
+        || dm_derive_content_key(k2.private_key, k1.public_key, key2) != 0) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "content_key derive failed");
+        failures++;
+    } else if (memcmp(key1, key2, DM_CONTENT_KEY_SIZE) != 0) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "content_key not symmetric (ECDH mismatch)");
+        failures++;
+    } else {
+        DEBUG_INFO(DEBUG_CATEGORY_DM, "content_key symmetric (ECDH ok)");
+    }
+
+    /* ── 3. AES-256-CCM round-trip ── */
+    const char* text = "hello, direct chat!";
+    size_t text_len = strlen(text);
+    uint8_t nonce[DM_NONCE_SIZE];
+    dm_build_nonce(id_ab, a, 42, nonce);
+
+    uint8_t enc[256];
+    size_t enc_len = 0;
+    if (dm_encrypt(key1, nonce, (const uint8_t*)text, text_len, enc, &enc_len) != 0) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "encrypt failed");
+        failures++;
+    } else if (enc_len != text_len + DM_TAG_SIZE) {
+        DEBUG_ERROR(DEBUG_CATEGORY_DM, "encrypt length mismatch: %zu", enc_len);
+        failures++;
+    } else {
+        uint8_t dec[256];
+        size_t dec_len = 0;
+        if (dm_decrypt(key2, nonce, enc, enc_len, dec, &dec_len) != 0) {
+            DEBUG_ERROR(DEBUG_CATEGORY_DM, "decrypt failed");
+            failures++;
+        } else if (dec_len != text_len || memcmp(dec, text, text_len) != 0) {
+            DEBUG_ERROR(DEBUG_CATEGORY_DM, "decrypt content mismatch");
+            failures++;
+        } else {
+            DEBUG_INFO(DEBUG_CATEGORY_DM, "AES-256-CCM round-trip ok");
+        }
+    }
+
+    /* ── 4. детекция неверного ключа ── */
+    {
+        uint8_t wrong[DM_CONTENT_KEY_SIZE];
+        memset(wrong, 0x5A, sizeof(wrong));
+        uint8_t dec[256];
+        size_t dec_len = 0;
+        if (enc_len > 0 && dm_decrypt(wrong, nonce, enc, enc_len, dec, &dec_len) == 0) {
+            DEBUG_ERROR(DEBUG_CATEGORY_DM, "decrypt with wrong key should fail");
+            failures++;
+        } else {
+            DEBUG_INFO(DEBUG_CATEGORY_DM, "wrong-key tamper detection ok");
+        }
+    }
+
+    if (failures == 0) {
+        printf("TEST PASSED\n");
+        return 0;
+    }
+    printf("TEST FAILED (%d failures)\n", failures);
+    return 1;
+}

tests/test_dm_e2e.c

@@ -0,0 +1,452 @@
+// test_dm_e2e.c — интеграционный тест прямого чата (DM): прямая отправка + offline-хранение.
+//
+// Однопоточный: 3 узла (A, B, C) в одном процессе, один UASYNC, без fork.
+// Топология — цепочка B→C→A (A владелец канала, C storage, B target).
+// Сценарий управляется одной master state-machine (таймер dm_tick).
+//
+// Сценарий:
+//   фаза 1 (прямая): A,B,C online. A dm_start(B) → dm_send("hello1") → B получает напрямую.
+//   фаза 2 (offline): B1 завершается (A теряет B). A dm_send("hello2") → недоступен →
+//                     кладёт в mailbox на C (dm_storage=yes). C видит блоб в dm_mail.
+//   фаза 3 (reconnect): B2 переподключается к C → dm_on_conn_status → PULL mailbox → получает "hello2".
+
+#include "chat_core.h"
+#include "chat_sync.h"
+#include "member_sync.h"
+#include "../dm/dm_core.h"
+#include "../dm/dm_crypto.h"
+#include "../routing_layer/topo_node_sqlite.h"
+#include "../routing_layer/topo_group.h"
+#include "../routing_layer/topo_node.h"
+#include "../utun_instance.h"
+#include "../transport_layer/etcp.h"
+#include "../transport_layer/secure_channel.h"
+#include "../ntp_time.h"
+#include "../lib/u_async.h"
+#include "../lib/debug_config.h"
+#include "../lib/mem.h"
+#include "../lib/platform_compat.h"
+
+#include <sqlite3.h>
+#define OPENSSL_API_COMPAT 0x10100000L
+#include <openssl/evp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
+#include <unistd.h>
+
+#define CH_ID "4242424242424242"
+
+#define IDX_A 0
+#define IDX_B 1
+#define IDX_C 2
+
+#define TICK_TB     100      /* 10 ms на такт state machine */
+#define MAX_TICKS   3000     /* глобальный таймаут ≈ 30 c */
+
+/* фазы master state-machine */
+enum dm_phase {
+    P_WAIT_CONN,       /* ждём подъёма всех соединений */
+    P_SETUP,           /* однократная настройка канала/мемберов на A,B,C */
+    P_WAIT_BGP,        /* ждём сходимости BGP CHAT-группы */
+    P_SEND1,           /* A: dm_start + hello1 */
+    P_WAIT_MSG1,       /* ждём hello1 у B */
+    P_B_OFFLINE,       /* destroy B1 */
+    P_WAIT_B_OFFLINE,  /* ждём ухода B из BGP у A */
+    P_SEND2,           /* A: hello2 → mailbox */
+    P_WAIT_MAIL,       /* ждём блоб в dm_mail у C */
+    P_RECONNECT,       /* create B2 */
+    P_WAIT_B2,         /* ждём hello2 у B2 и опустошение dm_mail у C */
+    P_DONE,
+};
+
+struct dm_ctx {
+    struct UASYNC* ua;
+    struct UTUN_INSTANCE* inst[3];
+    enum dm_phase phase;
+    int   result;        /* 0=running, 1=ok, 2=fail */
+    int   ticks;
+    void* timer;
+};
+
+/* общие данные (ключи узлов и канала) */
+struct dm_shared {
+    uint8_t  ch_x_pub[32], ch_ed_pub[32], ch_ed_priv[32], ch_sig[64];
+    uint64_t nid[3];
+    uint8_t  x_pub[3][32], x_priv[3][32], ed_pub[3][32];
+    int      port[3];
+    char     conv_id[64];
+};
+
+static struct dm_shared g_sh;
+
+static int G_PASSED = 0, G_FAILED = 0, G_TOTAL = 0;
+#define TEST(n)  do { G_TOTAL++; printf("  %-58s", n); fflush(stdout); } while(0)
+#define OK()     do { G_PASSED++; printf("OK\n"); } while(0)
+#define FAIL(f,...) do { G_FAILED++; printf("FAIL: " f "\n", ##__VA_ARGS__); } while(0)
+
+/* ── крипто-хелперы ── */
+
+static void gen_x25519(uint8_t pub[32], uint8_t priv[32]) {
+    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X25519, NULL);
+    EVP_PKEY* pkey = NULL;
+    EVP_PKEY_keygen_init(ctx); EVP_PKEY_keygen(ctx, &pkey); EVP_PKEY_CTX_free(ctx);
+    size_t l = 32; EVP_PKEY_get_raw_public_key(pkey, pub, &l);
+    l = 32;         EVP_PKEY_get_raw_private_key(pkey, priv, &l);
+    EVP_PKEY_free(pkey);
+}
+
+static void gen_ed25519(uint8_t pub[32], uint8_t priv[32]) {
+    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_ED25519, NULL);
+    EVP_PKEY* pkey = NULL;
+    EVP_PKEY_keygen_init(ctx); EVP_PKEY_keygen(ctx, &pkey); EVP_PKEY_CTX_free(ctx);
+    size_t l = 32; EVP_PKEY_get_raw_public_key(pkey, pub, &l);
+    l = 32;         EVP_PKEY_get_raw_private_key(pkey, priv, &l);
+    EVP_PKEY_free(pkey);
+}
+
+static void to_hex(const uint8_t* bin, size_t n, char* out) {
+    for (size_t i = 0; i < n; i++) sprintf(out + i * 2, "%02x", bin[i]);
+    out[n * 2] = '\0';
+}
+
+static int wf(const char* p, const char* f, ...) {
+    va_list ap; FILE* fp = fopen(p, "w"); if (!fp) return -1;
+    va_start(ap, f); vfprintf(fp, f, ap); va_end(ap); fclose(fp); return 0;
+}
+
+/* ── генерация данных сценария + конфигов ── */
+
+static void fill_shared(int base_port) {
+    memset(&g_sh, 0, sizeof(g_sh));
+
+    for (int i = 0; i < 3; i++) {
+        gen_x25519(g_sh.x_pub[i], g_sh.x_priv[i]);
+        sc_derive_ed25519_pubkey(g_sh.x_priv[i], g_sh.ed_pub[i]);
+        g_sh.nid[i] = sc_derive_node_id_from_pubkey(g_sh.x_pub[i]);
+        g_sh.port[i] = base_port + i * 1000;
+    }
+
+    { uint8_t ch_x_priv[32]; gen_x25519(g_sh.ch_x_pub, ch_x_priv); }
+    gen_ed25519(g_sh.ch_ed_pub, g_sh.ch_ed_priv);
+
+    /* подпись канала: Ed25519(ch_ed_priv, ch_id||'\0'||name||'\0'||owner(8)||ch_x_pub(32)||ch_ed_pub(32)) */
+    {
+        uint8_t msg[256]; size_t off = 0;
+        off += (size_t)snprintf((char*)msg + off, sizeof(msg) - off, "%s", CH_ID) + 1;
+        off += (size_t)snprintf((char*)msg + off, sizeof(msg) - off, "%s", "dm-test") + 1;
+        memcpy(msg + off, &g_sh.nid[IDX_A], 8); off += 8;
+        memcpy(msg + off, g_sh.ch_x_pub, 32); off += 32;
+        memcpy(msg + off, g_sh.ch_ed_pub, 32); off += 32;
+        sc_ed25519_sign(g_sh.ch_ed_priv, msg, off, g_sh.ch_sig);
+    }
+
+    uint64_t conv = dm_derive_conv_id(g_sh.nid[IDX_A], g_sh.nid[IDX_B]);
+    snprintf(g_sh.conv_id, sizeof(g_sh.conv_id), "%llu", (unsigned long long)conv);
+}
+
+static void write_configs(const char* dir) {
+    for (int i = 0; i < 3; i++) {
+        char priv[65], pub[65], path[512], dbd[512];
+        to_hex(g_sh.x_priv[i], 32, priv);
+        to_hex(g_sh.x_pub[i], 32, pub);
+        snprintf(path, sizeof(path), "%s/%s.conf", dir, i == IDX_A ? "a" : i == IDX_B ? "b" : "c");
+        snprintf(dbd, sizeof(dbd), "%s/db%s", dir, i == IDX_A ? "a" : i == IDX_B ? "b" : "c");
+        utun_mkdir(dbd, 0755);
+
+        char client[512] = "";
+        if (i == IDX_C) {
+            /* C → A (клиент к A) */
+            char apub[65]; to_hex(g_sh.x_pub[IDX_A], 32, apub);
+            snprintf(client, sizeof(client),
+                "[client: to_a]\npeer_public_key=%s\nlink=s1:127.0.0.1:%d\n",
+                apub, g_sh.port[IDX_A]);
+        } else if (i == IDX_B) {
+            /* B → C (клиент к C) */
+            char cpub[65]; to_hex(g_sh.x_pub[IDX_C], 32, cpub);
+            snprintf(client, sizeof(client),
+                "[client: to_c]\npeer_public_key=%s\nlink=s1:127.0.0.1:%d\n",
+                cpub, g_sh.port[IDX_C]);
+        }
+
+        wf(path,
+            "[global]\ntun_ip=10.97.%d.1/24\ntun_ifname=tun%d0\ndb_path=%s/db%s\n"
+            "my_private_key=%s\nmy_public_key=%s\n"
+            "[server: s1]\naddr=127.0.0.1:%d\ntype=public\n"
+            "%s"
+            "[chatserver]\nstorage_autoload=0\n[allowed_keys]\nallow_all=1\n",
+            i, i, dir, i == IDX_A ? "a" : i == IDX_B ? "b" : "c",
+            priv, pub, g_sh.port[i], client);
+    }
+}
+
+/* ── чистые проверки (без опроса) ── */
+
+static int conn_up(struct UTUN_INSTANCE* inst, uint64_t nid) {
+    struct ETCP_CONN* c = instance_find_conn(inst, nid);
+    return c && c->initialized && c->links_up;
+}
+
+static int bgp_has(struct UTUN_INSTANCE* inst, uint64_t nid) {
+    uint64_t gid = strtoull(CH_ID, NULL, 10);
+    struct TOPO_GROUP* g = topo_groups_find(inst->topo_groups, gid);
+    if (!g) return 0;
+    struct TOPO_GROUP_NODE* nq = topo_node_find_by_id(g, nid);
+    return nq && nq->paths && nq->paths->head;
+}
+
+/* есть ли расшифрованный текст needle в беседе (одна проверка) */
+static int dm_msg_has(struct UTUN_INSTANCE* inst, const char* needle) {
+    char buf[8192]; size_t len = 0;
+    if (dm_list_messages_json(inst, g_sh.conv_id, 100, 0, buf, sizeof(buf), &len) != 0) return 0;
+    return strstr(buf, needle) != NULL;
+}
+
+/* количество блобов в dm_mail для recipient=B от sender=A (одна проверка) */
+static int dm_mail_count(struct UTUN_INSTANCE* inst) {
+    sqlite3_stmt* s = NULL;
+    int n = 0;
+    if (sqlite3_prepare_v2(inst->topo_sqlite_db,
+            "SELECT COUNT(*) FROM dm_mail WHERE recipient=? AND sender=?",
+            -1, &s, NULL) == SQLITE_OK) {
+        sqlite3_bind_int64(s, 1, (sqlite3_int64)g_sh.nid[IDX_B]);
+        sqlite3_bind_int64(s, 2, (sqlite3_int64)g_sh.nid[IDX_A]);
+        if (sqlite3_step(s) == SQLITE_ROW) n = sqlite3_column_int(s, 0);
+    }
+    if (s) sqlite3_finalize(s);
+    return n;
+}
+
+/* ── настройка канала и мемберов (однократно) ── */
+
+static void channel_put_shared(struct UTUN_INSTANCE* inst, int has_priv) {
+    topo_node_sqlite_channel_put(inst->topo_sqlite_db, CH_ID, "dm-test", g_sh.nid[IDX_A],
+        g_sh.ch_x_pub, NULL, g_sh.ch_ed_pub, has_priv ? g_sh.ch_ed_priv : NULL, g_sh.ch_sig);
+    chat_core_ensure_channel_ready(inst, CH_ID);
+}
+
+static void member_put_self(struct UTUN_INSTANCE* inst, const char* name) {
+    uint64_t join_ts = (uint64_t)ntp_time_get_seconds(inst);
+    uint8_t jm[128];
+    int jl = member_sync_build_join_msg(g_sh.ch_x_pub, g_sh.ch_ed_pub, inst->node_id,
+                                        inst->my_keys.public_key, join_ts, jm, (int)sizeof(jm));
+    uint8_t join_sig[64]; sc_ed25519_sign(inst->my_ed25519_privkey, jm, (size_t)jl, join_sig);
+    char userinfo[256]; snprintf(userinfo, sizeof(userinfo), "{\"name\":\"%s\"}", name);
+    member_sync_put(inst, CH_ID, inst->node_id, inst->my_keys.public_key, inst->my_ed25519_pubkey,
+                    join_sig, join_ts, NULL, 0, userinfo, NULL, NULL, 0, 0, NULL);
+}
+
+static void member_put_placeholder(struct UTUN_INSTANCE* inst, int idx, const char* name) {
+    char userinfo[256]; snprintf(userinfo, sizeof(userinfo), "{\"name\":\"%s\"}", name);
+    member_sync_put(inst, CH_ID, g_sh.nid[idx], g_sh.x_pub[idx], g_sh.ed_pub[idx],
+                    NULL, 0, NULL, 0, userinfo, NULL, NULL, 0, 0, NULL);
+}
+
+/* мембер C со флагом dm_storage=yes (adm_tags подписан канальным ключом) */
+static void member_put_storage(struct UTUN_INSTANCE* inst, int idx, const char* name) {
+    char userinfo[256]; snprintf(userinfo, sizeof(userinfo), "{\"name\":\"%s\"}", name);
+    char adm_tags[64]; snprintf(adm_tags, sizeof(adm_tags), "{\"dm_storage\":\"yes\",\"ver\":\"1\"}");
+    uint8_t ats[64];
+    uint8_t amsg[256]; size_t off = strlen(adm_tags);
+    memcpy(amsg, adm_tags, off);
+    memcpy(amsg + off, &g_sh.nid[idx], 8); off += 8;
+    sc_ed25519_sign(g_sh.ch_ed_priv, amsg, off, ats);
+    member_sync_put(inst, CH_ID, g_sh.nid[idx], g_sh.x_pub[idx], g_sh.ed_pub[idx],
+                    NULL, 0, NULL, 0, userinfo, adm_tags, ats, 0, 0, NULL);
+}
+
+/* однократная настройка роли */
+static void do_setup(struct UTUN_INSTANCE* inst, int role) {
+    uint64_t nc = g_sh.nid[IDX_C];
+    switch (role) {
+    case IDX_A:
+        channel_put_shared(inst, 1);
+        member_put_self(inst, "A");
+        member_put_placeholder(inst, IDX_B, "B");
+        member_put_storage(inst, IDX_C, "C");
+        member_sync_start(inst, nc, CH_ID, NULL, NULL);
+        break;
+    case IDX_B:
+        channel_put_shared(inst, 0);
+        member_put_self(inst, "B");
+        member_put_placeholder(inst, IDX_A, "A");
+        member_put_storage(inst, IDX_C, "C");
+        member_sync_start(inst, nc, CH_ID, NULL, NULL);
+        break;
+    case IDX_C:
+        channel_put_shared(inst, 0);
+        member_put_self(inst, "C");
+        member_put_placeholder(inst, IDX_A, "A");
+        member_put_placeholder(inst, IDX_B, "B");
+        member_sync_start(inst, g_sh.nid[IDX_A], CH_ID, NULL, NULL);
+        member_sync_start(inst, g_sh.nid[IDX_B], CH_ID, NULL, NULL);
+        break;
+    }
+}
+
+/* ── master state-machine (движется таймером) ── */
+
+static void dm_tick(void* arg) {
+    struct dm_ctx* t = arg;
+    t->timer = NULL;
+    if (t->result) return;
+
+    struct UTUN_INSTANCE* A = t->inst[IDX_A];
+    struct UTUN_INSTANCE* B = t->inst[IDX_B];
+    struct UTUN_INSTANCE* C = t->inst[IDX_C];
+    uint64_t na = g_sh.nid[IDX_A], nb = g_sh.nid[IDX_B], nc = g_sh.nid[IDX_C];
+
+    switch (t->phase) {
+    case P_WAIT_CONN:
+        /* C→A и B→C должны быть up */
+        if (conn_up(A, nc) && conn_up(C, na) && conn_up(B, nc) && conn_up(C, nb))
+            t->phase = P_SETUP;
+        break;
+    case P_SETUP:
+        do_setup(A, IDX_A);
+        do_setup(B, IDX_B);
+        do_setup(C, IDX_C);
+        t->phase = P_WAIT_BGP;
+        break;
+    case P_WAIT_BGP:
+        /* A видит C и B; C видит A и B; B видит A (и C) */
+        if (bgp_has(A, nc) && bgp_has(A, nb) && bgp_has(C, na) && bgp_has(C, nb) && bgp_has(B, na))
+            t->phase = P_SEND1;
+        break;
+    case P_SEND1:
+        if (dm_start(A, nb, g_sh.x_pub[IDX_B], g_sh.ed_pub[IDX_B], "B", CH_ID) != 0
+            || dm_send(A, g_sh.conv_id, "text", (const uint8_t*)"hello1", 6) != 0) {
+            fprintf(stderr, "A: dm_start/send hello1 failed\n");
+            t->result = 2;
+        } else {
+            t->phase = P_WAIT_MSG1;
+        }
+        break;
+    case P_WAIT_MSG1:
+        if (dm_msg_has(B, "hello1")) t->phase = P_B_OFFLINE;
+        break;
+    case P_B_OFFLINE:
+        utun_instance_destroy(B);
+        t->inst[IDX_B] = NULL;
+        t->phase = P_WAIT_B_OFFLINE;
+        break;
+    case P_WAIT_B_OFFLINE:
+        if (!bgp_has(A, nb)) t->phase = P_SEND2;
+        break;
+    case P_SEND2:
+        if (dm_send(A, g_sh.conv_id, "text", (const uint8_t*)"hello2", 6) != 0) {
+            fprintf(stderr, "A: dm_send hello2 failed\n");
+            t->result = 2;
+        } else {
+            t->phase = P_WAIT_MAIL;
+        }
+        break;
+    case P_WAIT_MAIL:
+        if (dm_mail_count(C) > 0) t->phase = P_RECONNECT;
+        break;
+    case P_RECONNECT: {
+        char cfg[512];
+        snprintf(cfg, sizeof(cfg), "%s/b.conf", getenv("UTUN_TEST_DIR") ? getenv("UTUN_TEST_DIR") : ".");
+        struct UTUN_INSTANCE* b2 = utun_instance_create(t->ua, cfg);
+        if (!b2) { fprintf(stderr, "B2 create failed\n"); t->result = 2; break; }
+        utun_instance_init(b2);
+        t->inst[IDX_B] = b2;
+        t->phase = P_WAIT_B2;
+        break;
+    }
+    case P_WAIT_B2:
+        if (dm_msg_has(B, "hello2") && dm_mail_count(C) == 0) t->phase = P_DONE;
+        break;
+    case P_DONE:
+        t->result = 1;
+        uasync_stop(t->ua);
+        return;
+    }
+
+    if (t->phase == P_DONE) { t->result = 1; uasync_stop(t->ua); return; }
+
+    if (++t->ticks > MAX_TICKS) {
+        fprintf(stderr, "test: timeout in phase %d (A_conn=%d C_conn=%d B_conn=%d)\n",
+                (int)t->phase,
+                conn_up(A, nc), conn_up(C, na), B ? conn_up(B, nc) : -1);
+        t->result = 2;
+        uasync_stop(t->ua);
+        return;
+    }
+    t->timer = uasync_set_timeout(t->ua, TICK_TB, t, dm_tick, "dm_tick");
+}
+
+/* ── main ── */
+
+int main(int argc, char** argv) {
+    (void)argc; (void)argv;
+    debug_config_init(); debug_set_level(DEBUG_LEVEL_ERROR);
+    if (getenv("UTUN_TEST_DEBUG")) {
+        debug_set_category_level_by_name("dm", "trace");
+        debug_set_category_level_by_name("chat_sync", "info");
+        debug_set_category_level_by_name("member_sync", "info");
+        debug_set_category_level_by_name("bgp", "info");
+        debug_set_category_level_by_name("etcp_route", "info");
+        debug_set_category_level_by_name("crypto", "trace");
+    }
+    utun_instance_set_tun_init_enabled(0);
+    srand((unsigned)time(NULL));
+
+    char dir[512]; snprintf(dir, sizeof(dir), "/tmp/utun_dm_e2e_XXXXXX");
+    if (!mkdtemp(dir)) { fprintf(stderr, "mkdtemp failed\n"); return 1; }
+    setenv("UTUN_TEST_DIR", dir, 1);
+
+    fill_shared(58000 + (getpid() % 2000));
+    write_configs(dir);
+
+    printf("=== test_dm_e2e ===\n"); fflush(stdout);
+
+    TEST("single-thread: direct send + offline mailbox + reconnect pull"); {
+        struct UASYNC* ua = uasync_create();
+        if (!ua) { FAIL("uasync_create failed"); return 1; }
+
+        struct dm_ctx t;
+        memset(&t, 0, sizeof(t));
+        t.ua = ua;
+        t.phase = P_WAIT_CONN;
+
+        char cfgA[512], cfgB[512], cfgC[512];
+        snprintf(cfgA, sizeof(cfgA), "%s/a.conf", dir);
+        snprintf(cfgB, sizeof(cfgB), "%s/b.conf", dir);
+        snprintf(cfgC, sizeof(cfgC), "%s/c.conf", dir);
+
+        t.inst[IDX_A] = utun_instance_create(ua, cfgA);
+        t.inst[IDX_B] = utun_instance_create(ua, cfgB);
+        t.inst[IDX_C] = utun_instance_create(ua, cfgC);
+
+        if (!t.inst[IDX_A] || !t.inst[IDX_B] || !t.inst[IDX_C]) {
+            FAIL("instance create failed A=%p B=%p C=%p",
+                 (void*)t.inst[IDX_A], (void*)t.inst[IDX_B], (void*)t.inst[IDX_C]);
+            uasync_destroy(ua, 0);
+            return 1;
+        }
+        utun_instance_init(t.inst[IDX_A]);
+        utun_instance_init(t.inst[IDX_C]);
+        /* B стартует после C, чтобы B→C пришлось на уже поднятый C (как в сценарии) */
+        utun_instance_init(t.inst[IDX_B]);
+
+        t.timer = uasync_set_timeout(ua, TICK_TB, &t, dm_tick, "dm_tick");
+        uasync_mainloop(ua);
+
+        int ok = (t.result == 1);
+
+        if (t.inst[IDX_A]) utun_instance_destroy(t.inst[IDX_A]);
+        if (t.inst[IDX_B]) utun_instance_destroy(t.inst[IDX_B]);
+        if (t.inst[IDX_C]) utun_instance_destroy(t.inst[IDX_C]);
+        uasync_destroy(ua, 0);
+
+        if (ok) OK(); else FAIL("result=%d phase=%d", t.result, (int)t.phase);
+    }
+
+    char cmd[512]; snprintf(cmd, sizeof(cmd), "rm -rf %s", dir); (void)!system(cmd);
+
+    printf("\n%d/%d passed, %d failed\n", G_PASSED, G_TOTAL, G_FAILED);
+    return G_FAILED > 0 ? 1 : 0;
+}