Changeset 10896 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 25, 2008 11:58:01 PM (17 years ago)

Author:

vboxsync

Message:

Main & VBoxManage: Made HostNetworkInterface, IHost::networkInterfaces and list hostifs available everywhere. Only Windows and Darwin implements the enumeration.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (11 diffs)
• Makefile.kmk (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (8 diffs)
• include/HostImpl.h (modified) (1 diff)
• include/HostNetworkInterfaceImpl.h (modified) (1 diff)
• xpcom/server.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -81 +81 @@
 #include "HostDVDDriveImpl.h"
 #include "HostFloppyDriveImpl.h"
+#include "HostNetworkInterfaceImpl.h"
 #ifdef VBOX_WITH_USB
 # include "HostUSBDeviceImpl.h"
@@ -94 +95 @@
 #endif
 
-#ifdef RT_OS_WINDOWS
-# include "HostNetworkInterfaceImpl.h"
-#endif
 
 #include <VBox/usb.h>
@@ -454 +452 @@
 
 #ifdef RT_OS_WINDOWS
-
+/**
+ * Windows helper function for Host::COMGETTER(NetworkInterfaces).
+ *
+ * @returns true / false.
+ *
+ * @param   guid        The GUID.
+ */
 static bool IsTAPDevice(const char *guid)
 {
@@ -467 +471 @@
         return false;
 
-    while(true)
+    for (;;)
     {
         char szEnumName[256];
@@ -482 +486 @@
         if (status == ERROR_SUCCESS)
         {
-            len = sizeof (szNetCfgInstanceId);
+            len = sizeof(szNetCfgInstanceId);
             status = RegQueryValueExA(hNetCardGUID, "NetCfgInstanceId", NULL, &dwKeyType, (LPBYTE)szNetCfgInstanceId, &len);
             if (status == ERROR_SUCCESS && dwKeyType == REG_SZ)
@@ -499 +503 @@
                 if (   !strcmp(szNetCfgInstanceId, guid)
                     && !strcmp(szNetProductName, "VirtualBox TAP Adapter")
-                    && (!strcmp(szNetProviderName, "innotek GmbH") || !strcmp(szNetProviderName, "Sun Microsystems, Inc.")))
+                    && (   !strcmp(szNetProviderName, "innotek GmbH")
+                        || !strcmp(szNetProviderName, "Sun Microsystems, Inc.")))
                 {
                     ret = true;
@@ -511 +516 @@
     }
 
-    RegCloseKey (hNetcard);
+    RegCloseKey(hNetcard);
     return ret;
 }
+#endif /* RT_OS_WINDOWS */
 
 /**
@@ -523 +529 @@
 STDMETHODIMP Host::COMGETTER(NetworkInterfaces) (IHostNetworkInterfaceCollection **networkInterfaces)
 {
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN) /*|| defined(RT_OS_SOLARIS)*/ /*|| defined(RT_OS_OS2)*/
     if (!networkInterfaces)
         return E_POINTER;
@@ -530 +537 @@
     std::list <ComObjPtr <HostNetworkInterface> > list;
 
+# if defined(RT_OS_DARWIN)
+    PDARWINETHERNIC pEtherNICs = DarwinGetEthernetControllers();
+    while (pEtherNICs)
+    {
+        ComObjPtr<HostNetworkInterface> IfObj;
+        IfObj.createObject();
+        if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), Guid(pEtherNICs->Uuid))))
+            list.push_back(IfObj);
+
+        /* next, free current */
+        void *pvFree = pEtherNICs;
+        pEtherNICs = pEtherNICs->pNext;
+        RTMemFree(pvFree);
+    }
+
+# elif defined RT_OS_WINDOWS
     static const char *NetworkKey = "SYSTEM\\CurrentControlSet\\Control\\Network\\"
                                     "{4D36E972-E325-11CE-BFC1-08002BE10318}";
@@ -585 +608 @@
     }
     RegCloseKey (hCtrlNet);
+# endif /* RT_OS_WINDOWS */
 
     ComObjPtr <HostNetworkInterfaceCollection> collection;
@@ -591 +615 @@
     collection.queryInterfaceTo (networkInterfaces);
     return S_OK;
-}
-#endif /* RT_OS_WINDOWS */
+
+#else
+    /* Not implemented / supported on this platform. */
+    return E_NOTIMPL;
+#endif
+}
 
 STDMETHODIMP Host::COMGETTER(USBDevices)(IHostUSBDeviceCollection **aUSBDevices)

trunk/src/VBox/Main/Makefile.kmk

@@ -217 +217 @@
         HostDVDDriveImpl.cpp \
         HostFloppyDriveImpl.cpp \
