Changeset 35785 in vbox

Timestamp:

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

Author:

vboxsync

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

69756

Message:

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

Location:

trunk/src

Files:

• VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c (modified) (3 diffs)
• VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h (modified) (2 diffs)
• VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (1 diff)
• VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c (modified) (1 diff)
• VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (modified) (4 diffs)
• VBox/Main/include/netif.h (modified) (1 diff)
• VBox/Main/src-server/HostImpl.cpp (modified) (4 diffs)
• VBox/Main/src-server/generic/NetIf-generic.cpp (modified) (2 diffs)
• VBox/Main/src-server/win/NetIf-win.cpp (modified) (1 diff)
• apps/adpctl/VBoxNetAdpCtl.cpp (modified) (2 diffs)

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

@@ -1077 +1077 @@
 }
 
-int vboxNetAdpCreate (PVBOXNETADP *ppNew)
+int vboxNetAdpCreate (PVBOXNETADP *ppNew, const char *pcszName)
 {
     int rc;
@@ -1091 +1091 @@
             Log(("vboxNetAdpCreate: found empty slot: %d\n", i));
             vboxNetAdpComposeMACAddress(pThis, &Mac);
-            rc = vboxNetAdpOsCreate(pThis, &Mac);
+            rc = vboxNetAdpOsCreate(pThis, &Mac, pcszName);
             Log(("vboxNetAdpCreate: pThis=%p pThis->szName=%p\n", pThis, pThis->szName));
             if (RT_SUCCESS(rc))
@@ -1143 +1143 @@
     }
 
-    /* Create vboxnet0 */
-    return vboxNetAdpCreate(&pVboxnet0);
+    return VINF_SUCCESS;
+    /* Create vboxnet0
+       return vboxNetAdpCreate(&pVboxnet0);*/
 }
 

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -141 +141 @@
 DECLHIDDEN(int) vboxNetAdpInit(void);
 DECLHIDDEN(void) vboxNetAdpShutdown(void);
-DECLHIDDEN(int) vboxNetAdpCreate (PVBOXNETADP *ppNew);
+DECLHIDDEN(int) vboxNetAdpCreate (PVBOXNETADP *ppNew, const char *pcszName);
 DECLHIDDEN(int) vboxNetAdpDestroy(PVBOXNETADP pThis);
 DECLHIDDEN(PVBOXNETADP) vboxNetAdpFindByName(const char *pszName);
@@ -177 +177 @@
  * @remarks Owns no locks.
  */
-DECLHIDDEN(int) vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMac);
+DECLHIDDEN(int) vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMac, const char *pcszName);
 
 

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -193 +193 @@
 
 
-int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
-{
+int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress, const char *pcszName)
+{
+    /* TODO: Use pcszName */
     int rc;
     struct ifnet_init_params Params;

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

@@ -255 +255 @@
 }
 
-int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMac)
-{
+int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMac, const char *pcszName)
+{
+    /* TODO: Use pcszName */
     struct ifnet *ifp;
 

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))
             {

trunk/src/VBox/Main/include/netif.h

@@ -87 +87 @@
 int NetIfEnableStaticIpConfigV6(VirtualBox *pVbox, HostNetworkInterface * pIf, IN_BSTR aOldIPV6Address, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
 int NetIfEnableDynamicIpConfig(VirtualBox *pVbox, HostNetworkInterface * pIf);
-int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
+int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVbox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress, const char *pcszName = NULL);
 int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVbox, IN_GUID aId, IProgress **aProgress);
 int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *);

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -41 +41 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 # include <HostHardwareLinux.h>
+#endif
+
+#if defined(RT_OS_LINUX)
+# include <set>
 #endif
 
@@ -362 +366 @@
     m->f3DAccelerationSupported = is3DAccelerationSupported();
 #endif /* VBOX_WITH_CROGL */
+
+#if defined (RT_OS_LINUX)
+    /* Extract the list of configured host-only interfaces */
+    std::set<Utf8Str> aConfiguredNames;
+    SafeArray<BSTR> aGlobalExtraDataKeys;
+    hrc = aParent->GetExtraDataKeys(ComSafeArrayAsOutParam(aGlobalExtraDataKeys));
+    AssertMsg(SUCCEEDED(hrc), ("VirtualBox::GetExtraDataKeys failed with %Rhrc\n", hrc));
+    for (size_t i = 0; i < aGlobalExtraDataKeys.size(); ++i)
+    {
+        Utf8Str strKey = aGlobalExtraDataKeys[i];
+
+        if (!strKey.startsWith("HostOnly/vboxnet"))
+            continue;
+
+        size_t pos = strKey.find("/", sizeof("HostOnly/vboxnet"));
+        if (pos != Utf8Str::npos)
+            aConfiguredNames.insert(strKey.substr(sizeof("HostOnly"),
+                                                  pos - sizeof("HostOnly")));
+    }
+
+    for (std::set<Utf8Str>::const_iterator it = aConfiguredNames.begin();
+         it != aConfiguredNames.end();
+         ++it)
+    {
+        ComPtr<IHostNetworkInterface> hif;
+        ComPtr<IProgress> progress;
+
+        int r = NetIfCreateHostOnlyNetworkInterface(m->pParent, 
+                                                    hif.asOutParam(), 
+                                                    progress.asOutParam(),
+                                                    it->c_str());
+        if (RT_FAILURE(r))
+            return E_FAIL;
+    }
+
+#endif /* defined (RT_OS_LINUX) */
 
     /* Confirm a successful initialization */
