儲存庫 vbox 的更動 15393

時間撮記:

2008-12-12 下午07:16:05 (16 年 以前)

作者:

vboxsync

訊息:

slirp:icmp: move debuging in more correct and safier way

位置:

trunk/src/VBox/Devices/Network/slirp

檔案:

• bootp.c (修改) (2 筆差異)
• debug.c (修改) (1 筆差異)
• ip_icmp.c (修改) (1 筆差異)

trunk/src/VBox/Devices/Network/slirp/bootp.c

@@ -153 +153 @@
         LogRel(("NAT: %s %R[IP4]\n",
                 rc ? "DHCP released IP address" : "Ignored DHCP release for IP address",
-                &bp->bp_ciaddr));
+                bp->bp_ciaddr.s_addr));
         /* This message is not to be answered in any way. */
         return;
@@ -245 +245 @@
     if (send_nak)
         LogRel(("NAT: Client requested IP address %R[IP4] -- sending NAK\n",
-                &requested_ip));
+                requested_ip.s_addr));
     else
         LogRel(("NAT: DHCP offered IP address %R[IP4]\n",
-                &daddr.sin_addr));
+                daddr.sin_addr.s_addr));
 
     if (   dhcp_msg_type == DHCPDISCOVER

trunk/src/VBox/Devices/Network/slirp/debug.c

@@ -230 +230 @@
     AssertReturn(strcmp(pszType, "IP4") == 0, 0);
 
-    ip = ntohl(*(uint32_t*)pvValue);
+    ip = ntohl((uint32_t)(uintptr_t)pvValue);
     return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, IP4_ADDR_PRINTF_FORMAT,
            IP4_ADDR_PRINTF_DECOMP(ip));

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -219 +219 @@
             {
                 /* Should be reaplaced by hash here */
-                LogRel(("trying:%R[natsock] against %R[IP4]:%d lport=%d hlport=%d\n", so, &faddr, fport, lport, so->so_hlport));
+                LogRel(("trying:%R[natsock] against %R[IP4]:%d lport=%d hlport=%d\n", so, faddr.s_addr, fport, lport, so->so_hlport));
                 if (   so->so_faddr.s_addr == faddr.s_addr
                     && so->so_fport == fport