Changeset 16193 in vbox

Timestamp:

Jan 23, 2009 9:38:11 AM (16 years ago)

Author:

vboxsync

Message:

#3419: Added fNoPromisc parameter to vboxNetFltNewInstance for dynamic configuration.

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/VBoxNetFlt.c (modified) (5 diffs)
• Runtime/VBox/log-vbox.cpp (modified) (1 diff)

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

@@ -847 +847 @@
  * @param   pSwitchPort         The port on the switch that we're connected with (dynamic only).
  * @param   ppIfPort            Where to store the pointer to our port interface (dynamic only).
- */
-static int vboxNetFltNewInstance(PVBOXNETFLTGLOBALS pGlobals, const char *pszName, PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT *ppIfPort
+ * @param   fNoPromisc          Do not attempt going into promiscuous mode.
+ */
+static int vboxNetFltNewInstance(PVBOXNETFLTGLOBALS pGlobals, const char *pszName, PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT *ppIfPort, bool fNoPromisc
 #ifdef VBOXNETFLT_STATIC_CONFIG
         , void * pContext
@@ -881 +882 @@
     pNew->fDisconnectedFromHost         = false;
     pNew->fRediscoveryPending           = false;
+    pNew->fDisablePromiscuous           = fNoPromisc;
     pNew->NanoTSLastRediscovery         = INT64_MAX;
     pNew->cRefs                         = 1;
@@ -1004 +1006 @@
     RTSemFastMutexRelease(pGlobals->hFastMtx);
 
-    rc = vboxNetFltNewInstance(pGlobals, pszName, NULL, &pIfPort, pContext);
+    rc = vboxNetFltNewInstance(pGlobals, pszName, NULL, &pIfPort, false, pContext);
     if(RT_SUCCESS(rc))
         *ppInstance =  IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -1046 +1048 @@
                 /* Prevent setting promiscuous mode for WiFi adapters. */
                 pCur->fDisablePromiscuous = fNoPromisc;
+                LogAleksey(("fNoPromisc=%d\n", pCur->fDisablePromiscuous));
                 vboxNetFltRetain(pCur, false /* fBusy */); /** @todo who releases this on failure? */
                 rc = vboxNetFltConnectIt(pCur, pSwitchPort, ppIfPort);
@@ -1078 +1081 @@
      * Dynamically create a new instance.
      */
-    rc = vboxNetFltNewInstance(pGlobals, pszName, pSwitchPort, ppIfPort);
+    rc = vboxNetFltNewInstance(pGlobals, pszName, pSwitchPort, ppIfPort, fNoPromisc);
 #endif
     LogFlow(("vboxNetFltFactoryCreateAndConnect: returns %Rrc\n", rc));

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -418 +418 @@
 # endif
 # if defined(DEBUG_aleksey)  /* Guest ring-0 as well */
-        RTLogGroupSettings(pLogger, "+net_flt_drv.e.l");
+        RTLogGroupSettings(pLogger, "+net_flt_drv.e.l.f+srv_intnet.e.l.f");
         RTLogFlags(pLogger, "enabled unbuffered");
         pLogger->fDestFlags |= RTLOGDEST_DEBUGGER;