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

Timestamp:

Aug 1, 2008 2:34:44 AM (17 years ago)

Author:

vboxsync

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

33956

Message:

intnet: Implemented ARP snooping on the trunk. Fixed a couple of bugs (DHCP and other ARP snooping).

File:

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

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

@@ -112 +112 @@
     struct INTNETIF        *pNext;
     /** The current MAC address for the interface. */
-    PDMMAC                  Mac;
+    RTMAC                   Mac;
     /** Set if the INTNET::Mac member is valid. */
     bool                    fMacSet;
@@ -254 +254 @@
     RTNETARPHDR     Hdr;
     /** The sender hardware address. */
-    PDMMAC          ar_sha;
+    RTMAC           ar_sha;
     /** The sender protocol address. */
     RTNETADDRIPV6   ar_spa;
     /** The target hardware address. */
-    PDMMAC          ar_tha;
+    RTMAC           ar_tha;
     /** The arget protocol address. */
     RTNETADDRIPV6   ar_tpa;
@@ -267 +267 @@
 /** Pointer to a const ethernet IPv6+MAC ARP request packet. */
 typedef INTNETARPIPV6 const *PCINTNETARPIPV6;
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** Minimum length for ARP packets that we snoop. */
+#define INTNET_ARP_MIN_LEN      sizeof(RTNETARPIPV4)
+/** Maximum length for ARP packets that we snoop. */
+#define INTNET_ARP_MAX_LEN      sizeof(INTNETARPIPV6)
 
 
@@ -964 +973 @@
 static void intnetR0TrunkIfSnoopDhcp(PINTNETNETWORK pNetwork, PCINTNETSG pSG)
 {
-
-}
-
+}
+
+
+/**
+ * Snoops up source addresses from ARP requests and purge these
+ * from the address caches.
+ *
+ * The purpose of this purging is to get rid of stale addresses.
+ *
+ * @param   pNetwork        The network the this frame was seen on.
+ * @param   pSG             The gather list for the frame.
+ */
 static void intnetR0TrunkIfSnoopArp(PINTNETNETWORK pNetwork, PCINTNETSG pSG)
 {
-
+    /*
+     * Check the minimum size first.
+     */
+    if (RT_UNLIKELY(pSG->cbTotal < INTNET_ARP_MIN_LEN))
+        return;
+
+    /*
+     * Copy to temporary buffer if necessary.
+     */
+    size_t cbPacket = RT_MIN(pSG->cbTotal, INTNET_ARP_MAX_LEN);
+    PCRTNETARPHDR pHdr = (PCRTNETARPHDR)((uintptr_t)pSG->aSegs[0].pv + sizeof(RTNETETHERHDR));
+    if (    pSG->cSegsUsed != 1
+        &&  pSG->aSegs[0].cb < cbPacket)
+    {
+        if (!intnetR0SgReadPart(pSG, sizeof(RTNETETHERHDR), cbPacket, pNetwork->pbTmp))
+            return;
+        pHdr = (PCRTNETARPHDR)pNetwork->pbTmp;
+    }
+
+    /*
+     * Ignore malformed packets and packets which doesn't interest us.
+     */
+    if (RT_UNLIKELY(    pHdr->ar_hlen != sizeof(RTMAC)
+                    ||  pHdr->ar_htype != RT_H2BE_U16(RTNET_ARP_ETHER)))
+        return;
+    uint16_t ar_oper = RT_H2BE_U16(pHdr->ar_oper);
+    if (RT_UNLIKELY(    ar_oper != RTNET_ARPOP_REQUEST
+                    &&  ar_oper != RTNET_ARPOP_REPLY
+                    &&  ar_oper != RTNET_ARPOP_REVREQUEST
+                    &&  ar_oper != RTNET_ARPOP_REVREPLY
+                    /** @todo Read up on inverse ARP. */
+                   ))
+        return;
+
+    /*
+     * Deal with the protocols.
+     */
+    RTNETADDRU Addr;
+    uint16_t ar_ptype = RT_H2BE_U16(pHdr->ar_ptype);
+    if (ar_ptype == RTNET_ETHERTYPE_IPV4)
+    {
+        /*
+         * IPv4.
+         */
+        PCRTNETARPIPV4 pReq = (PCRTNETARPIPV4)pHdr;
+        if (RT_UNLIKELY(    pHdr->ar_plen != sizeof(pReq->ar_spa)
+                        ||  cbPacket < sizeof(*pReq)
+                        ||  !intnetR0IPv4AddrIsGood(pReq->ar_spa)))
+            return;
+
+        Addr.IPv4 = pReq->ar_spa;
+        intnetR0NetworkAddrCacheDelete(pNetwork, &Addr, kIntNetAddrType_IPv4, sizeof(pReq->ar_spa));
+    }
+#if 0 /** @todo IPv6 support */
+    else if (ar_ptype == RT_H2BE_U16(RTNET_ETHERTYPE_IPV6))
+    {
+        /*
+         * IPv6.
+         */
+        PCINTNETARPIPV6 pReq = (PCINTNETARPIPV6)pHdr;
+        if (RT_UNLIKELY(    pHdr->ar_plen != sizeof(pReq->ar_spa)
+                        ||  cbPacket < sizeof(*pReq)
+                        ||  !intnetR0IPv6AddrIsGood(&pReq->ar_spa)))
+            return;
+
+        Addr.IPv6 = pReq->ar_spa;
+        intnetR0NetworkAddrCacheDelete(pNetwork, &Addr, kIntNetAddrType_IPv6, sizeof(pReq->ar_spa));
+    }
+#endif
+    else
+        Log(("intnetR0TrunkIfSnoopArp: unknown ar_ptype=%#x\n", ar_ptype));
 }
 
