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

Timestamp:

Oct 2, 2009 3:22:39 AM (16 years ago)

Author:

vboxsync

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

53127

Message:

NAT: DHCPDECLINE was added.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

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

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

@@ -633 +633 @@
         case DHCPRELEASE:
             flag = 1;
-#if 0
-        case DHCPDECLINE:
-#endif
             rc = dhcp_decode_release(pData, bp, buf, size, flag);
             if (rc > 0)
                 goto reply;
+        break;
+        case DHCPDECLINE:
+            p = dhcp_find_option(&bp->bp_vend[0], RFC2132_REQ_ADDR);
+            req_ip.s_addr = *(uint32_t *)(p + 2);
+            rc = bootp_cache_lookup_ether_by_ip(pData, req_ip.s_addr, NULL);
+            if (rc != 0)
+            {
+                /* Not registered */
+                BOOTPClient *bc;
+                bc = bc_alloc_client(pData);
+                Assert(bc);
+                bc->addr.s_addr = req_ip.s_addr;
+                slirp_arp_who_has(pData, bc->addr.s_addr);
+                LogRel(("NAT: %R[IP4] has been already registered\n", &req_ip));
+            }
+            /* no response required */
         break;
         default:
@@ -729 +742 @@
     int rc = 1;
     int i;
-    if (ether == NULL)
-        return rc;
     for (i = 0; i < NB_ADDR; i++)
     {
@@ -736 +747 @@
             && ip == bootp_clients[i].addr.s_addr)
         {
-            memcpy(ether, bootp_clients[i].macaddr, ETH_ALEN);
+            if(ether != NULL) memcpy(ether, bootp_clients[i].macaddr, ETH_ALEN);
             rc = 0;
             break;

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

@@ -71 +71 @@
 #define DHCPOFFER               2
 #define DHCPREQUEST             3
+#define DHCPDECLINE             4
 #define DHCPACK                 5
 #define DHCPNAK                 6