Changeset 28208 in vbox

Timestamp:

Apr 12, 2010 2:07:33 PM (15 years ago)

Author:

vboxsync

Message:

intnet,VBoxNetFlt-linux: Added INTNETTRUNKSWPORT::pfnPreRecv for doing filtering and switching in difficult contexts. It currently returns broadcast all the time, but that will be addressed before long.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (4 diffs)
• src/VBox/Devices/Network/DrvIntNet.cpp (modified) (2 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

trunk/include/VBox/intnet.h

@@ -353 +353 @@
 /** @} */
 
+/**
+ * Switch decisions returned by INTNETTRUNKSWPORT::pfnPreRecv.
+ */
+typedef enum INTNETSWDECISION
+{
+    /** The usual invalid zero value. */
+    INTNETSWDECISION_INVALID = 0,
+    /** Everywhere. */
+    INTNETSWDECISION_BROADCAST,
+    /** Only to the internal network. */
+    INTNETSWDECISION_INTNET,
+    /** Only for the trunk (host/wire). */
+    INTNETSWDECISION_TRUNK,
+    /** The usual 32-bit type expansion. */
+    INTNETSWDECISION_32BIT_HACK = 0x7fffffff
+} INTNETSWDECISION;
+
 
 /** Pointer to the switch side of a trunk port. */
@@ -366 +383 @@
     /** Structure version number. (INTNETTRUNKSWPORT_VERSION) */
     uint32_t u32Version;
+
+    /**
+     * Examine the packet and figure out where it is going.
+     *
+     * This method is for making packet switching decisions in contexts where
+     * pfnRecv cannot be called or is no longer applicable.  This method can be
+     * called from any context.
+     *
+     * @returns INTNETSWDECISION_BROADCAST, INTNETSWDECISION_INTNET or
+     *          INTNETSWDECISION_TRUNK.  The source is excluded from broadcast &
+     *          trunk, of course.
+     *
+     * @param   pSwitchPort Pointer to this structure.
+     * @param   pvHdrs      Pointer to the packet headers.
+     * @param   cbHdrs      Size of the packet headers.  This must be at least 6
+     *                      bytes (the destination MAC address), but should if
+     *                      possibly also include any VLAN tag and network layer
+     *                      header (wireless mac address sharing).
+     * @param   fSrc        Where this frame comes from.  Only one bit should be
+     *                      set!
+     *
+     * @remarks Will only grab the switch table spinlock (interrupt safe).
+     */
+    DECLR0CALLBACKMEMBER(INTNETSWDECISION, pfnPreRecv,(PINTNETTRUNKSWPORT pSwitchPort,
+                                                       void const *pvHdrs, size_t cbHdrs, uint32_t fSrc));
 
     /**
@@ -376 +418 @@
      *
      * @returns true if we've handled it and it should be dropped.
-     *          false if it should hit the wire.
+     *          false if it should hit the wire/host.
      *
      * @param   pSwitchPort Pointer to this structure.
@@ -679 +721 @@
 
 /** The UUID for the (current) trunk factory. (case sensitive) */
-#define INTNETTRUNKFACTORY_UUID_STR     "1d3810bc-0899-42b0-8ae1-346a08bffff7"
+#define INTNETTRUNKFACTORY_UUID_STR     "b010afb2-cb4c-44b7-9da9-1e113cfcd47c"
 
 /** @name INTNETTRUNKFACTORY::pfnCreateAndConnect flags.

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

@@ -135 +135 @@
 #ifdef IN_RING3
 
-/* -=-=-=-=- PDMINETWORKUP -=-=-=-=- */
-
 
 /**
@@ -192 +190 @@
 }
 
+/* -=-=-=-=- PDMINETWORKUP -=-=-=-=- */
 
 /**

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

@@ -3329 +3329 @@
 
 
+/** @copydoc INTNETTRUNKSWPORT::pfnPreRecv */
+static DECLCALLBACK(INTNETSWDECISION) intnetR0TrunkIfPortPreRecv(PINTNETTRUNKSWPORT pSwitchPort,
+                                                                 void const *pvSrc, size_t cbSrc, uint32_t fSrc)
+{
+    PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
+    PINTNETNETWORK pNetwork = pThis->pNetwork;
+
+    /* assert some sanity */
+    AssertPtrReturn(pNetwork, INTNETSWDECISION_TRUNK);
+    AssertReturn(pNetwork->FastMutex != NIL_RTSEMFASTMUTEX, INTNETSWDECISION_TRUNK);
+    AssertPtr(pvSrc);
+    AssertPtr(cbSrc >= 6);
+    Assert(fSrc);
+
+    /** @todo implement the switch table. */
+
+    return INTNETSWDECISION_BROADCAST;
+}
+
+
 /** @copydoc INTNETTRUNKSWPORT::pfnRecv */
 static DECLCALLBACK(bool) intnetR0TrunkIfPortRecv(PINTNETTRUNKSWPORT pSwitchPort, PINTNETSG pSG, uint32_t fSrc)
@@ -3612 +3632 @@
         return VERR_NO_MEMORY;
     pTrunkIF->SwitchPort.u32Version                 = INTNETTRUNKSWPORT_VERSION;
+    pTrunkIF->SwitchPort.pfnPreRecv                 = intnetR0TrunkIfPortPreRecv;
     pTrunkIF->SwitchPort.pfnRecv                    = intnetR0TrunkIfPortRecv;
     pTrunkIF->SwitchPort.pfnSGRetain                = intnetR0TrunkIfPortSGRetain;

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -250 +250 @@
     /** Our overridden ops. */
     struct net_device_ops           Ops;
+    /** Magic word. */
+    uint32_t                        u32Magic;
     /** Pointer to the original ops. */
     struct net_device_ops const    *pOrgOps;
-    /** Magic word. */
-    uint32_t                        u32Magic;
+    /** Pointer to the net filter instance. */
+    PVBOXNETFLTINS                  pVBoxNetFlt;
     /** The number of filtered packages. */
     uint64_t                        cFiltered;
@@ -273 +275 @@
 {
     PVBOXNETDEVICEOPSOVERRIDE   pOverride = (PVBOXNETDEVICEOPSOVERRIDE)pDev->netdev_ops;
-    RTNETETHERHDR               EtherHdrBuf;
+    uint8_t                     abHdrBuf[sizeof(RTNETETHERHDR) + sizeof(uint32_t) + RTNETIPV4_MIN_LEN];
     PCRTNETETHERHDR             pEtherHdr;
+    PINTNETTRUNKSWPORT          pSwitchPort;
+
 
     /*
@@ -300 +304 @@
      *       drop it.
      */
-    pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, sizeof(EtherHdrBuf), &EtherHdrBuf);
-    if (    pEtherHdr
-        &&  pEtherHdr->DstMac.au8[0] == 0x08
-        &&  pEtherHdr->DstMac.au8[1] == 0x00
-        &&  pEtherHdr->DstMac.au8[2] == 0x27
+    pEtherHdr = (PCRTNETETHERHDR)skb_header_pointer(pSkb, 0, sizeof(abHdrBuf), &abHdrBuf[0]);
+    if (   pEtherHdr
+        && VALID_PTR(pOverride->pVBoxNetFlt)
+        && (pSwitchPort = pOverride->pVBoxNetFlt->pSwitchPort) != NULL
+        && VALID_PTR(pSwitchPort)
        )
     {
-        dev_kfree_skb(pSkb);
-        pOverride->cFiltered++;
-        return NETDEV_TX_OK;
+        INTNETSWDECISION    enmDecision;
+        uint32_t            cbHdrs = skb_headlen(pSkb);
+        cbHdrs = RT_MAX(cbHdrs, sizeof(abHdrBuf));
+
+        /** @todo consider reference counting, etc. */
+        enmDecision = pSwitchPort->pfnPreRecv(pSwitchPort, pEtherHdr, cbHdrs, INTNETTRUNKDIR_HOST);
+        if (enmDecision == INTNETSWDECISION_INTNET)
+        {
+            dev_kfree_skb(pSkb);
+            pOverride->cFiltered++;
+            return NETDEV_TX_OK;
+        }
     }
 
@@ -333 +346 @@
     pOverride->Ops.ndo_start_xmit   = vboxNetFltLinuxStartXmitFilter;
     pOverride->u32Magic             = VBOXNETDEVICEOPSOVERRIDE_MAGIC;
+    pOverride->cTotal               = 0;
+    pOverride->cFiltered            = 0;
+    pOverride->pVBoxNetFlt          = pThis;
 
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp); /* (this isn't necessary, but so what) */