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

Timestamp:

Jan 22, 2009 5:31:11 PM (16 years ago)

Author:

vboxsync

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

41933

Message:

#3419: Added fNoPromisc parameter to pfnCreateAndConnect to prevent going promisc on WiFi.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFlt.c (modified) (2 diffs)
• VBoxNetFltInternal.h (modified) (1 diff)
• linux/VBoxNetFlt-linux.c (modified) (4 diffs)

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

@@ -1019 +1019 @@
  */
 static DECLCALLBACK(int) vboxNetFltFactoryCreateAndConnect(PINTNETTRUNKFACTORY pIfFactory, const char *pszName,
-                                                           PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT *ppIfPort)
+                                                           PINTNETTRUNKSWPORT pSwitchPort, PINTNETTRUNKIFPORT *ppIfPort, bool fNoPromisc)
 {
     PVBOXNETFLTGLOBALS pGlobals = (PVBOXNETFLTGLOBALS)((uint8_t *)pIfFactory - RT_OFFSETOF(VBOXNETFLTGLOBALS, TrunkFactory));
@@ -1044 +1044 @@
                 /* 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)*/
+                /* Prevent setting promiscuous mode for WiFi adapters. */
+                pCur->fDisablePromiscuous = fNoPromisc;
                 vboxNetFltRetain(pCur, false /* fBusy */); /** @todo who releases this on failure? */
                 rc = vboxNetFltConnectIt(pCur, pSwitchPort, ppIfPort);

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -119 +119 @@
      * takes care of serializing rediscovery and disconnecting. */
     bool volatile fRediscoveryPending;
+    /** Whether we should not attempt to set promiscuous mode at all. */
+    bool fDisablePromiscuous;
 #if (ARCH_BITS == 32) && defined(__GNUC__)
     uint32_t u32Padding;    /**< Alignment padding, will assert in ASMAtomicUoWriteU64 otherwise. */

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

@@ -939 +939 @@
     struct net_device * pDev;
 
-    LogFlow(("vboxNetFltPortOsSetActive: pThis=%p (%s), fActive=%s\n",
-             pThis, pThis->szName, fActive?"true":"false"));
+    LogFlow(("vboxNetFltPortOsSetActive: pThis=%p (%s), fActive=%s, fDisablePromiscuous=%s\n",
+             pThis, pThis->szName, fActive?"true":"false",
+             pThis->fDisablePromiscuous?"true":"false"));
+
+    if (pThis->fDisablePromiscuous)
+        return;
 
     pDev = vboxNetFltLinuxRetainNetDev(pThis);
@@ -951 +955 @@
          * host the interface promiscuity for vboxNetFltPortOsIsPromiscuous.
          */
+#ifdef LOG_ENABLED
         u_int16_t fIf;
-#ifdef LOG_ENABLED
         unsigned const cPromiscBefore = VBOX_GET_PCOUNT(pDev);
 #endif
@@ -959 +963 @@
             Assert(!pThis->u.s.fPromiscuousSet);
 
-#if 0
-            /*
-             * Try bring the interface up and running if it's down.
-             */
-            fIf = dev_get_flags(pDev);
-            if ((fIf & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING))
-            {
-                rtnl_lock();
-                int err = dev_change_flags(pDev, fIf | IFF_UP);
-                rtnl_unlock();
-                fIf = dev_get_flags(pDev);
-            }
-
-            /*
-             * Is it already up?  If it isn't, leave it to the link event or
-             * we'll upset if_pcount (as stated above, ifnet_set_promiscuous is weird).
-             */
-            if ((fIf & (IFF_UP | IFF_RUNNING)) == (IFF_UP | IFF_RUNNING)
-                && !ASMAtomicReadBool(&pThis->u.s.fPromiscuousSet))
-            {
-#endif
-                rtnl_lock();
-                dev_set_promiscuity(pDev, 1);
-                rtnl_unlock();
-                pThis->u.s.fPromiscuousSet = true;
-                Log(("vboxNetFltPortOsSetActive: enabled promiscuous mode on %s (%d)\n", pThis->szName, VBOX_GET_PCOUNT(pDev)));
-#if 0
-                /* check if it actually worked, this stuff is not always behaving well. */
-                if (!(dev_get_flags(pDev) & IFF_PROMISC))
-                {
-                    err = dev_change_flags(pDev, fIf | IFF_PROMISC);
-                    if (!err)
-                        Log(("vboxNetFlt: fixed IFF_PROMISC on %s (%d->%d)\n", pThis->szName, cPromiscBefore, VBOX_GET_PCOUNT(pDev)));
-                    else
-                        Log(("VBoxNetFlt: failed to fix IFF_PROMISC on %s, err=%d (%d->%d)\n",
-                             pThis->szName, err, cPromiscBefore, VBOX_GET_PCOUNT(pDev)));
-                }
-#endif
-#if 0
-            }
-            else if (!err)
-                Log(("VBoxNetFlt: Waiting for the link to come up... (%d->%d)\n", cPromiscBefore, VBOX_GET_PCOUNT(pDev)));
-            if (err)
-                LogRel(("VBoxNetFlt: Failed to put '%s' into promiscuous mode, err=%d (%d->%d)\n", pThis->szName, err, cPromiscBefore, VBOX_GET_PCOUNT(pDev)));
-#endif
+            rtnl_lock();
+            dev_set_promiscuity(pDev, 1);
+            rtnl_unlock();
+            pThis->u.s.fPromiscuousSet = true;
+            Log(("vboxNetFltPortOsSetActive: enabled promiscuous mode on %s (%d)\n", pThis->szName, VBOX_GET_PCOUNT(pDev)));
         }
         else
@@ -1016 +980 @@
             pThis->u.s.fPromiscuousSet = false;
 
+#ifdef LOG_ENABLED
             fIf = dev_get_flags(pDev);
             Log(("VBoxNetFlt: fIf=%#x; %d->%d\n", fIf, cPromiscBefore, VBOX_GET_PCOUNT(pDev)));
+#endif
         }