nodeinfo: 2 адреса на сокет (до/после NAT) + типы адресов local/public/nat/nat_eim/nat_strict

- topo_node: сокет рекламирует INTERFACE (до NAT) + NAT (после NAT, EIM);
  strict/direct отдельным адресом не передаются
- topo_node_sqlite: addr_type_classify различает NAT_VERIFIED_*; добавлен
  ADDR_TYPE_NAT (тип неизвестен), fallback больше не даёт DIRECT по IP
- chat_member: бейдж NAT-типа по приоритету (public>nat_eim>nat>nat_strict>local)
  вместо MIN(addr_type)
- GUI (desktop+android): адреса мембера с socket_id и ролью (local/public/nat/nat_eim/nat_strict)

tools/chatgui-android/app/src/main/java/com/utun/chat/data/ChatRepository.kt

@@ -87,7 +87,11 @@ data class MemberDetail(val nodeId: Long, val name: String = "",
                         val bgpNodes: Int = 0)
 
 data class MemberAddr(val family: Int = 0, val protocol: String = "", val address: String = "",
-                      val port: Int = 0, val socketId: Int = 0, val rtt: Int = 0)
+                      val port: Int = 0, val socketId: Int = 0, val addrType: Int = 0, val rtt: Int = 0) {
+    val roleLabel: String get() = when (addrType) {
+        0 -> "local"; 1 -> "public"; 2 -> "nat_eim"; 3 -> "nat_strict"; 4 -> "nat"; else -> "?$addrType"
+    }
+}
 
 data class LinkStatus(val linkId: Int = 0, val localFamily: Int = 0, val localAddr: String = "", val localPort: Int = 0,
                       val remoteFamily: Int = 0, val remoteAddr: String = "", val remotePort: Int = 0,
@@ -428,6 +432,7 @@ class ChatRepository {
                         address = a.optString("ad", ""),
                         port = a.optInt("po", 0),
                         socketId = a.optInt("si", 0),
+                        addrType = a.optInt("at", 0),
                         rtt = a.optInt("rt", 0)
                     ))
                 }

tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt

