Changeset 29464 in vbox

Timestamp:

May 14, 2010 11:46:15 AM (15 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/win: Report stuff both when attaching to the NIC and when connecting to the internal networking. Set the trunk state to INACTIVE when connecting to the internal work or we won't report anything.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFlt.c (modified) (5 diffs)
• win/VBoxNetFlt-win.c (modified) (3 diffs)

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

@@ -870 +870 @@
 #ifdef VBOXNETFLT_STATIC_CONFIG
     Assert(vboxNetFltGetState(pThis) == kVBoxNetFltInsState_Unconnected);
-    /* INTNETTRUNKIFSTATE_DISCONNECTING means "not connected" here
-     * we use the INTNETTRUNKIFSTATE_DISCONNECTING state for consistency of cases when trunk
-     * was never connected and was connected and disconnected.
-     * In the latter case we end up with INTNETTRUNKIFSTATE_DICONNECTING,
-     * so use the same state for the former */
-    Assert(pThis->enmTrunkState == INTNETTRUNKIFSTATE_DISCONNECTING);
 #else
     Assert(vboxNetFltGetState(pThis) == kVBoxNetFltInsState_Initializing);
+#endif
     Assert(pThis->enmTrunkState == INTNETTRUNKIFSTATE_INACTIVE);
-#endif
 
     /*
@@ -895 +889 @@
         pThis->pSwitchPort = NULL;
 
-#ifdef VBOXNETFLT_STATIC_CONFIG
-    /* INTNETTRUNKIFSTATE_DISCONNECTING means "not connected" here
-     * we use the INTNETTRUNKIFSTATE_DISCONNECTING state for consistency of cases when trunk
-     * was never connected and was connected and disconnected.
-     * In the latter case we end up with INTNETTRUNKIFSTATE_DISCONNECTING,
-     * so use the same state for the former */
-    Assert(pThis->enmTrunkState == INTNETTRUNKIFSTATE_DISCONNECTING);
-#else
     Assert(pThis->enmTrunkState == INTNETTRUNKIFSTATE_INACTIVE);
-#endif
     return rc;
 }
@@ -930 +915 @@
     /*
      * Allocate and initialize a new instance before requesting the mutex.
+     * Note! That in a static config we'll initialize the trunk state to
+     *       disconnecting and flip it in vboxNetFltFactoryCreateAndConnect
+     *       later on.  This better reflext the state and it works better with
+     *       assertions in the destruction path.
      */
     int             rc;
@@ -950 +939 @@
     pNew->enmState                      = kVBoxNetFltInsState_Initializing;
 #ifdef VBOXNETFLT_STATIC_CONFIG
-    /* for consistency of cases when trunk was never connected and was connected and disconnected.
-     * In the latter case we end up with INTNETTRUNKIFSTATE_DISCONNECTING,
-     * so use the same state for the former */
     pNew->enmTrunkState                 = INTNETTRUNKIFSTATE_DISCONNECTING;
 #else
@@ -1205 +1191 @@
             if (vboxNetFltGetState(pCur) == kVBoxNetFltInsState_Unconnected)
             {
+                pCur->enmTrunkState = INTNETTRUNKIFSTATE_INACTIVE; /** @todo protect me? */
                 pCur->fDisablePromiscuous = !!(fFlags & INTNETTRUNKFACTORY_FLAG_NO_PROMISC);
                 rc = vboxNetFltConnectIt(pCur, pSwitchPort, ppIfPort);
                 if (RT_SUCCESS(rc))
                     pCur = NULL; /* Don't release it, reference given to the caller. */
+                else
+                    pCur->enmTrunkState = INTNETTRUNKIFSTATE_DISCONNECTING;
             }
             else

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

@@ -3217 +3217 @@
 }
 
+
+/**
+ * Report the MAC address, promiscuous mode setting, GSO capabilities and
+ * no-preempt destinations to the internal network.
+ *
+ * Does nothing if we're not currently connected to an internal network.
+ *
+ * @param   pThis           The instance data.
+ */
+static void vboxNetFltWinReportStuff(PVBOXNETFLTINS pThis)
+{
+    /** @todo Keep these up to date, esp. the promiscuous mode bit. */
+    if (   pThis->pSwitchPort
+        && vboxNetFltTryRetainBusyNotDisconnected(pThis))
+    {
+        pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+        pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort,
+                                                     vboxNetFltWinIsPromiscuous2(pThis));
+        pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,
+                                                     INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+        /** @todo We should be able to do pfnXmit at DISPATCH_LEVEL... */
+        pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+        vboxNetFltRelease(pThis, true /*fBusy*/);
+    }
+}
+
 /**
  * Worker for vboxNetFltWinAttachToInterface.
@@ -3306 +3332 @@
 
                             /* 5. Report MAC address, promiscuousness and GSO capabilities. */
-                            /** @todo Keep these up to date, esp. the promiscuous mode bit. */
-                            if (   pThis->pSwitchPort
-                                && vboxNetFltTryRetainBusyNotDisconnected(pThis))
-                            {
-                                pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-                                pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort,
-                                                                             vboxNetFltWinIsPromiscuous2(pThis));
-                                pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0,
-                                                                             INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-                                /** @todo We should be able to do pfnXmit at DISPATCH_LEVEL... */
-                                pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
-                                vboxNetFltRelease(pThis, true /*fBusy*/);
-                            }
+                            vboxNetFltWinReportStuff(pThis);
+
                             return;
                         }
@@ -3718 +3733 @@
     vboxNetFltWinJobSynchExecAtPassive(vboxNetFltWinConnectItWorker, &Info);
 
+    if (RT_SUCCESS(Info.Status))
+        vboxNetFltWinReportStuff(pThis);
+
     return Info.Status;
 }