Changeset 15950 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jan 14, 2009 6:25:22 PM (16 years ago)

Author:

vboxsync

Message:

VBoxNetFlt.c: Use AssertFailed not Assert(0), return VERR_INTNET_FLT_IF_BUSY from vboxNetFltFactoryCreateAndConnect if the instance exists (regression from VBOXNETFLT_STATIC_CONFIG changes).

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c (modified) (1 diff)

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

@@ -1039 +1039 @@
     {
 #ifdef VBOXNETFLT_STATIC_CONFIG
-        switch(vboxNetFltGetState(pCur))
+        switch (vboxNetFltGetState(pCur))
         {
-        case kVBoxNetFltInsState_Unconnected:
-            /* instance can be destroyed when it is neither used by the IntNet nor by the ndis filter driver mechanism
-             * (i.e. the driver is not bound to the specified adapter)*/
-            vboxNetFltRetain(pCur, false /* fBusy */);
-            rc = vboxNetFltConnectIt(pCur, pSwitchPort, ppIfPort);
-            break;
-        case kVBoxNetFltInsState_Connected:
-            Assert(0);
-            rc = VERR_INTNET_FLT_IF_BUSY;
-            break;
-        case kVBoxNetFltInsState_Disconnecting:
-            Assert(0);
-            rc = VERR_INTNET_FLT_IF_BUSY;
-            break;
-        default:
-            /** @todo: */
-            rc = VERR_INTNET_FLT_IF_BUSY;
+            case kVBoxNetFltInsState_Unconnected:
+                /* instance can be destroyed when it is neither used by the IntNet nor by the ndis filter driver mechanism
+                 * (i.e. the driver is not bound to the specified adapter)*/
+                vboxNetFltRetain(pCur, false /* fBusy */); /** @todo who releases this on failure? */
+                rc = vboxNetFltConnectIt(pCur, pSwitchPort, ppIfPort);
+                break;
+            case kVBoxNetFltInsState_Connected:
+                AssertFailed();
+                rc = VERR_INTNET_FLT_IF_BUSY;
+                break;
+            case kVBoxNetFltInsState_Disconnecting:
+                AssertFailed();
+                rc = VERR_INTNET_FLT_IF_BUSY;
+                break;
+            default:
+                /** @todo what? */
+                rc = VERR_INTNET_FLT_IF_BUSY;
+                break;
         }
+#else
+        rc = VERR_INTNET_FLT_IF_BUSY;
 #endif
         RTSemFastMutexRelease(pGlobals->hFastMtx);