Changeset 14538 in vbox for trunk/src/VBox/Devices/Storage/DrvVD.cpp

Timestamp:

Nov 24, 2008 6:36:44 PM (16 years ago)

Author:

vboxsync

Message:

DrvVD: fix internal networking IP stuff, not available in OSE.

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -35 +35 @@
 #include <iprt/tcp.h>
 
+#ifndef VBOX_OSE
 /* All lwip header files are not C++ safe. So hack around this. */
 __BEGIN_DECLS
@@ -41 +42 @@
 #include <lwip/sockets.h>
 __END_DECLS
+#endif /* !VBOX_OSE */
 
 #include "Builtins.h"
 
+#ifndef VBOX_OSE
 /* Small hack to get at lwIP initialized status */
 extern bool DevINIPConfigured(void);
+#endif /* !VBOX_OSE */
 
 
@@ -329 +333 @@
 
 
+#ifndef VBOX_OSE
 /*******************************************************************************
 *   VD TCP network stack interface implementation - INIP case                  *
@@ -483 +488 @@
     return VINF_SUCCESS;
 }
+#endif /* !VBOX_OSE */
 
 
@@ -919 +925 @@
         else
         {
+#ifdef VBOX_OSE
+            rc = PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+                                     RT_SRC_POS, N_("DrvVD: Configuration error: TCP over Internal Networking not supported in VirtualBox OSE"));
+#else /* !VBOX_OSE */
             pThis->VDITcpNetCallbacks.cbSize = sizeof(VDINTERFACETCPNET);
             pThis->VDITcpNetCallbacks.enmInterface = VDINTERFACETYPE_TCPNET;
@@ -927 +937 @@
             pThis->VDITcpNetCallbacks.pfnWrite = drvvdINIPWrite;
             pThis->VDITcpNetCallbacks.pfnFlush = drvvdINIPFlush;
-        }
-        rc = VDInterfaceAdd(&pThis->VDITcpNet, "DrvVD_INIP",
-                            VDINTERFACETYPE_TCPNET,
-                            &pThis->VDITcpNetCallbacks, NULL,
-                            &pThis->pVDIfsDisk);
-        AssertRC(rc);
-
-        rc = VDCreate(pThis->pVDIfsDisk, &pThis->pDisk);
-        /* Error message is already set correctly. */
+#endif /* !VBOX_OSE */
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = VDInterfaceAdd(&pThis->VDITcpNet, "DrvVD_INIP",
+                                VDINTERFACETYPE_TCPNET,
+                                &pThis->VDITcpNetCallbacks, NULL,
+                                &pThis->pVDIfsDisk);
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = VDCreate(pThis->pVDIfsDisk, &pThis->pDisk);
+            /* Error message is already set correctly. */
+        }
     }