jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NODEINFO: Add nat_addr/nat_port fields, use interface_addr for addr/port

Browse Source
This commit is contained in:
Evgeny committed 2026-04-23 23:21:12 +03:00
1 parent f02603f8ac
commit a3063ea47a
5 files changed
+49 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/route_bgp.c
+6 -6
View File
@@ -943,12 +943,12 @@ static void route_bgp_handle_nat_info(struct ROUTE_BGP* bgp, struct ETCP_CONN* f
DEBUG_INFO(DEBUG_CATEGORY_BGP, " checking socket %d: id=%u", i, sockets[i].id);
if (sockets[i].id == socket_id) {
uint8_t old_type = sockets[i].type;
/* addr[] хранится в network byte order (big-endian bytes) */
uint32_t old_ip = (sockets[i].addr[0] << 24) | (sockets[i].addr[1] << 16) |
(sockets[i].addr[2] << 8) | sockets[i].addr[3];
uint16_t old_port = sockets[i].port;
memcpy(sockets[i].addr, info->nat_ip, 4);
sockets[i].port = nat_port;
/* nat_addr[] хранится в network byte order (big-endian bytes) */
uint32_t old_ip = (sockets[i].nat_addr[0] << 24) | (sockets[i].nat_addr[1] << 16) |
(sockets[i].nat_addr[2] << 8) | sockets[i].nat_addr[3];
uint16_t old_port = sockets[i].nat_port;
memcpy(sockets[i].nat_addr, info->nat_ip, 4);
sockets[i].nat_port = nat_port;
uint8_t verified_type;
if (info->nat_type == NAT_TYPE_OPEN) {
verified_type = NAT_VERIFIED_OPEN;
src/route_node.c
+23 -7
View File
@@ -165,8 +165,16 @@ int route_bgp_update_my_nodeinfo(struct UTUN_INSTANCE* instance, struct ROUTE_BG
bool same = true;
while (e_sock) {
if (e_sock->local_addr.ss_family == AF_INET) {
struct sockaddr_in* sin = (struct sockaddr_in*)&e_sock->local_addr;
if (memcmp(sa->addr, &sin->sin_addr.s_addr, 4) != 0 || sa->port != ntohs(sin->sin_port) ||
struct sockaddr_in* if_sin = (struct sockaddr_in*)&e_sock->interface_addr;
struct sockaddr_in* nat_sin = (struct sockaddr_in*)&e_sock->nat_addr;
uint8_t nat_addr_cmp[4] = {0};
uint16_t nat_port_cmp = 0;
if (e_sock->nat_addr.ss_family == AF_INET) {
memcpy(nat_addr_cmp, &nat_sin->sin_addr.s_addr, 4);
nat_port_cmp = ntohs(nat_sin->sin_port);
}
if (memcmp(sa->addr, &if_sin->sin_addr.s_addr, 4) != 0 || sa->port != ntohs(if_sin->sin_port) ||
memcmp(sa->nat_addr, nat_addr_cmp, 4) != 0 || sa->nat_port != nat_port_cmp ||
sa->type != e_sock->nat_type || sa->id != e_sock->sock_id) {
same = false;
break;
@@ -201,14 +209,22 @@ int route_bgp_update_my_nodeinfo(struct UTUN_INSTANCE* instance, struct ROUTE_BG
e_sock = instance->etcp_sockets;
while (e_sock) {
if (e_sock->local_addr.ss_family == AF_INET) {
struct sockaddr_in* sin = (struct sockaddr_in*)&e_sock->local_addr;
memcpy(sa->addr, &sin->sin_addr.s_addr, 4);
sa->port = ntohs(sin->sin_port);
struct sockaddr_in* if_sin = (struct sockaddr_in*)&e_sock->interface_addr;
struct sockaddr_in* nat_sin = (struct sockaddr_in*)&e_sock->nat_addr;
memcpy(sa->addr, &if_sin->sin_addr.s_addr, 4);
sa->port = ntohs(if_sin->sin_port);
sa->type = e_sock->nat_type;
sa->id = e_sock->sock_id;
DEBUG_INFO(DEBUG_CATEGORY_BGP, "NODEINFO socket: addr=0x%02x%02x%02x%02x port=%u (from sin_addr=0x%08x sin_port=%u)",
if (e_sock->nat_addr.ss_family == AF_INET) {
memcpy(sa->nat_addr, &nat_sin->sin_addr.s_addr, 4);
sa->nat_port = ntohs(nat_sin->sin_port);
} else {
memset(sa->nat_addr, 0, 4);
sa->nat_port = 0;
}
DEBUG_INFO(DEBUG_CATEGORY_BGP, "NODEINFO socket: addr=0x%02x%02x%02x%02x port=%u nat=0x%02x%02x%02x%02x:%u",
sa->addr[0], sa->addr[1], sa->addr[2], sa->addr[3], sa->port,
sin->sin_addr.s_addr, ntohs(sin->sin_port));
sa->nat_addr[0], sa->nat_addr[1], sa->nat_addr[2], sa->nat_addr[3], sa->nat_port);
sa++;
}
e_sock = e_sock->next;
src/route_node.h
+6 -4
View File
@@ -27,10 +27,12 @@ struct NODEINFO {
} __attribute__((packed));
struct NODEINFO_IPV4_SOCKET {
uint8_t addr[4];// network byte order
uint16_t port;
uint8_t type; // CFG_SERVER_TYPE_PUBLIC/PRIVATE/NAT
uint8_t id; // unique socket id (0-255)
uint8_t addr[4]; // interface IP (network byte order)
uint16_t port; // interface port
uint8_t type; // CFG_SERVER_TYPE_PUBLIC/PRIVATE/NAT
uint8_t id; // unique socket id (0-255)
uint8_t nat_addr[4]; // NAT IP (network byte order), 0 = не определён
uint16_t nat_port; // NAT port, 0 = не определён
} __attribute__((packed));
struct NODEINFO_IPV6_SOCKET {