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

Timestamp:

Aug 2, 2008 1:42:46 AM (17 years ago)

Author:

vboxsync

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

33980

Message:

intnet: Disabled the DHCP snooping code by putting it inside #ifdef INTNET_WITH_DHCP_SNOOPING. It doesn't do anything yet, so no reason to waste time on it.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
 #include <iprt/handletable.h>
 #include <iprt/net.h>
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def INTNET_WITH_DHCP_SNOOPING
+ * Enabled DHCP snooping when in shared-mac-on-the-wire mode. */
+/*#define INTNET_WITH_DHCP_SNOOPING - the implementation isn't completed yet. */
 
 
@@ -1034 +1042 @@
 
 
+#ifdef INTNET_WITH_DHCP_SNOOPING
+
 /**
  * Snoops IP assignments and releases from the DHCPv4 traffic.
@@ -1058 +1068 @@
 }
 
+#endif /* INTNET_WITH_DHCP_SNOOPING */
+
 
 /**
@@ -1070 +1082 @@
 static void intnetR0TrunkIfSnoopArp(PINTNETNETWORK pNetwork, PCINTNETSG pSG)
 {
-Log6(("ts-ar: %#d\n", pSG->cbTotal));
-
     /*
      * Check the minimum size first.
@@ -1126 +1136 @@
 
 
+#ifdef INTNET_WITH_DHCP_SNOOPING
 /**
  * Snoop up addresses from ARP and DHCP traffic from frames comming
@@ -1182 +1193 @@
     }
 }
+#endif /* INTNET_WITH_DHCP_SNOOPING */
 
 
@@ -1231 +1243 @@
     }
 
+#ifdef INTNET_WITH_DHCP_SNOOPING
     /*
      * Check for potential DHCP packets.
@@ -1250 +1263 @@
         }
     }
+#endif /* INTNET_WITH_DHCP_SNOOPING */
 }
 
@@ -1824 +1838 @@
              && !pIfSender)
     {
+#ifdef INTNET_WITH_DHCP_SNOOPING
         uint16_t EtherType = RT_BE2H_U16(pEthHdr->EtherType);
         if (    (   EtherType == RTNET_ETHERTYPE_IPV4       /* for DHCP */
@@ -1829 +1844 @@
             ||  (pSG->fFlags & (INTNETSG_FLAGS_ARP_IPV4)) )
             intnetR0TrunkIfSnoopAddr(pNetwork, pSG, EtherType);
+#else
+       if (pSG->fFlags & (INTNETSG_FLAGS_ARP_IPV4))
+           intnetR0TrunkIfSnoopArp(pNetwork, pSG);
+#endif
     }
 
@@ -1958 +1977 @@
     }
 
+#ifdef INTNET_WITH_DHCP_SNOOPING
     /*
      * Perform DHCP snooping.
@@ -1964 +1984 @@
         &&  pSG->cbTotal >= sizeof(RTNETETHERHDR) + RTNETIPV4_MIN_LEN + RTNETUDP_MIN_LEN + RTNETBOOTP_DHCP_MIN_LEN)
         intnetR0TrunkIfSnoopAddr(pNetwork, pSG, RT_BE2H_U16(pEthHdr->EtherType));
+#endif /* INTNET_WITH_DHCP_SNOOPING */
 
     return fExactIntNetRecipient;