Changeset 7809 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 8, 2008 2:33:21 PM (17 years ago)

Author:

vboxsync

Message:

bootp: send DHCPNAK if the client requests an invalid IP address

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (7 diffs)
• bootp.h (modified) (1 diff)

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

@@ -85 +85 @@
 
 static void dhcp_decode(const uint8_t *buf, int size,
-                        int *pmsg_type)
+                        int *pmsg_type, struct in_addr *req_ip)
 {
     const uint8_t *p, *p_end;
@@ -113 +113 @@
 
             switch(tag) {
+            case RFC2132_REQ_ADDR:
+                if (len >= 4)
+                    *req_ip = *(struct in_addr*)p;
+                break;
             case RFC2132_MSG_TYPE:
                 if (len >= 1)
@@ -134 +138 @@
     int dhcp_msg_type, val;
     uint8_t *q;
+    struct in_addr requested_ip; /* the requested IP in DHCPREQUEST */
+    int send_nak = 0;
+    uint32_t ipv4_addr;
 
     /* extract exact DHCP msg type */
-    dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type);
+    requested_ip.s_addr = 0xffffffff;
+    dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type, &requested_ip);
     dprintf("bootp packet op=%d msgtype=%d\n", bp->bp_op, dhcp_msg_type);
 
@@ -143 +151 @@
 
     if (dhcp_msg_type == DHCPRELEASE) {
-        uint32_t addr = ntohl(bp->bp_ciaddr.s_addr);
+        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",
-                addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff));
+                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));
         /* This message is not to be answered in any way. */
@@ -190 +198 @@
         RTStrPrintf((char*)rbp->bp_file, sizeof(rbp->bp_file), "%s", bootp_filename);
 
-    {
-        uint32_t addr = ntohl(daddr.sin_addr.s_addr);
-        LogRel(("NAT: DHCP offered IP address %u.%u.%u.%u\n",
-                addr >> 24, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff));
-    }
-    dprintf("offered addr=%08x\n", ntohl(daddr.sin_addr.s_addr));
-
     saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
     saddr.sin_port = htons(BOOTP_SERVER);
@@ -222 +223 @@
         *q++ = RFC2132_MSG_TYPE;
         *q++ = 1;
-        *q++ = DHCPACK;
+        if (   requested_ip.s_addr != 0xffffffff
+            && requested_ip.s_addr != daddr.sin_addr.s_addr)
+        {
+            /* network changed */
+            *q++ = DHCPNAK;
+            send_nak = 1;
+        }
+        else
+            *q++ = DHCPACK;
+    }
+
+    if (send_nak)
+    {
+        ipv4_addr = ntohl(requested_ip.s_addr);
+        LogRel(("NAT: Client requested IP address %u.%u.%u.%u -- sending NAK\n",
+                ipv4_addr >> 24, (ipv4_addr >> 16) & 0xff, (ipv4_addr >> 8) & 0xff, ipv4_addr & 0xff));
+    }
+    else
+    {
+        ipv4_addr = ntohl(daddr.sin_addr.s_addr);
+        LogRel(("NAT: DHCP offered IP address %u.%u.%u.%u\n",
+                ipv4_addr >> 24, (ipv4_addr >> 16) & 0xff, (ipv4_addr >> 8) & 0xff, ipv4_addr & 0xff));
+        dprintf("offered addr=%08x\n", ntohl(daddr.sin_addr.s_addr));
     }
 
@@ -231 +254 @@
         memcpy(q, &saddr.sin_addr, 4);
         q += 4;
-
+    }
+
+    if (!send_nak &&
+        (dhcp_msg_type == DHCPDISCOVER ||
+         dhcp_msg_type == DHCPREQUEST)) {
         *q++ = RFC1533_NETMASK;
         *q++ = 4;

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

@@ -72 +72 @@
 #define DHCPREQUEST             3
 #define DHCPACK                 5
+#define DHCPNAK                 6
 #define DHCPRELEASE             7