Merge branch 'master' of http://git.syqiq.tech/jeka/utun2

src/route_bgp.c

@@ -976,10 +976,10 @@ void route_bgp_send_nat_info(struct ETCP_CONN* conn, uint8_t socket_id, uint32_t
     e->dgram = (uint8_t*)pkt;
     e->len = sizeof(struct BGP_NAT_INFO);
     etcp_send(conn, e);
-    DEBUG_INFO(DEBUG_CATEGORY_BGP, "route_bgp_send_nat_info to %s: socket_id=%u type=%s ip=%08x port=%u",
+    DEBUG_INFO(DEBUG_CATEGORY_BGP, "route_bgp_send_nat_info to %s: socket_id=%u type=%s ip=%s port=%u",
                conn->log_name, socket_id,
                nat_type == NAT_TYPE_OPEN ? "OPEN" : "RESTRICTED",
-               (unsigned)nat_ip, (unsigned)nat_port);
+               ip_to_str(&nat_ip, AF_INET).str, (unsigned)nat_port);
 }
 
 void route_bgp_send_nat_check_req(struct ETCP_CONN* conn, uint8_t socket_id) {

src/route_ping.c

@@ -344,9 +344,9 @@ int route_ping_send_req_addr(struct ROUTE_BGP* bgp, struct ETCP_CONN* to_conn, u
 
     pending->timeout_timer = uasync_set_timeout(bgp->instance->ua, wait_timeout_ms * 10, pending, route_ping_pending_timeout);
 
-    DEBUG_INFO(DEBUG_CATEGORY_BGP, "request_id=%016llx node=%016llx ip=%08x port=%u pubkey=%s",
+    DEBUG_INFO(DEBUG_CATEGORY_BGP, "request_id=%016llx node=%016llx ip=%s port=%u pubkey=%s",
                (unsigned long long)pending->request_id, (unsigned long long)node_id,
-               (unsigned)target_ip, (unsigned)target_port, pubkey ? "yes" : "no");
+               ip_to_str(&target_ip, AF_INET).str, (unsigned)target_port, pubkey ? "yes" : "no");
     return 0;
 }