Changeset 22384 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 21, 2009 12:50:14 PM (15 years ago)

Author:

vboxsync

Message:

Main: repair RT_OS_LINUX=1 VBOX_WITH_NETFLT=

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (6 diffs)
• ConsoleImpl2.cpp (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6041 +6041 @@
  *  @note The caller must lock this object for writing.
  */
-HRESULT Console::attachToBridgedInterface(INetworkAdapter *networkAdapter)
-{
-#if !defined(RT_OS_LINUX) || defined(VBOX_WITH_NETFLT)
-    /*
-     * Nothing to do here.
-     *
-     * Note, the reason for this method in the first place a memory / fork
-     * bug on linux. All this code belongs in DrvTAP and similar places.
-     */
-    NOREF(networkAdapter);
-    return S_OK;
-
-#else /* RT_OS_LINUX && !VBOX_WITH_NETFLT */
-
+#if defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)
+HRESULT Console::attachToTapInterface(INetworkAdapter *networkAdapter)
+{
     LogFlowThisFunc(("\n"));
     /* sanity check */
@@ -6119 +6108 @@
             if (fcntl(maTapFD[slot], F_SETFL, O_NONBLOCK) != -1)
             {
-                Log(("attachToBridgedInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw()));
+                Log(("attachToTapInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw()));
                 /*
                  * Here is the right place to communicate the TAP file descriptor and
@@ -6161 +6150 @@
     LogFlowThisFunc(("rc=%d\n", rc));
     return rc;
-#endif /* RT_OS_LINUX */
-}
+}
+
 
 /**
@@ -6172 +6161 @@
  *  @note The caller must lock this object for writing.
  */
-HRESULT Console::detachFromBridgedInterface(INetworkAdapter *networkAdapter)
-{
-#if !defined(RT_OS_LINUX) || defined(VBOX_WITH_NETFLT)
-    /*
-     * Nothing to do here.
-     */
-    NOREF(networkAdapter);
-    return S_OK;
-
-#else /* RT_OS_LINUX */
-
+HRESULT Console::detachFromTapInterface(INetworkAdapter *networkAdapter)
+{
     /* sanity check */
     LogFlowThisFunc(("\n"));
@@ -6231 +6211 @@
     LogFlowThisFunc(("returning %d\n", rc));
     return rc;
-#endif /* RT_OS_LINUX */
-}
+}
+#endif /* RT_OS_LINUX && !VBOX_WITH_NETFLT */
 
 
@@ -6266 +6246 @@
         if (attachment == NetworkAttachmentType_Bridged)
         {
-            HRESULT rc2 = detachFromBridgedInterface(networkAdapter);
+#if defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)
+            HRESULT rc2 = detachFromTapInterface(networkAdapter);
             if (FAILED(rc2) && SUCCEEDED(rc))
                 rc = rc2;
+#endif
         }
     }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2208 +2208 @@
         case NetworkAttachmentType_Bridged:
         {
-#if !defined(VBOX_WITH_NETFLT) && defined(RT_OS_LINUX)
+#if defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)
+            hrc = pThis->attachToTapInterface(aNetworkAdapter);
+            if (FAILED(hrc))
+            {
+                switch (hrc)
+                {
+                    case VERR_ACCESS_DENIED:
+                        return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
+                                         "Failed to open '/dev/net/tun' for read/write access. Please check the "
+                                         "permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "
+                                         "change the group of that node and make yourself a member of that group. Make "
+                                         "sure that these changes are permanent, especially if you are "
+                                         "using udev"));
+                    default:
+                        AssertMsgFailed(("Could not attach to host interface! Bad!\n"));
+                        return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
+                                         "Failed to initialize Host Interface Networking"));
+                }
+            }
+
             Assert ((int)pThis->maTapFD[uInstance] >= 0);
             if ((int)pThis->maTapFD[uInstance] >= 0)
@@ -2224 +2243 @@
                 rc = CFGMR3InsertInteger(pCfg, "FileHandle", pThis->maTapFD[uInstance]);    RC_CHECK();
             }
+
 #elif defined(VBOX_WITH_NETFLT)
             /*

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -407 +407 @@
     HRESULT callTapSetupApplication(bool isStatic, RTFILE tapFD, Bstr &tapDevice,
                                     Bstr &tapSetupApplication);
-    HRESULT attachToBridgedInterface(INetworkAdapter *networkAdapter);
-    HRESULT detachFromBridgedInterface(INetworkAdapter *networkAdapter);
+#if defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)
+    HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
+    HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
+#endif
     HRESULT powerDownHostInterfaces();