Changeset 19233 in vbox

Timestamp:

Apr 28, 2009 10:16:37 AM (16 years ago)

Author:

vboxsync

Message:

#2946 & #2954: Main API now supports dynamic adding/removing network adapters on all platforms. Linux backend.

Location:

trunk/src/VBox/Main

Files:

• darwin/NetIf-darwin.cpp (modified) (1 diff)
• generic/NetIf-generic.cpp (modified) (4 diffs)
• include/netif.h (modified) (3 diffs)
• linux/NetIf-linux.cpp (modified) (1 diff)
• solaris/NetIf-solaris.cpp (modified) (2 diffs)
• win/NetIf-win.cpp (modified) (1 diff)

trunk/src/VBox/Main/darwin/NetIf-darwin.cpp

@@ -339 +339 @@
     return rc;
 }
+
+int NetIfGetConfigByName(IN_BSTR aName, NETIFINFO *pInfo)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
 #endif

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

@@ -28 +28 @@
 
 #include "HostNetworkInterfaceImpl.h"
+#include "ProgressImpl.h"
+#include "VirtualBoxImpl.h"
 #include "netif.h"
 
 #define VBOXNETADPCTL_NAME "VBoxNetAdpCtl"
 
-static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const char *pszOption, const char *pszMask)
-{
-    const char *args[] = { NULL, NULL, pszAddr, pszOption, pszMask, NULL };
+static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char *pszOption, const char *pszMask)
+{
+    const char *args[] = { NULL, pcszIfName, pszAddr, pszOption, pszMask, NULL };
 
     char szAdpCtl[RTPATH_MAX];
@@ -45 +47 @@
     strcat(szAdpCtl, "/" VBOXNETADPCTL_NAME);
     args[0] = szAdpCtl;
-    Bstr interfaceName;
-    pIf->COMGETTER(Name)(interfaceName.asOutParam());
-    Utf8Str strName(interfaceName);
-    args[1] = strName;
     if (!RTPathExists(szAdpCtl))
     {
@@ -73 +71 @@
 }
 
+static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const char *pszOption, const char *pszMask)
+{
+    Bstr interfaceName;
+    pIf->COMGETTER(Name)(interfaceName.asOutParam());
+    Utf8Str strName(interfaceName);
+    return NetIfAdpCtl(strName, pszAddr, pszOption, pszMask);
+}
+
 int NetIfEnableStaticIpConfig(VirtualBox * /* vBox */, HostNetworkInterface * pIf, ULONG aOldIp, ULONG aNewIp, ULONG aMask)
 {
@@ -120 +126 @@
 }
 
