Changeset 57181 in vbox

Timestamp:

Aug 4, 2015 5:59:55 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101930

Message:

NAT: %RTnaipv4 requires the IP address, not a pointer to one. While
here fix a few place where we pass struct in_addr instead of the value
of in_addr::s_addr. It worked because small structures are passed by
value, but be hygienic.

File:

• trunk/src/VBox/Devices/Network/slirp/bootp.c (modified) (7 diffs)

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

@@ -269 +269 @@
     /* Address/port of the DHCP server. */
     rbp->bp_yiaddr = bc->addr; /* Client IP address */
-    Log(("NAT: DHCP: bp_yiaddr:%RTnaipv4\n", rbp->bp_yiaddr));
+    Log(("NAT: DHCP: bp_yiaddr:%RTnaipv4\n", rbp->bp_yiaddr.s_addr));
     rbp->bp_siaddr = pData->tftp_server; /* Next Server IP address, i.e. TFTP */
-    Log(("NAT: DHCP: bp_siaddr:%RTnaipv4\n", rbp->bp_siaddr));
+    Log(("NAT: DHCP: bp_siaddr:%RTnaipv4\n", rbp->bp_siaddr.s_addr));
     if (fDhcpRequest)
     {
@@ -277 +277 @@
     }
     saddr.s_addr = RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_ALIAS);
-    Log(("NAT: DHCP: s_addr:%RTnaipv4\n", saddr));
+    Log(("NAT: DHCP: s_addr:%RTnaipv4\n", saddr.s_addr));
 
 #define FILL_BOOTP_EXT(q, tag, len, pvalue)                     \
@@ -485 +485 @@
                if ((bp->bp_ciaddr.s_addr & RT_H2N_U32(pData->netmask)) != pData->special_addr.s_addr)
                {
-                   LogRel(("NAT: Client %RTnaipv4 requested IP -- sending NAK\n", bp->bp_ciaddr));
+                   LogRel(("NAT: Client %RTnaipv4 requested IP -- sending NAK\n", bp->bp_ciaddr.s_addr));
                    offReply = dhcp_send_nack(pData, bp, bc, m);
                    return offReply;
@@ -560 +560 @@
     }
 
-    LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr));
+    LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr.s_addr));
     offReply = dhcp_send_ack(pData, bp, bc, m, /* fDhcpRequest=*/ 1);
     return offReply;
@@ -587 +587 @@
 
         bc->xid = bp->bp_xid;
-        LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr));
+        LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr.s_addr));
         offReply = dhcp_send_offer(pData, bp, bc, m);
         return offReply;
@@ -600 +600 @@
         }
 
-        LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr));
+        LogRel(("NAT: DHCP offered IP address %RTnaipv4\n", bc->addr.s_addr));
         offReply = dhcp_send_ack(pData, bp, bc, m, /* fDhcpRequest=*/ 0);
         return offReply;
@@ -613 +613 @@
     LogRel(("NAT: %s %RTnaipv4\n",
             RT_SUCCESS(rc) ? "DHCP released IP address" : "Ignored DHCP release for IP address",
-            &bp->bp_ciaddr));
+            bp->bp_ciaddr.s_addr));
     return 0;
 }