Changeset 5134 in vbox

Timestamp:

Oct 2, 2007 7:30:46 AM (18 years ago)

Author:

vboxsync

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

24998

Message:

Solaris.

File:

• trunk/src/VBox/Devices/Network/DrvTAP.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Network/DrvTAP.cpp

@@ -469 +469 @@
     {
         /* Bad. fork() failed! */
-        LogRel(("TAP#%d: Failed to fork() process for running TAP setup application: %s\n", pDrvIns->iInstance,
+        LogRel(("TAP#%d: Failed to fork() process for running TAP setup application: %s\n", pData->pDrvIns->iInstance,
               pData->pszSetupApplication, strerror(errno)));
         return VERR_HOSTIF_INIT_FAILED;
@@ -486 +486 @@
     if (!WIFEXITED(result) || WEXITSTATUS(result) != 0)
     {
-        LogRel(("TAP#%d: Failed to run TAP setup application: %s\n", pDrvIns->iInstance, pData->pszSetupApplication));
+        LogRel(("TAP#%d: Failed to run TAP setup application: %s\n", pData->pDrvIns->iInstance, pData->pszSetupApplication));
         return VERR_HOSTIF_INIT_FAILED;
     }
@@ -514 +514 @@
     {
         /* Bad. fork() failed! */
-        LogRel(("TAP#%d: Failed to fork() process for running TAP terminate application: %s\n", pDrvIns->iInstance,
+        LogRel(("TAP#%d: Failed to fork() process for running TAP terminate application: %s\n", pData->pDrvIns->iInstance,
               pData->pszTerminateApplication, strerror(errno)));
         return VERR_HOSTIF_TERM_FAILED;
@@ -531 +531 @@
     if (!WIFEXITED(result) || WEXITSTATUS(result) != 0)
     {
-        LogRel(("TAP#%d: Failed to run TAP terminate application: %s\n", pDrvIns->iInstance, pData->pszSetupApplication));
+        LogRel(("TAP#%d: Failed to run TAP terminate application: %s\n", pData->pDrvIns->iInstance, pData->pszSetupApplication));
         return VERR_HOSTIF_TERM_FAILED;
     }
@@ -561 +561 @@
     
     /* Close previously opened file desc., if any. */
-    static int s_IPFileDes = -1; /** @todo r=bird: what's the point of keeping this open? */
+    static int s_IPFileDes = -1;
     if (s_IPFileDes >= 0)
         close(s_IPFileDes);
@@ -590 +590 @@
     ioIF.ic_timout = 0;
     iPPA = ioctl(TapFileDes, I_STR, &ioIF);
-    if (iPPA < 0) /** @todo r=bird: leaving at least one file descriptor open. */
+    if (iPPA < 0)
+    {
+        close(TapFileDes);
         return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_IOCTL, RT_SRC_POS,
                                    N_("Failed to get new interface. errno=%d"), errno);
+    }
     
     int InterfaceFD = open("/dev/tap", O_RDWR, 0);
@@ -692 +695 @@
     {
 #ifdef VBOX_SOLARIS_TAP_ARP
-        ioctl(IPFileDes, I_PUNLINK, ARPMuxID);
-#endif
-        ioctl(IPFileDes, I_PUNLINK, IPMuxID);
+        ioctl(s_IPFileDes, I_PUNLINK, ARPMuxID);
+#endif
+        ioctl(s_IPFileDes, I_PUNLINK, IPMuxID);
         close(s_IPFileDes);
         s_IPFileDes = -1;
@@ -896 +899 @@
     {
         rc = drvTAPSetupApplication(pData);
-        if (RT_SUCCESS(rc))
-            return rc;
+        if (VBOX_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
+                                       N_("Error running TAP setup application. rc=%d"), rc);
     }