+        HostNetworkInterfaceImpl.cpp \
         GuestOSTypeImpl.cpp \
         NetworkAdapterImpl.cpp \
@@ -236 +237 @@
 
 VBoxSVC_SOURCES.win = \
-        HostNetworkInterfaceImpl.cpp \
         win/svcmain.cpp \
         win/svchlp.cpp \

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

@@ -2763 +2763 @@
       <desc>
         This setting determines whether VirtualBox will try to make use of
-        the nested paging extension of Intel VT-x and AMD-V. Note that in case 
+        the nested paging extension of Intel VT-x and AMD-V. Note that in case
         such extensions are not available, they will not be used.
       </desc>
@@ -4853 +4853 @@
   </collection>
 
-<if target="midl">
   <interface
      name="IHostNetworkInterface" extends="$unknown"
@@ -4910 +4909 @@
     </method>
   </collection>
-</if>
 
   <interface
      name="IHost" extends="$unknown"
-     uuid="3d864057-ae6b-4d05-9cf7-c341139b6062"
+     uuid="D56DC1AF-8D1B-4A06-86D7-26016E0E2B74"
      wsmap="managed"
      >
@@ -4978 +4976 @@
     </attribute>
 
-<if target="midl">
     <attribute name="networkInterfaces" type="IHostNetworkInterfaceCollection" readonly="yes">
       <desc>List of host network interfaces currently defined on the host.</desc>
     </attribute>
-</if>
 
     <attribute name="processorCount" type="unsigned long" readonly="yes">
@@ -10340 +10336 @@
       <param name="period" type="unsigned long" dir="in">
         <desc>
-          Time interval in seconds between two consecutive samples of performace 
+          Time interval in seconds between two consecutive samples of performace
           data.
         </desc>
@@ -10346 +10342 @@
       <param name="count" type="unsigned long" dir="in">
         <desc>
-          Number of samples to retain in performance data history. Older samples 
+          Number of samples to retain in performance data history. Older samples
           get discarded.
         </desc>
@@ -10397 +10393 @@
       <desc>
         Queries collected metrics data for a set of objects.
-        
+
         The data itself and related metric information are returned in four
         parallel and one flattened array of arrays. Elements of @c
-        returnMetricNames, @c returnObjects, @c returnDataIndices and @ 
-        returnDataLengths with the same index describe one set of values 
+        returnMetricNames, @c returnObjects, @c returnDataIndices and @
+        returnDataLengths with the same index describe one set of values
         corresponding to a single metric.
 
@@ -10448 +10444 @@
       <param name="returnData" type="long" dir="return" safearray="yes">
         <desc>
-          Flattened array of all metric data containing sequences of values for 
+          Flattened array of all metric data containing sequences of values for
           each metric.
         </desc>

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

@@ -80 +80 @@
     STDMETHOD(COMGETTER(USBDevices))(IHostUSBDeviceCollection **aUSBDevices);
     STDMETHOD(COMGETTER(USBDeviceFilters))(IHostUSBDeviceFilterCollection ** aUSBDeviceFilters);
-#ifdef RT_OS_WINDOWS
     STDMETHOD(COMGETTER(NetworkInterfaces))(IHostNetworkInterfaceCollection **networkInterfaces);
-#endif
     STDMETHOD(COMGETTER(ProcessorCount))(ULONG *count);
     STDMETHOD(GetProcessorSpeed)(ULONG cpuId, ULONG *speed);

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

@@ -22 +22 @@
 #ifndef ____H_HOSTNETWORKINTERFACEIMPL
 #define ____H_HOSTNETWORKINTERFACEIMPL
-
-#ifndef RT_OS_WINDOWS
-#error This is Windows only stuff!
-#endif
 
 #include "VirtualBoxBase.h"

trunk/src/VBox/Main/xpcom/server.cpp

@@ -102 +102 @@
 #include <HostDVDDriveImpl.h>
 #include <HostFloppyDriveImpl.h>
+#include <HostNetworkInterfaceImpl.h>
 #include <GuestOSTypeImpl.h>
 #include <NetworkAdapterImpl.h>
@@ -165 +166 @@
 NS_DECL_CLASSINFO(HostFloppyDrive)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HostFloppyDrive, IHostFloppyDrive)
+NS_DECL_CLASSINFO(HostNetworkInterface)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HostNetworkInterface, IHostNetworkInterface)
 NS_DECL_CLASSINFO(GuestOSType)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(GuestOSType, IGuestOSType)
@@ -205 +208 @@
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostDVDDrive)
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostFloppyDrive)
+COM_IMPL_READONLY_ENUM_AND_COLLECTION(HostNetworkInterface)
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(HardDisk)
 COM_IMPL_READONLY_ENUM_AND_COLLECTION(DVDImage)