@@ -325,7 +325,7 @@ private fun MemberDetailCard(
                     Text("Addresses:", fontSize = 13.sp, fontWeight = FontWeight.Medium)
                     detail.addresses.forEach { a ->
                         Text(
-                            text = "${a.protocol} ${a.address}:${a.port}",
+                            text = "[sock${a.socketId}] ${a.protocol} ${a.address}:${a.port} ${a.roleLabel}",
                             fontFamily = FontFamily.Monospace,
                             fontSize = 13.sp,
                             color = Color.DarkGray

tools/chatgui-android/jni_bridge/android_jni_bridge.c

@@ -673,8 +673,8 @@ char* utun_bridge_get_member_detail_json(const char* channel_id, uint64_t node_i
     snprintf(buf + pos, sizeof(buf) - pos, ",\"adr\":["); pos += strlen(buf + pos);
 
     if (sqlite3_prepare_v2(db,
-            "SELECT family, protocol, address, port, socket_id, COALESCE(rtt,0)"
-            " FROM node_addresses WHERE node_id=? ORDER BY family, port",
+            "SELECT family, protocol, address, port, socket_id, addr_type, COALESCE(rtt,0)"
+            " FROM node_addresses WHERE node_id=? ORDER BY socket_id, addr_type, family, port",
             -1, &st, NULL) == SQLITE_OK) {
         sqlite3_bind_int64(st, 1, (sqlite3_int64)node_id);
         int af = 1;
@@ -685,7 +685,8 @@ char* utun_bridge_get_member_detail_json(const char* channel_id, uint64_t node_i
             int addr_len = sqlite3_column_bytes(st, 2);
             int port = sqlite3_column_int(st, 3);
             int sid = sqlite3_column_int(st, 4);
-            int rtt = sqlite3_column_int(st, 5);
+            int at = sqlite3_column_int(st, 5);
+            int rtt = sqlite3_column_int(st, 6);
 
             char addr_str[64] = "";
             if (addr && addr_len >= (family == 4 ? 4 : 16)) {
@@ -700,8 +701,8 @@ char* utun_bridge_get_member_detail_json(const char* channel_id, uint64_t node_i
             const char* pn;
             switch (proto) { case 1: pn = "UDP"; break; case 2: pn = "TCP"; break; default: pn = "UDP/TCP"; break; }
             pos += (size_t)snprintf(buf + pos, sizeof(buf) - pos,
-                "%s{\"fm\":%d,\"pt\":\"%s\",\"ad\":\"%s\",\"po\":%d,\"si\":%d,\"rt\":%d}",
-                af ? "" : ",", family, pn, addr_str[0] ? addr_str : "?", port, sid, rtt);
+                "%s{\"fm\":%d,\"pt\":\"%s\",\"ad\":\"%s\",\"po\":%d,\"si\":%d,\"at\":%d,\"rt\":%d}",
+                af ? "" : ",", family, pn, addr_str[0] ? addr_str : "?", port, sid, at, rtt);
             af = 0;
         }
         sqlite3_finalize(st);

tools/chatgui/src/accountlist.cpp

@@ -31,6 +31,10 @@ static void memberDetailCb(const uint8_t* data, int len) {
     g_detailTarget->onMemberDetailData(nodeId, data, len);
 }
 
+static QString addrRoleStr(int t) {
+    switch (t) { case 0: return "local"; case 1: return "public"; case 2: return "nat_eim"; case 3: return "nat_strict"; case 4: return "nat"; default: return QString("?%1").arg(t); }
+}
+
 QString AccountList::addrStr(const void* addr, int family) {
     if (family == 4) {
         const uint8_t* a = (const uint8_t*)addr;
@@ -233,7 +237,7 @@ void AccountList::showMemberDetail(quint64 nodeId) {
 
     sqlite3_stmt* na = nullptr;
     sqlite3_prepare_v2(d,
-        "SELECT family, protocol, address, port, socket_id FROM node_addresses WHERE node_id=?",
+        "SELECT family, protocol, address, port, socket_id, addr_type FROM node_addresses WHERE node_id=?",
         -1, &na, nullptr);
     if (na) {
         sqlite3_bind_int64(na, 1, (sqlite3_int64)nodeId);
@@ -246,6 +250,7 @@ void AccountList::showMemberDetail(quint64 nodeId) {
             if (adr && sz > 0) a.addr = QByteArray((const char*)adr, sz);
             a.port      = sqlite3_column_int(na, 3);
             a.socket_id = sqlite3_column_int(na, 4);
+            a.addr_type = sqlite3_column_int(na, 5);
             if (!a.addr.isEmpty()) m_detailAddrs.append(a);
         }
         sqlite3_finalize(na);
@@ -253,7 +258,8 @@ void AccountList::showMemberDetail(quint64 nodeId) {
 
     std::sort(m_detailAddrs.begin(), m_detailAddrs.end(),
         [](const DetailAddress& a, const DetailAddress& b) {
-            if (a.ifname != b.ifname) return a.ifname < b.ifname;
+            if (a.socket_id != b.socket_id) return a.socket_id < b.socket_id;
+            if (a.addr_type != b.addr_type) return a.addr_type < b.addr_type;
             if (a.addr != b.addr) return a.addr < b.addr;
             if (a.protocol != b.protocol) return a.protocol < b.protocol;
             return a.port < b.port;
@@ -333,7 +339,8 @@ void AccountList::onMemberDetailData(uint64_t nodeId, const uint8_t* data, int l
     }
     std::sort(m_detailAddrs.begin(), m_detailAddrs.end(),
         [](const DetailAddress& a, const DetailAddress& b) {
-            if (a.ifname != b.ifname) return a.ifname < b.ifname;
+            if (a.socket_id != b.socket_id) return a.socket_id < b.socket_id;
+            if (a.addr_type != b.addr_type) return a.addr_type < b.addr_type;
             if (a.addr != b.addr) return a.addr < b.addr;
             if (a.protocol != b.protocol) return a.protocol < b.protocol;
             return a.port < b.port;
@@ -365,11 +372,13 @@ void AccountList::updateDetailDisplay() {
         for (const auto& a : m_detailAddrs) {
             QString proto;
             switch (a.protocol) { case 1: proto = "UDP"; break; case 2: proto = "TCP"; break; default: proto = "?"; break; }
-            lines.append(QString("  %1  %2  %3:%4")
+            lines.append(QString("  [sock%1] %2  %3  %4:%5  %6")
+                .arg(a.socket_id)
                 .arg(proto)
                 .arg(a.ifname)
                 .arg(addrStr(a.addr.constData(), a.family))
-                .arg(a.port));
+                .arg(a.port)
+                .arg(addrRoleStr(a.addr_type)));
         }
     }
 

tools/chatgui/src/accountlist.h

@@ -19,6 +19,7 @@ struct DetailAddress {
     QByteArray addr;
     int        port;
     int        socket_id;
+    int        addr_type;
     QString    ifname;
 };
 

tools/chatgui/src/memberlistmodel.cpp

@@ -39,8 +39,8 @@ QVariant MemberListModel::data(const QModelIndex& index, int role) const {
             QString sub;
             if (it->rtt >= 0) sub += QString("rtt=%1ms").arg(it->rtt / 10);
             if (it->natType >= 0) {
-                static const char* nat[] = {"NET","DIR","EIM","STR"};
-                const char* nt = (it->natType <= 3) ? nat[it->natType] : "?";
+                static const char* nat[] = {"NET","DIR","EIM","STR","NAT"};
+                const char* nt = (it->natType <= 4) ? nat[it->natType] : "?";
                 if (!sub.isEmpty()) sub += " ";
                 sub += nt;
             }

tools/chatgui/src/nodespage.cpp

@@ -47,7 +47,7 @@ QString NodesPage::protoStr(int protocol) {
 }
 
 static QString addrTypeStr(int t) {
-    switch (t) { case 0: return "NETIF"; case 1: return "DIRECT"; case 2: return "NAT_EIM"; case 3: return "NAT_STRICT"; default: return QString("?%1").arg(t); }
+    switch (t) { case 0: return "NETIF"; case 1: return "DIRECT"; case 2: return "NAT_EIM"; case 3: return "NAT_STRICT"; case 4: return "NAT"; default: return QString("?%1").arg(t); }
 }
 
 NodesPage::NodesPage(DbManager* db, QWidget* parent)

tools/chatgui/transport/node_config.cpp

@@ -30,7 +30,8 @@ static const QSet<QString> SERVER_KEYS = {
 };
 
 static const QSet<QString> CLIENT_KEYS = {
-    "peer_public_key", "link", "keepalive"
+    "peer_public_key", "link", "keepalive",
+    "reality", "server_name", "short_id", "public_key", "version", "fingerprint"
 };
 
 static const QSet<QString> CONTROL_KEYS = {