Changeset 9109 in vbox for trunk/src/VBox

Timestamp:

May 26, 2008 9:46:30 AM (17 years ago)

Author:

vboxsync

Message:

fix crash in slirp code if the wrong IP was released from DHCP (#2893)

File:

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

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

@@ -56 +56 @@
 }
 
-static void release_addr(PNATState pData, struct in_addr *paddr)
-{
-    int i;
+static int release_addr(PNATState pData, struct in_addr *paddr)
+{
+    unsigned i;
 
     i = ntohl(paddr->s_addr) - START_ADDR - ntohl(special_addr.s_addr);
     if (i >= NB_ADDR)
-        return;
+        return 0;
     memset(bootp_clients[i].macaddr, '\0', 6);
     bootp_clients[i].allocated = 0;
+    return 1;
 }
 
@@ -151 +152 @@
 
     if (dhcp_msg_type == DHCPRELEASE) {
+        int rc;
         ipv4_addr = ntohl(bp->bp_ciaddr.s_addr);
-        release_addr(pData, &bp->bp_ciaddr);
-        LogRel(("NAT: DHCP released IP address %u.%u.%u.%u\n",
+        rc = release_addr(pData, &bp->bp_ciaddr);
+        LogRel(("NAT: %s %u.%u.%u.%u\n",
+                rc ? "DHCP released IP address" : "Ignored DHCP release for IP address",
                 ipv4_addr >> 24, (ipv4_addr >> 16) & 0xff, (ipv4_addr >> 8) & 0xff, ipv4_addr & 0xff));
         dprintf("released addr=%08x\n", ntohl(bp->bp_ciaddr.s_addr));