Changeset 35785 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/linux

Timestamp:

Jan 31, 2011 12:45:37 PM (14 years ago)

Author:

vboxsync

Message:

netadp: Re-create configured vboxnetX interfaces (#4213) on Linux

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -176 +176 @@
 
 
-int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
+int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress, const char *pcszName)
 {
     int rc = VINF_SUCCESS;
@@ -182 +182 @@
 
     /* No need for private data. */
-    pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV), VBOXNETADP_LINUX_NAME, vboxNetAdpNetDevInit);
+    pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
+                           pcszName ? pcszName : VBOXNETADP_LINUX_NAME,
+                           vboxNetAdpNetDevInit);
     if (pNetDev)
     {
@@ -277 +279 @@
     PVBOXNETADP pAdp;
     int rc;
+    char *pszName = NULL;
 
     Log(("VBoxNetAdpLinuxIOCtl: param len %#x; uCmd=%#x; add=%#x\n", _IOC_SIZE(uCmd), uCmd, VBOXNETADP_CTL_ADD));
@@ -289 +292 @@
         case VBOXNETADP_CTL_ADD:
             Log(("VBoxNetAdpLinuxIOCtl: _IOC_DIR(uCmd)=%#x; IOC_OUT=%#x\n", _IOC_DIR(uCmd), IOC_OUT));
-            rc = vboxNetAdpCreate(&pAdp);
+            if (RT_UNLIKELY(copy_from_user(&Req, (void *)ulArg, sizeof(Req))))
+            {
+                Log(("VBoxNetAdpLinuxIOCtl: copy_from_user(,%#lx,) failed; uCmd=%#x.\n", ulArg, uCmd));
+                return -EFAULT;
+            }
+            Log(("VBoxNetAdpLinuxIOCtl: Add %s\n", Req.szName));
+
+            if (Req.szName[0])
+            {
+                pAdp = vboxNetAdpFindByName(Req.szName);
+                if (pAdp)
+                {
+                    Log(("VBoxNetAdpLinuxIOCtl: '%s' already exists\n", Req.szName));
+                    return -EINVAL;
+                }
+                pszName = Req.szName;
+            }
+            rc = vboxNetAdpCreate(&pAdp, pszName);
             if (RT_FAILURE(rc))
             {