Changeset 16198 in vbox for trunk/src

Timestamp:

Jan 23, 2009 12:46:45 PM (16 years ago)

Author:

vboxsync

Message:

HostNetIf API: added findHostNetworkInterfaceByName and findHostNetworkInterfaceById to IHost.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/HostImpl.h (modified) (1 diff)
• testcase/tstAPI.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -3331 +3331 @@
 };
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
+STDMETHODIMP Host::FindHostNetworkInterfaceByName(IN_BSTR name, IHostNetworkInterface **networkInterface) 
+{ 
+#ifndef VBOX_WITH_HOSTNETIF_API
+    return E_NOTIMPL;
+#else
+    if (!name) 
+        return E_INVALIDARG; 
+    if (!networkInterface) 
+        return E_POINTER; 
+    
+    *networkInterface = NULL; 
+    ComObjPtr <HostNetworkInterface> found;
+    std::list <ComObjPtr <HostNetworkInterface> > list;
+    int rc = NetIfList(list);
+    if (RT_FAILURE(rc))
+    {
+        Log(("Failed to get host network interface list with rc=%Vrc\n", rc));
+        return E_FAIL;
+    }
+    std::list <ComObjPtr <HostNetworkInterface> >::iterator it;
+    for (it = list.begin(); it != list.end(); ++it)
+    {
+        Bstr n;
+        (*it)->COMGETTER(Name) (n.asOutParam());
+        if (n == name)
+            found = *it;
+    }
+
+    if (!found) 
+        return setError (E_INVALIDARG, HostNetworkInterface::tr ( 
+                             "The host network interface with the given name could not be found")); 
+                 
+    return found.queryInterfaceTo (networkInterface); 
+#endif
+} 
+                 
+STDMETHODIMP Host::FindHostNetworkInterfaceById(IN_GUID id, IHostNetworkInterface **networkInterface) 
+{ 
+#ifndef VBOX_WITH_HOSTNETIF_API
+    return E_NOTIMPL;
+#else
+    if (Guid(id).isEmpty()) 
+        return E_INVALIDARG; 
+    if (!networkInterface) 
+        return E_POINTER; 
+                 
+    *networkInterface = NULL; 
+    ComObjPtr <HostNetworkInterface> found;
+    std::list <ComObjPtr <HostNetworkInterface> > list;
+    int rc = NetIfList(list);
+    if (RT_FAILURE(rc))
+    {
+        Log(("Failed to get host network interface list with rc=%Vrc\n", rc));
+        return E_FAIL;
+    }
+    std::list <ComObjPtr <HostNetworkInterface> >::iterator it;
+    for (it = list.begin(); it != list.end(); ++it)
+    { 
+        Guid g; 
+        (*it)->COMGETTER(Id) (g.asOutParam()); 
+        if (g == Guid(id)) 
+            found = *it; 
+    } 
+                 
+    if (!found) 
+        return setError (E_INVALIDARG, HostNetworkInterface::tr ( 
+                             "The host network interface with the given GUID could not be found")); 
+                 
+    return found.queryInterfaceTo (networkInterface); 
+#endif
+} 
+                 
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6300 +6300 @@
   <interface
      name="IHost" extends="$unknown"
-     uuid="f39438d7-abfd-409b-bc80-5f5291d92897"
+     uuid="7c172c42-b209-4bdc-9ddf-a84f222bd59a"
      wsmap="managed"
      >
@@ -6590 +6590 @@
     </method>
 
