1

src/route_bgp.c

@@ -699,7 +699,7 @@ static void route_bgp_start_link_nat_check(struct ROUTE_BGP* bgp, struct ETCP_LI
         target_port = link->nat_port;
     } else {
         struct sockaddr_in* sin = (struct sockaddr_in*)&link->remote_addr;
-        target_ip = ntohl(sin->sin_addr.s_addr);
+        target_ip = sin->sin_addr.s_addr;
         target_port = ntohs(sin->sin_port);
     }
 

src/route_ping.c

@@ -304,11 +304,11 @@ int route_ping_send_req_addr(struct ROUTE_BGP* bgp, struct ETCP_CONN* to_conn, u
     req_pkt->count = count;
     req_pkt->interval_ms = interval_ms;
     req_pkt->timeout_ms = timeout_ms;
-    req_pkt->target_ipv4[0] = (target_ip >> 24) & 0xFF;
-    req_pkt->target_ipv4[1] = (target_ip >> 16) & 0xFF;
-    req_pkt->target_ipv4[2] = (target_ip >> 8) & 0xFF;
-    req_pkt->target_ipv4[3] = target_ip & 0xFF;
-    req_pkt->target_port = target_port;
+    req_pkt->target_ipv4[0] = target_ip;// ip уже в network byte order
+    req_pkt->target_ipv4[1] = target_ip>>8;
+    req_pkt->target_ipv4[2] = target_ip>>16;
+    req_pkt->target_ipv4[3] = target_ip>>24;
+    req_pkt->target_port = htons(target_port);
     if (pubkey) {
         memcpy(req_pkt->pubkey, pubkey, SC_PUBKEY_SIZE);
     }