-int NetIfCreateHostOnlyNetworkInterface (VirtualBox * /* pVbox */, IHostNetworkInterface ** /* aHostNetworkInterface */, IProgress ** /* aProgress */)
-{
-    return VERR_NOT_IMPLEMENTED;
-}
-
-int NetIfRemoveHostOnlyNetworkInterface (VirtualBox * /* pVbox */, IN_GUID /* aId */, IHostNetworkInterface ** /* aHostNetworkInterface */, IProgress ** /* aProgress */)
-{
-    return VERR_NOT_IMPLEMENTED;
+
+int NetIfCreateHostOnlyNetworkInterface (VirtualBox *pVBox, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress)
+{
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+    /* create a progress object */
+    ComObjPtr <Progress> progress;
+    progress.createObject();
+
+    ComPtr<IHost> host;
+    HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
+    if(SUCCEEDED(rc))
+    {
+        rc = progress->init (pVBox, host,
+                             Bstr ("Creating host only network interface"),
+                             FALSE /* aCancelable */);
+        if(SUCCEEDED(rc))
+        {
+            CheckComRCReturnRC (rc);
+            progress.queryInterfaceTo (aProgress);
+
+            char szAdpCtl[RTPATH_MAX];
+            int rc = RTPathProgram(szAdpCtl, sizeof(szAdpCtl) - sizeof("/" VBOXNETADPCTL_NAME " add"));
+            if (RT_FAILURE(rc))
+            {
+                progress->notifyComplete(E_FAIL, COM_IIDOF(IHostNetworkInterface), HostNetworkInterface::getComponentName(),
+                                         "Failed to get program path, rc=%Vrc.\n", rc);
+                return rc;
+            }
+            strcat(szAdpCtl, "/" VBOXNETADPCTL_NAME " add");
+            FILE *fp = popen(szAdpCtl, "r");
+
+            if (fp)
+            {
+                char szBuf[VBOXNET_MAX_SHORT_NAME];
+                if (fgets(szBuf, sizeof(szBuf), fp))
+                {
+                    char *pLast = szBuf + strlen(szBuf) - 1;
+                    if (pLast >= szBuf && *pLast == '\n')
+                        *pLast = 0;
+
+                    NETIFINFO Info;
+                    Bstr IfName(szBuf);
+                    rc = NetIfGetConfigByName(IfName, &Info);
+                    if (RT_FAILURE(rc))
+                    {
+                        progress->notifyComplete(E_FAIL, COM_IIDOF(IHostNetworkInterface), HostNetworkInterface::getComponentName(),
+                                                 "Failed to get config info for %s (as reported by '" VBOXNETADPCTL_NAME " add').\n", szBuf);
+                    }
+                    else
+                    {
+                        /* create a new uninitialized host interface object */
+                        ComObjPtr <HostNetworkInterface> iface;
+                        iface.createObject();
+                        iface->init(IfName, HostNetworkInterfaceType_HostOnly, &Info);
+                        iface.queryInterfaceTo (aHostNetworkInterface);
+                    }
+                }
+                if ((rc = pclose(fp)) != 0)
+                {
+                    progress->notifyComplete(E_FAIL, COM_IIDOF(IHostNetworkInterface), HostNetworkInterface::getComponentName(), "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d).", rc);
+                    rc = VERR_INTERNAL_ERROR;
+                }
+            }
+            if (RT_SUCCESS(rc))
+                progress->notifyComplete(rc);
+        }
+    }
+
+    return rc;
+
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
+}
+
+int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVBox, IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress)
+{
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+    /* create a progress object */
+    ComObjPtr <Progress> progress;
+    progress.createObject();
+    ComPtr<IHost> host;
+    int rc = VINF_SUCCESS;
+    HRESULT hr = pVBox->COMGETTER(Host)(host.asOutParam());
+    if(SUCCEEDED(hr))
+    {
+        Bstr ifname;
+        ComPtr <IHostNetworkInterface> iface;
+        if (FAILED (host->FindHostNetworkInterfaceById (aId, iface.asOutParam())))
+            return VERR_INVALID_PARAMETER;
+        iface->COMGETTER (Name) (ifname.asOutParam());
+        if (ifname.isNull())
+            return VERR_INTERNAL_ERROR;
+
+        rc = progress->init (pVBox, host,
+                            Bstr ("Removing host network interface"),
+                            FALSE /* aCancelable */);
+        if(SUCCEEDED(rc))
+        {
+            CheckComRCReturnRC (rc);
+            progress.queryInterfaceTo (aProgress);
+            iface.queryInterfaceTo (aHostNetworkInterface);
+            rc = NetIfAdpCtl(Utf8Str(ifname), "remove", NULL, NULL);
+            if (RT_FAILURE(rc))
+                progress->notifyComplete(E_FAIL, COM_IIDOF(IHostNetworkInterface), HostNetworkInterface::getComponentName(), "Failed to execute '"VBOXNETADPCTL_NAME "' (exit status: %d).", rc);
+            else
+                progress->notifyComplete(S_OK);
+        }
+    }
+    else
+    {
+        progress->notifyComplete(hr);
+        rc = VERR_INTERNAL_ERROR;
+    }
+    return rc;
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
 }
 

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

@@ -29 +29 @@
 #define VBOXNET_IPV4ADDR_DEFAULT "192.168.56.1"
 #define VBOXNET_IPV4MASK_DEFAULT "255.255.255.0"
+
+#define VBOXNET_MAX_SHORT_NAME 50
 
 #if 1
@@ -67 +69 @@
     NETIFSTATUS    enmStatus;
     RTUUID         Uuid;
-    char           szShortName[50];
+    char           szShortName[VBOXNET_MAX_SHORT_NAME];
     char           szName[1];
 } NETIFINFO;
@@ -84 +86 @@
 int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVbox, IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
 int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *);
+int NetIfGetConfigByName(IN_BSTR aName, NETIFINFO *pInfo);
 int NetIfDhcpRediscover(VirtualBox *pVbox, HostNetworkInterface * pIf);
 

trunk/src/VBox/Main/linux/NetIf-linux.cpp

@@ -162 +162 @@
         close(sock);
     }
+    else
+        rc = VERR_INTERNAL_ERROR;
 
     return rc;
 }
+
+int NetIfGetConfigByName(IN_BSTR aName, NETIFINFO *pInfo)
+{
+    int rc = VINF_SUCCESS;
+    int sock = socket(AF_INET, SOCK_DGRAM, 0);
+    if (sock < 0)
+        return VERR_NOT_IMPLEMENTED;
+    rc = getInterfaceInfo(sock, Utf8Str(aName).c_str(), pInfo);
+    close(sock);
+    return rc;
+}

trunk/src/VBox/Main/solaris/NetIf-solaris.cpp

@@ -386 +386 @@
     return VINF_SUCCESS;
 }
+
 #else
 int NetIfList(std::list <ComObjPtr <HostNetworkInterface> > &list)
@@ -392 +393 @@
 }
 #endif
+
+int NetIfGetConfigByName(IN_BSTR aName, NETIFINFO *pInfo)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+

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

@@ -1039 +1039 @@
     return VERR_GENERAL_FAILURE;
 #endif
+}
+
+int NetIfGetConfigByName(IN_BSTR /* aName */, NETIFINFO *)
+{
+    return VERR_NOT_IMPLEMENTED;
 }