Changeset 5183 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 8, 2007 1:09:28 PM (17 years ago)

Author:

vboxsync

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

25104

Message:

hdr.

File:

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

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

@@ -1 @@
-/** $Id: */
+/** $Id$ */
 /** @file
  * Universial TAP network transport driver.
@@ -97 +97 @@
     /** IP device file handle (/dev/udp). */
     RTFILE                  IPFileDevice;
-#endif 
+#endif
     /** TAP setup application. */
     char                   *pszSetupApplication;
@@ -491 +491 @@
         return VERR_HOSTIF_INIT_FAILED;
     }
-    
+
     return VINF_SUCCESS;
 }
@@ -524 +524 @@
         /* Child process. */
         execv(pszArgs[0], pszArgs);
-        _exit(1); 
-    }
-        
+        _exit(1);
+    }
+
     /* Parent process. */
     int result;
@@ -536 +536 @@
         return VERR_HOSTIF_TERM_FAILED;
     }
-    
+
     return VINF_SUCCESS;
 }
@@ -560 +560 @@
     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     LogFlow(("SolarisTapAttach: pData=%p\n", pData));
-    
-    
+
+
     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);
-    
+
     int TapFileDes = open("/dev/tap", O_RDWR, 0);
     if (TapFileDes < 0)
         return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_HIF_OPEN_FAILED, RT_SRC_POS,
                                    N_("Failed to open /dev/tap for TAP. errno=%d"), errno);
-    
+
     /* Use the PPA from the ifname if possible (e.g "tap2", then use 2 as PPA) */
     int iPPA = -1;
@@ -580 +580 @@
             iPPA = pData->pszDeviceName[cch - 1] - '0';
     }
-    
+
     struct strioctl ioIF;
     ioIF.ic_cmd = TUNNEWPPA;
@@ -593 +593 @@
                                    N_("Failed to get new interface. errno=%d"), errno);
     }
-    
+
     int InterfaceFD = open("/dev/tap", O_RDWR, 0);
     if (!InterfaceFD)
         return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_HIF_OPEN_FAILED, RT_SRC_POS,
                                    N_("Failed to open interface /dev/tap. errno=%d"), errno);
-    
+
     if (ioctl(InterfaceFD, I_PUSH, "ip") == -1)
     {
@@ -605 +605 @@
                                    N_("Failed to push IP. errno=%d"), errno);
     }
-    
+
     struct lifreq ifReq;
     memset(&ifReq, 0, sizeof(ifReq));
@@ -612 +612 @@
 
     char szTmp[16];
-    char *pszDevName = pData->pszDeviceName;    
+    char *pszDevName = pData->pszDeviceName;
     if (!pData->pszDeviceName || !*pData->pszDeviceName)
     {
@@ -618 +618 @@
         pszDevName = szTmp;
     }
-    
+
     ifReq.lifr_ppa = iPPA;
     RTStrPrintf (ifReq.lifr_name, sizeof(ifReq.lifr_name), pszDevName);
-    
+
     if (ioctl(InterfaceFD, SIOCSLIFNAME, &ifReq) == -1)
         LogRel(("TAP#%d: Failed to set PPA. errno=%d\n", pDrvIns->iInstance, errno));
-    
+
     if (ioctl(InterfaceFD, SIOCGLIFFLAGS, &ifReq) == -1)
         LogRel(("TAP#%d: Failed to get interface flags after setting PPA. errno=%d\n", pDrvIns->iInstance, errno));
@@ -639 +639 @@
     if (ioctl(IPFileDes, I_PUSH, "arp") == -1)
         LogRel(("TAP#%d: Failed to push ARP to IP FD. errno=%d\n", pDrvIns->iInstance, errno));
-    
+
     /* ARP */
     int ARPFileDes = open("/dev/tap", O_RDWR, 0);
     if (ARPFileDes < 0)
         LogRel(("TAP#%d: Failed to open for /dev/tap for ARP. errno=%d", pDrvIns->iInstance, errno));
-    
+
     if (ioctl(ARPFileDes, I_PUSH, "arp") == -1)
         LogRel(("TAP#%d: Failed to push ARP to ARP FD. errno=%d\n", pDrvIns->iInstance, errno));
-    
+
     ioIF.ic_cmd = SIOCSLIFNAME;
     ioIF.ic_timout = 0;
@@ -671 +671 @@
                     N_("Failed to link TAP device to IP. Check TAP interface name. errno=%d"), errno);
     }
-    
+
 #ifdef VBOX_SOLARIS_TAP_ARP
     int ARPMuxID = ioctl(IPFileDes, I_LINK, ARPFileDes);
     if (ARPMuxID == -1)
         LogRel(("TAP#%d: Failed to link TAP device to ARP\n", pDrvIns->iInstance));
-    
+
     close(ARPFileDes);
 #endif
@@ -704 +704 @@
     pData->IPFileDevice = (RTFILE)IPFileDes;
     pData->pszDeviceNameActual = RTStrDup(pszDevName);
-    
+
     return VINF_SUCCESS;
 }
@@ -826 +826 @@
     pData->pszDeviceNameActual          = NULL;
     pData->IPFileDevice                 = NIL_RTFILE;
-#endif 
+#endif
     pData->pszSetupApplication          = NULL;
     pData->pszTerminateApplication      = NULL;
@@ -887 +887 @@
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: failed to query \"TAPTerminateApplication\""));
 
-    
+
     rc = CFGMR3QueryStringAlloc(pCfgHandle, "Device", &pData->pszDeviceName);
     if (VBOX_FAILURE(rc))