+    <method name="findHostNetworkInterfaceByName"> 
+      <desc> 
+        Searches through all host network interfaces for an interface with
+        the given name. 
+        <note> 
+          The method returns an error if the given name does not 
+          correspond to any host network interface. 
+        </note> 
+      </desc> 
+      <param name="name" type="wstring" dir="in"> 
+        <desc>Name of the host network interface to search for.</desc> 
+      </param> 
+      <param name="networkInterface" type="IHostNetworkInterface" dir="return"> 
+        <desc>Found host network interface object.</desc> 
+      </param> 
+    </method> 
+    <method name="findHostNetworkInterfaceById"> 
+      <desc> 
+        Searches through all host network interfaces for an interface with
+        the given GUID. 
+        <note> 
+          The method returns an error if the given GUID does not 
+          correspond to any host network interface. 
+        </note> 
+      </desc> 
+      <param name="id" type="uuid" dir="in"> 
+        <desc>GUID of the host network interface to search for.</desc> 
+      </param> 
+      <param name="networkInterface" type="IHostNetworkInterface" dir="return"> 
+        <desc>Found host network interface object.</desc> 
+      </param> 
+    </method> 
   </interface>
 

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

@@ -110 +110 @@
     STDMETHOD(RemoveUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter **aFilter);
 
+    STDMETHOD(FindHostNetworkInterfaceByName) (IN_BSTR aName, IHostNetworkInterface **networkInterface);
+    STDMETHOD(FindHostNetworkInterfaceById) (IN_GUID id, IHostNetworkInterface **networkInterface);
+
     // public methods only for internal purposes
 

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -1127 +1127 @@
 #endif
 
+#if 0
+    do {
+        // Get host
+        ComPtr <IHost> host;
+        CHECK_ERROR_BREAK (virtualBox, COMGETTER(Host) (host.asOutParam()));
+
+        ULONG uMemSize, uMemAvail;
+        CHECK_ERROR_BREAK (host, COMGETTER(MemorySize) (&uMemSize));
+        printf("Total memory (MB): %u\n", uMemSize);
+        CHECK_ERROR_BREAK (host, COMGETTER(MemoryAvailable) (&uMemAvail));
+        printf("Free memory (MB): %u\n", uMemAvail);
+    } while (0);
+#endif
+
 #if 1
     do {
@@ -1133 +1147 @@
         CHECK_ERROR_BREAK (virtualBox, COMGETTER(Host) (host.asOutParam()));
 
-        ULONG uMemSize, uMemAvail;
-        CHECK_ERROR_BREAK (host, COMGETTER(MemorySize) (&uMemSize));
-        printf("Total memory (MB): %u\n", uMemSize);
-        CHECK_ERROR_BREAK (host, COMGETTER(MemoryAvailable) (&uMemAvail));
-        printf("Free memory (MB): %u\n", uMemAvail);
+        com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
+        CHECK_ERROR_BREAK(host,
+                          COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+        if (hostNetworkInterfaces.size() > 0)
+        {
+            ComPtr<IHostNetworkInterface> networkInterface = hostNetworkInterfaces[0];
+            Bstr interfaceName;
+            networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
+            printf("Found %d network interfaces, testing with %lS...\n", hostNetworkInterfaces.size(), interfaceName.raw());
+            Guid interfaceGuid;
+            networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
+            // Find the interface by its name
+            networkInterface.setNull();
+            CHECK_ERROR_BREAK(host,
+                              FindHostNetworkInterfaceByName (interfaceName, networkInterface.asOutParam()));
+            Guid interfaceGuid2;
+            networkInterface->COMGETTER(Id)(interfaceGuid2.asOutParam());
+            if (interfaceGuid2 != interfaceGuid)
+                printf("Failed to retrive an interface by name %lS.\n", interfaceName.raw());
+            // Find the interface by its guid
+            networkInterface.setNull();
+            CHECK_ERROR_BREAK(host,
+                              FindHostNetworkInterfaceById (interfaceGuid, networkInterface.asOutParam()));
+            Bstr interfaceName2;
+            networkInterface->COMGETTER(Name)(interfaceName2.asOutParam());
+            if (interfaceName != interfaceName2)
+                printf("Failed to retrive an interface by GUID %lS.\n", Bstr(interfaceGuid.toString()).raw());
+        }
+        else
+        {
+            printf("No network interfaces found!\n");
+        }
     } while (0);
 #endif
@@ -1255 +1296 @@
     } while (false);
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
-#if 1
+#if 0
     // check of OVF appliance handling
     ///////////////////////////////////////////////////////////////////////////