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

Timestamp:

Jul 26, 2008 2:43:29 AM (17 years ago)

Author:

vboxsync

Message:

main: Console::attachToHostInterface and Console::detachFromHostInterface only have meaning on Linux these days.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5328 +5328 @@
 HRESULT Console::attachToHostInterface(INetworkAdapter *networkAdapter)
 {
+#if !defined(RT_OS_LINUX)
+    /*
+     * 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 */
     LogFlowThisFunc(("\n"));
     /* sanity check */
     AssertReturn (isWriteLockOnCurrentThread(), E_FAIL);
 
-#ifdef DEBUG
+# ifdef VBOX_STRICT
     /* paranoia */
     NetworkAttachmentType_T attachment;
     networkAdapter->COMGETTER(AttachmentType)(&attachment);
     Assert(attachment == NetworkAttachmentType_HostInterface);
-#endif /* DEBUG */
+# endif /* VBOX_STRICT */
 
     HRESULT rc = S_OK;
 
-#ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
     ULONG slot = 0;
     rc = networkAdapter->COMGETTER(Slot)(&slot);
@@ -5367 +5377 @@
     }
     else
-#endif /* VBOX_WITH_UNIXY_TAP_NETWORKING */
     {
         /*
          * Allocate a host interface device
          */
-#ifdef RT_OS_WINDOWS
-        /* nothing to do */
-        int rcVBox = VINF_SUCCESS;
-#elif defined(RT_OS_LINUX)
         int rcVBox = RTFileOpen(&maTapFD[slot], "/dev/net/tun",
                                 RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_INHERIT);
@@ -5488 +5493 @@
             }
         }
-#elif defined(RT_OS_DARWIN)
-        /** @todo Implement tap networking for Darwin. */
-        int rcVBox = VERR_NOT_IMPLEMENTED;
-#elif defined(RT_OS_FREEBSD)
-        /** @todo Implement tap networking for FreeBSD. */
-        int rcVBox = VERR_NOT_IMPLEMENTED;
-#elif defined(RT_OS_OS2)
-        /** @todo Implement tap networking for OS/2. */
-        int rcVBox = VERR_NOT_IMPLEMENTED;
-#elif defined(RT_OS_SOLARIS)
-        /* nothing to do */
-        int rcVBox = VINF_SUCCESS;
-#elif defined(VBOX_WITH_UNIXY_TAP_NETWORKING)
-# error "PORTME: Implement OS specific TAP interface open/creation."
-#else
-# error "Unknown host OS"
-#endif
         /* in case of failure, cleanup. */
         if (VBOX_FAILURE(rcVBox) && SUCCEEDED(rc))
@@ -5514 +5502 @@
     LogFlowThisFunc(("rc=%d\n", rc));
     return rc;
+#endif /* RT_OS_LINUX */
 }
 
@@ -5526 +5515 @@
 HRESULT Console::detachFromHostInterface(INetworkAdapter *networkAdapter)
 {
+#if !defined(RT_OS_LINUX) && !defined(RT_OS_SOLARIS)
+    /*
+     * Nothing to do here.
+     */
+    NOREF(networkAdapter);
+    return S_OK;
+
+#else /* RT_LINUX || RT_OS_SOLARIS */
+
     /* sanity check */
     LogFlowThisFunc(("\n"));
@@ -5531 +5529 @@
 
     HRESULT rc = S_OK;
-#ifdef DEBUG
+# ifdef VBOX_STRICT
     /* paranoia */
     NetworkAttachmentType_T attachment;
     networkAdapter->COMGETTER(AttachmentType)(&attachment);
     Assert(attachment == NetworkAttachmentType_HostInterface);
-#endif /* DEBUG */
-
-#ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
+# endif /* VBOX_STRICT */
+
+/** @todo # ifdef VBOX_WITH_UNIXY_TAP_NETWORKING: why wasn't this !defined(RT_OS_SOLARIS)? */
 
     ULONG slot = 0;
@@ -5576 +5574 @@
             RTStrPrintf(szCommand, sizeof(szCommand), "%s %d %s", tapTermAppUtf8.raw(),
                         isStatic ? maTapFD[slot] : 0, maTAPDeviceName[slot].raw());
+            /** @todo check for overflow or use RTStrAPrintf! */
 
             /*
@@ -5610 +5609 @@
         maTAPDeviceName[slot] = "";
     }
-#endif
     LogFlowThisFunc(("returning %d\n", rc));
     return rc;
+#endif /* RT_OS_LINUX || RT_OS_SOLARIS */
 }