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

Timestamp:

Apr 23, 2010 5:25:58 PM (15 years ago)

Author:

vboxsync

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

60537

Message:

SrvIntNet,VBoxNetFlt: Changing from getting to reporting (VBoxNetFlt reports stuff to SrvIntNet).

File:

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

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

@@ -1127 +1127 @@
 
 /**
- * Lookup an address on the network, returning the (first) interface
- * having it in its address cache.
+ * Lookup an address on the network, returning the (first) interface having it
+ * in its address cache.
  *
  * @returns Pointer to the interface on success, NULL if not found.  The caller
@@ -4222 +4222 @@
     AssertMsgFailed(("Not implemented because it wasn't required on Darwin\n"));
     return ASMAtomicXchgBool(&pThis->fPhysSG, fEnable);
+}
+
+
+/** @copydoc INTNETTRUNKSWPORT::pfnReportMacAddress */
+static DECLCALLBACK(void) intnetR0TrunkIfPortReportMacAddress(PINTNETTRUNKSWPORT pSwitchPort, PCRTMAC pMacAddr)
+{
+    PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
+
+    /*
+     * Get the network instance and grab the address spinlock before making
+     * any changes.
+     */
+    intnetR0BusyIncTrunk(pThis);
+    PINTNETNETWORK pNetwork = pThis->pNetwork;
+    if (pNetwork)
+    {
+        RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+        RTSpinlockAcquireNoInts(pNetwork->hAddrSpinlock, &Tmp);
+
+        pNetwork->MacTab.HostMac = *pMacAddr;
+        pThis->MacAddr           = *pMacAddr;
+
+        RTSpinlockReleaseNoInts(pNetwork->hAddrSpinlock, &Tmp);
+    }
+    else
+        pThis->MacAddr = *pMacAddr;
+    intnetR0BusyDecTrunk(pThis);
+}
+
+
+/** @copydoc INTNETTRUNKSWPORT::pfnReportPromiscuousMode */
+static DECLCALLBACK(void) intnetR0TrunkIfPortReportPromiscuousMode(PINTNETTRUNKSWPORT pSwitchPort, bool fPromiscuous)
+{
+    PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
+
+    /*
+     * Get the network instance and grab the address spinlock before making
+     * any changes.
+     */
+    intnetR0BusyIncTrunk(pThis);
+    PINTNETNETWORK pNetwork = pThis->pNetwork;
+    if (pNetwork)
+    {
+        RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+        RTSpinlockAcquireNoInts(pNetwork->hAddrSpinlock, &Tmp);
+
+        pNetwork->MacTab.fHostPromiscuous = fPromiscuous;
+
+        RTSpinlockReleaseNoInts(pNetwork->hAddrSpinlock, &Tmp);
+    }
+    intnetR0BusyDecTrunk(pThis);
 }
 
@@ -4666 +4717 @@
         pTrunk->SwitchPort.pfnSGRelease               = intnetR0TrunkIfPortSGRelease;
         pTrunk->SwitchPort.pfnSetSGPhys               = intnetR0TrunkIfPortSetSGPhys;
+        pTrunk->SwitchPort.pfnReportMacAddress        = intnetR0TrunkIfPortReportMacAddress;
+        pTrunk->SwitchPort.pfnReportPromiscuousMode   = intnetR0TrunkIfPortReportPromiscuousMode;
         pTrunk->SwitchPort.pfnReportGsoCapabilities   = intnetR0TrunkIfPortReportGsoCapabilities;
         pTrunk->SwitchPort.u32VersionEnd              = INTNETTRUNKSWPORT_VERSION;
@@ -4697 +4750 @@
         if (RT_SUCCESS(rc))
         {
+            /*
+             * There are a couple of bits in MacTab as well pertaining to the
+             * trunk.  We have to set this before it's reported.
+             *
+             * Note! We don't need to lock the MacTab here - creation time.
+             */
+            pNetwork->MacTab.pTrunk           = pTrunk;
+            pNetwork->MacTab.HostMac          = pTrunk->MacAddr;
+            pNetwork->MacTab.fHostPromiscuous = false;
+            pNetwork->MacTab.fHostActive      = true;
+            pNetwork->MacTab.fWirePromiscuous = false; /** @todo !!(fFlags & INTNET_OPEN_FLAGS_PROMISC_TRUNK_WIRE); */
+            pNetwork->MacTab.fWireActive      = true;
+
 #ifdef IN_RING0 /* (testcase is ring-3) */
             /*
@@ -4705 +4771 @@
             if (RT_SUCCESS(rc))
             {
-                rc = pTrunkFactory->pfnCreateAndConnect(pTrunkFactory, pNetwork->szTrunk, &pTrunk->SwitchPort,
+                rc = pTrunkFactory->pfnCreateAndConnect(pTrunkFactory,
+                                                        pNetwork->szTrunk,
+                                                        &pTrunk->SwitchPort,
                                                         pNetwork->fFlags & INTNET_OPEN_FLAGS_SHARED_MAC_ON_WIRE
-                                                        ? INTNETTRUNKFACTORY_FLAG_NO_PROMISC : 0,
+                                                        ? INTNETTRUNKFACTORY_FLAG_NO_PROMISC
+                                                        : 0,
                                                         &pTrunk->pIfPort);
                 pTrunkFactory->pfnRelease(pTrunkFactory);
@@ -4713 +4782 @@
                 {
                     Assert(pTrunk->pIfPort);
-                    pNetwork->MacTab.pTrunk = pTrunk;
-
-                    /*
-                     * Query the host info.
-                     *
-                     * Note! We don't need to lock the MacTab here since the
-                     *       network is being created.
-                     */
-                    /** @todo this should be reported by VBoxNet* instead of queried by us! */
-                    intnetR0TrunkIfOutLock(pTrunk);
-
-                    pTrunk->pIfPort->pfnGetMacAddress(pTrunk->pIfPort, &pTrunk->MacAddr);
-                    pNetwork->MacTab.HostMac          = pTrunk->MacAddr;
-
-                    pNetwork->MacTab.fHostPromiscuous = pTrunk->pIfPort->pfnIsPromiscuous(pTrunk->pIfPort);
-                    pNetwork->MacTab.fHostActive      = true;
-
-                    pNetwork->MacTab.fWirePromiscuous = false; /** @todo !!(fFlags & INTNET_OPEN_FLAGS_PROMISC_TRUNK_WIRE); */
-                    pNetwork->MacTab.fWireActive      = true;
-
-                    intnetR0TrunkIfOutUnlock(pTrunk);
 
                     Log(("intnetR0NetworkCreateTrunkIf: VINF_SUCCESS - pszName=%s szTrunk=%s%s Network=%s\n",
@@ -4743 +4791 @@
             rc = VERR_NOT_SUPPORTED;
 #endif /* IN_RING3 */
+
+            pNetwork->MacTab.pTrunk      = NULL;
+            pNetwork->MacTab.fHostActive = false;
+            pNetwork->MacTab.fWireActive = false;
         }