@@ -1107 +1195 @@
      * Ignore malformed packets and packets which doesn't interest us.
      */
-    if (RT_UNLIKELY(    cbPacket <= sizeof(*pHdr)
-                    ||  pHdr->ar_hlen != sizeof(PDMMAC)
+    if (RT_UNLIKELY(    cbPacket <= INTNET_ARP_MIN_LEN
+                    ||  pHdr->ar_hlen != sizeof(RTMAC)
                     ||  pHdr->ar_htype != RT_H2BE_U16(RTNET_ARP_ETHER)))
         return;
@@ -1131 +1219 @@
          */
         PCRTNETARPIPV4 pReq = (PCRTNETARPIPV4)pHdr;
-        if (RT_UNLIKELY(    pHdr->ar_plen == sizeof(pReq->ar_spa)
+        if (RT_UNLIKELY(    pHdr->ar_plen != sizeof(pReq->ar_spa)
                         ||  cbPacket < sizeof(*pReq)
                         ||  !intnetR0IPv4AddrIsGood(pReq->ar_spa)))
@@ -1152 +1240 @@
          */
         PCINTNETARPIPV6 pReq = (PCINTNETARPIPV6)pHdr;
-        if (RT_UNLIKELY(    pHdr->ar_plen == sizeof(pReq->ar_spa)
+        if (RT_UNLIKELY(    pHdr->ar_plen != sizeof(pReq->ar_spa)
                         ||  cbPacket < sizeof(*pReq)
                         ||  !intnetR0IPv6AddrIsGood(&pReq->ar_spa)))
@@ -1265 +1353 @@
     AssertPtr(pRingBuf);
     AssertPtr(pSG);
-    Assert(pSG->cbTotal >= sizeof(PDMMAC) * 2);
+    Assert(pSG->cbTotal >= sizeof(RTMAC) * 2);
     uint32_t offWrite = pRingBuf->offWrite;
     Assert(offWrite == RT_ALIGN_32(offWrite, sizeof(INTNETHDR)));
@@ -1527 +1615 @@
         uint16_t EtherType = RT_BE2H_U16(pEthHdr->EtherType);
         if (    (   EtherType == RTNET_ETHERTYPE_IPV4       /* for DHCP */
-                 && pSG->cbTotal >= RTNETBOOTP_DHCP_MIN_LEN)
+                 && pSG->cbTotal >= sizeof(RTNETETHERHDR) + RTNETIPV4_MIN_LEN + RTNETUDP_MIN_LEN + RTNETBOOTP_DHCP_MIN_LEN)
             ||  EtherType == RTNET_ETHERTYPE_ARP)
             intnetR0TrunkIfSnoopAddr(pNetwork, pSG, EtherType);
@@ -1650 +1738 @@
      */
     if (    enmAddrType == kIntNetAddrType_IPv4
-        &&  pSG->cbTotal >= RTNETBOOTP_DHCP_MIN_LEN)
+        &&  pSG->cbTotal >= sizeof(RTNETETHERHDR) + RTNETIPV4_MIN_LEN + RTNETUDP_MIN_LEN + RTNETBOOTP_DHCP_MIN_LEN)
         intnetR0TrunkIfSnoopAddr(pNetwork, pSG, RT_BE2H_U16(pEthHdr->EtherType));