@@ -1082 +1122 @@
      * violations with the called functions. */
 
+    Bstr name;
+    HRESULT rc;
+
     /* first check whether an interface with the given name already exists */
     {
@@ -1090 +1133 @@
                             tr("Host network interface with UUID {%RTuuid} does not exist"),
                             Guid (aId).raw());
+        rc = iface->COMGETTER(Name)(name.asOutParam());
+        ComAssertComRCRet(rc, rc);
     }
 
     int r = NetIfRemoveHostOnlyNetworkInterface(m->pParent, Guid(aId).ref(), aProgress);
     if (RT_SUCCESS(r))
+    {
+        /* Drop configuration parameters for removed interface */
+        rc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress", name.raw()).raw(), NULL);
+        rc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPNetMask", name.raw()).raw(), NULL);
+        rc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPV6Address", name.raw()).raw(), NULL);
+        rc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPV6NetMask", name.raw()).raw(), NULL);
+
         return S_OK;
+    }
 
     return r == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -127 +127 @@
 
 
-int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVBox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress)
+int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVBox,
+                                        IHostNetworkInterface **aHostNetworkInterface, 
+                                        IProgress **aProgress,
+                                        const char *pcszName)
 {
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
@@ -155 +158 @@
                 return rc;
             }
-            strcat(szAdpCtl, "/" VBOXNETADPCTL_NAME " add");
+            strcat(szAdpCtl, "/" VBOXNETADPCTL_NAME " ");
+            if (pcszName && strlen(pcszName) <= RTPATH_MAX - strlen(szAdpCtl) - sizeof(" add"))
+            {
+                strcat(szAdpCtl, pcszName);
+                strcat(szAdpCtl, " add");
+            }
+            else
+                strcat(szAdpCtl, "add");
             FILE *fp = popen(szAdpCtl, "r");
 

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -1085 +1085 @@
 int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVBox,
                                         IHostNetworkInterface **aHostNetworkInterface,
-                                        IProgress **aProgress)
+                                        IProgress **aProgress,
+                                        const char *pcszName)
 {
 #ifndef VBOX_WITH_NETFLT

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -66 +66 @@
 {
     fprintf(stderr, "Usage: VBoxNetAdpCtl <adapter> <address> ([netmask <address>] | remove)\n");
-    fprintf(stderr, "     | VBoxNetAdpCtl add\n");
+    fprintf(stderr, "     | VBoxNetAdpCtl [<adapter>] add\n");
     fprintf(stderr, "     | VBoxNetAdpCtl <adapter> remove\n");
 }
@@ -268 +268 @@
         case 3:
         {
-            /* Remove an existing interface */
             pszAdapterName = argv[1];
+            memset(&Req, '\0', sizeof(Req));
+            rc = checkAdapterName(pszAdapterName, szAdapterName);
+            if (rc)
+                return rc;
+            snprintf(Req.szName, sizeof(Req.szName), "%s", szAdapterName);
             pszAddress = argv[2];
             if (strcmp("remove", pszAddress) == 0)
             {
-                rc = checkAdapterName(pszAdapterName, szAdapterName);
-                if (rc)
-                    return rc;
-#ifdef RT_OS_SOLARIS
-                return 1;
-#else
-                memset(&Req, '\0', sizeof(Req));
-                snprintf(Req.szName, sizeof(Req.szName), "%s", szAdapterName);
+                /* Remove an existing interface */
+#ifdef RT_OS_SOLARIS
+                return 1;
+#else
                 return doIOCtl(VBOXNETADP_CTL_REMOVE, &Req);
 #endif
+            }
+            else if (strcmp("add", pszAddress) == 0)
+            {
+                /* Create an interface with given name */
+#ifdef RT_OS_SOLARIS
+                return 1;
+#else
+                rc = doIOCtl(VBOXNETADP_CTL_ADD, &Req);
+                if (rc == 0)
+                    puts(Req.szName);
+#endif
+                return rc;
             }
             break;