Changeset 17663 in vbox for trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

Timestamp:

Mar 11, 2009 8:23:26 AM (16 years ago)

Author:

vboxsync

Message:

s-bahn coding...

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -709 +709 @@
      * If none was found, create a new lease for it and then construct a reply.
      */
-
-    /** @todo this code IS required. */
+    VBoxNetDhcpLease *pLease = findLeaseByMacAddress(pDhcpMsg->bp_chaddr.Mac,
+                                                     true /* fEnsureUpToDateConfig */);
+    if (!pLease)
+        pLease = newLease(pDhcpMsg, cb);
+    if (!pLease)
+        return false;
+    pLease->setState(pLease::kState_Discover);
+
+    handleDhcpReply(RTNET_DHCP_MT_OFFER, pLease, pDhcpMsg, cb);
     return true;
 }
 
+
+/** The requested address. */
+#define RTNET_DHCP_OPT_REQUESTED_ADDRESS    50
 
 /**
@@ -728 +738 @@
      * Windows will reissue these requests when rejoining a network if it thinks it
      * already has an address on the network. If we cannot find a valid lease,
-     * make a new one.
-     */
-    /** @todo check how windows treats bp_xid here, it should match I think. If
-     *        it doesn't we've no way of filtering out broadcast replies to other
-     *        DHCP servers. */
+     * make a new one and return NAC.
+     */
+    uint8_t             uReplyType  = RTNET_DHCP_MT_NAC;
+    VBoxNetDhcpLease   *pLease      = NULL;
+    RTNETADDRIPV4       IPv4Addr;
+    if (findOptionIPv4Addr(RTNET_DHCP_OPT_REQUESTED_ADDRESS, pDhcpMsg, cb, &Ipv4Addr))
+    {
+        pLease = findLeaseByIpv4AndMacAddresses(Ipv4Addr, pDhcpMsg->bp_chaddr);
+        if (pLease)
+        {
+            /** @todo check how windows treats bp_xid here, it should match I think. If
+             *        it doesn't we've no way of filtering out broadcast replies to other
+             *        DHCP servers. */
+            if (pDhcpMsg->bp_xid == )
+            {
+            }
+
+        }
+    }
+
+    if (pLease)
+    {
+    }
+
 
     /** @todo this code IS required. */