Changeset 5182 in vbox

Timestamp:

Oct 8, 2007 1:08:59 PM (17 years ago)

Author:

vboxsync

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

25103

Message:

Solaris

File:

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

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

@@ -95 +95 @@
     /** The actual TAP device name. */
     char                   *pszDeviceNameActual;
+    /** IP device file handle (/dev/udp). */
+    RTFILE                  IPFileDevice;
 #endif 
     /** TAP setup application. */
@@ -560 +562 @@
     
     
-    /* Close previously opened file desc., if any. */
-    static int s_IPFileDes = -1;
-    if (s_IPFileDes >= 0)
-        close(s_IPFileDes);
-    
-    s_IPFileDes = open("/dev/udp", O_RDWR, 0);
-    if (s_IPFileDes < 0)
+    int IPFileDes = open("/dev/udp", O_RDWR, 0);
+    if (IPFileDes < 0)
         return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_HIF_OPEN_FAILED, RT_SRC_POS,
                                    N_("Failed to open /dev/udp. errno=%d"), errno);
@@ -637 +634 @@
 
     /* IP */
-    if (ioctl(s_IPFileDes, I_POP, NULL) == -1)
+    if (ioctl(IPFileDes, I_POP, NULL) == -1)
         LogRel(("TAP#%d: Failed I_POP from IP FD. errno=%d\n", pDrvIns->iInstance, errno));
 
-    if (ioctl(s_IPFileDes, I_PUSH, "arp") == -1)
+    if (ioctl(IPFileDes, I_PUSH, "arp") == -1)
         LogRel(("TAP#%d: Failed to push ARP to IP FD. errno=%d\n", pDrvIns->iInstance, errno));
     
@@ -663 +660 @@
      * Even 'unplumb' won't work after that.
      */
-    int IPMuxID = ioctl(s_IPFileDes, I_LINK, InterfaceFD);
+    int IPMuxID = ioctl(IPFileDes, I_LINK, InterfaceFD);
     if (IPMuxID == -1)
     {
@@ -676 +673 @@
     
 #ifdef VBOX_SOLARIS_TAP_ARP
-    int ARPMuxID = ioctl(s_IPFileDes, I_LINK, ARPFileDes);
+    int ARPMuxID = ioctl(IPFileDes, I_LINK, ARPFileDes);
     if (ARPMuxID == -1)
         LogRel(("TAP#%d: Failed to link TAP device to ARP\n", pDrvIns->iInstance));
@@ -692 +689 @@
 #endif
 
-    if (ioctl(s_IPFileDes, SIOCSLIFMUXID, &ifReq) == -1)
+    if (ioctl(IPFileDes, SIOCSLIFMUXID, &ifReq) == -1)
     {
 #ifdef VBOX_SOLARIS_TAP_ARP
-        ioctl(s_IPFileDes, I_PUNLINK, ARPMuxID);
-#endif
-        ioctl(s_IPFileDes, I_PUNLINK, IPMuxID);
-        close(s_IPFileDes);
-        s_IPFileDes = -1;
+        ioctl(IPFileDes, I_PUNLINK, ARPMuxID);
+#endif
+        ioctl(IPFileDes, I_PUNLINK, IPMuxID);
+        close(IPFileDes);
         LogRel(("TAP#%d: Failed to set Mux ID.\n", pDrvIns->iInstance));
         return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_IOCTL, RT_SRC_POS,
@@ -705 +701 @@
     }
 
-    /* what's the point? */
     pData->FileDevice = (RTFILE)TapFileDes;
+    pData->IPFileDevice = (RTFILE)IPFileDes;
     pData->pszDeviceNameActual = RTStrDup(pszDevName);
     
@@ -792 +788 @@
         drvTAPTerminateApplication(pData);
 
+    if (pData->IPFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pData->IPFileDevice);
+        AssertRC(rc);
+        pData->IPFileDevice = NIL_RTFILE;
+    }
+
     RTStrFree(pData->pszDeviceNameActual);
 #endif
@@ -822 +825 @@
 #ifdef RT_OS_SOLARIS
     pData->pszDeviceNameActual          = NULL;
+    pData->IPFileDevice                 = NIL_RTFILE;
 #endif 
     pData->pszSetupApplication          = NULL;