Changeset 15372 in vbox for trunk/src

Timestamp:

Dec 12, 2008 2:51:29 PM (16 years ago)

Author:

vboxsync

Message:

#3282: HostNetIf API implementation for Darwin. Common part revised. Stubs for other platforms.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (3 diffs)
• Main/HostImpl.cpp (modified) (2 diffs)
• Main/HostNetworkInterfaceImpl.cpp (modified) (5 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/darwin/NetIfList-darwin.cpp (added)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/HostNetworkInterfaceImpl.h (modified) (4 diffs)
• Main/include/netif.h (added)
• Main/linux/NetIfList-linux.cpp (added)
• Main/os2/NetIfList-os2.cpp (added)
• Main/solaris/NetIfList-solaris.cpp (added)
• Main/win/NetIfList-win.cpp (added)
• Runtime/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -49 +49 @@
         case HostNetworkInterfaceType_PPP: return "PPP";
         case HostNetworkInterfaceType_SLIP: return "SLIP";
+    }
+    return "Unknown";
+}
+
+static const char *getHostIfStatusText(HostNetworkInterfaceStatus_T enmStatus)
+{
+    switch (enmStatus)
+    {
+        case HostNetworkInterfaceStatus_Up: return "Up";
+        case HostNetworkInterfaceStatus_Down: return "Down";
     }
     return "Unknown";
@@ -204 +214 @@
                 ComPtr<IHostNetworkInterface> networkInterface;
                 CHECK_RC_BREAK(enumerator->GetNext(networkInterface.asOutParam()));
+#ifndef VBOX_WITH_HOSTNETIF_API
                 Bstr interfaceName;
                 networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
@@ -210 +221 @@
                 networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
                 RTPrintf("GUID:        %lS\n\n", Bstr(interfaceGuid.toString()).raw());
-#ifdef VBOX_WITH_HOSTNETIF_API
-            ULONG IPAddress;
-            networkInterface->COMGETTER(IPAddress)(&IPAddress);
-            RTPrintf("IPAddress:       %d.%d.%d.%d\n",
-                     ((uint8_t*)&IPAddress)[0],
-                     ((uint8_t*)&IPAddress)[1],
-                     ((uint8_t*)&IPAddress)[2],
-                     ((uint8_t*)&IPAddress)[3]);
-            ULONG NetworkMask;
-            networkInterface->COMGETTER(NetworkMask)(&NetworkMask);
-            RTPrintf("NetworkMask:     %d.%d.%d.%d\n",
-                     ((uint8_t*)&NetworkMask)[0],
-                     ((uint8_t*)&NetworkMask)[1],
-                     ((uint8_t*)&NetworkMask)[2],
-                     ((uint8_t*)&NetworkMask)[3]);
-            Bstr IPV6Address;
-            networkInterface->COMGETTER(IPV6Address)(IPV6Address.asOutParam());
-            RTPrintf("IPV6Address:     %lS\n", IPV6Address.raw());
-            Bstr HardwareAddress;
-            networkInterface->COMGETTER(HardwareAddress)(HardwareAddress.asOutParam());
-            RTPrintf("HardwareAddress: %lS\n", HardwareAddress.raw());
-            HostNetworkInterfaceType_T Type;
-            networkInterface->COMGETTER(Type)(&Type);
-            RTPrintf("Type:            %s\n", getHostIfTypeText(Type));
-            HostNetworkInterfaceStatus_T Status;
-            networkInterface->COMGETTER(Status)(&Status);
-            RTPrintf("Status:          %s\n\n", Status ? "Down":"Up");
+#else /* VBOX_WITH_HOSTNETIF_API */
+                Bstr interfaceName;
+                networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
+                RTPrintf("Name:            %lS\n", interfaceName.raw());
+                Guid interfaceGuid;
+                networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
+                RTPrintf("GUID:            %lS\n", Bstr(interfaceGuid.toString()).raw());
+                ULONG IPAddress;
+                networkInterface->COMGETTER(IPAddress)(&IPAddress);
+                RTPrintf("IPAddress:       %d.%d.%d.%d\n",
+                         ((uint8_t*)&IPAddress)[0],
+                         ((uint8_t*)&IPAddress)[1],
+                         ((uint8_t*)&IPAddress)[2],
+                         ((uint8_t*)&IPAddress)[3]);
+                ULONG NetworkMask;
+                networkInterface->COMGETTER(NetworkMask)(&NetworkMask);
+                RTPrintf("NetworkMask:     %d.%d.%d.%d\n",
+                         ((uint8_t*)&NetworkMask)[0],
+                         ((uint8_t*)&NetworkMask)[1],
+                         ((uint8_t*)&NetworkMask)[2],
+                         ((uint8_t*)&NetworkMask)[3]);
+                Bstr IPV6Address;
+                networkInterface->COMGETTER(IPV6Address)(IPV6Address.asOutParam());
+                RTPrintf("IPV6Address:     %lS\n", IPV6Address.raw());
+                Bstr IPV6NetworkMask;
+                networkInterface->COMGETTER(IPV6NetworkMask)(IPV6NetworkMask.asOutParam());
+                RTPrintf("IPV6NetworkMask: %lS\n", IPV6NetworkMask.raw());
+                Bstr HardwareAddress;
+                networkInterface->COMGETTER(HardwareAddress)(HardwareAddress.asOutParam());
+                RTPrintf("HardwareAddress: %lS\n", HardwareAddress.raw());
+                HostNetworkInterfaceType_T Type;
+                networkInterface->COMGETTER(Type)(&Type);
+                RTPrintf("Type:            %s\n", getHostIfTypeText(Type));
+                HostNetworkInterfaceStatus_T Status;
+                networkInterface->COMGETTER(Status)(&Status);
+                RTPrintf("Status:          %s\n\n", getHostIfStatusText(Status));
 #endif
             }

trunk/src/VBox/Main/HostImpl.cpp

@@ -117 +117 @@
 #endif
 #ifdef VBOX_WITH_HOSTNETIF_API
-#include <iprt/netif.h>
+#include "netif.h"
 #endif
 
@@ -762 +762 @@
 
 #ifdef VBOX_WITH_HOSTNETIF_API
-    PRTNETIFINFO pIfs = RTNetIfList();
+    PNETIFINFO pIfs = NetIfList();
     while (pIfs)
     {

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -72 +72 @@
 
 #ifdef VBOX_WITH_HOSTNETIF_API
+static Bstr composeIPv6Address(PRTNETADDRIPV6 aAddrPtr)
+{
+    char szTmp[8*5];
+
+    RTStrPrintf(szTmp, sizeof(szTmp),
+                "%02x%02x:%02x%02x:%02x%02x:%02x%02x:"
+                "%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+                aAddrPtr->au8[0], aAddrPtr->au8[1],
+                aAddrPtr->au8[2], aAddrPtr->au8[3],
+                aAddrPtr->au8[4], aAddrPtr->au8[5],
+                aAddrPtr->au8[6], aAddrPtr->au8[7],
+                aAddrPtr->au8[8], aAddrPtr->au8[9],
+                aAddrPtr->au8[10], aAddrPtr->au8[11],
+                aAddrPtr->au8[12], aAddrPtr->au8[13],
+                aAddrPtr->au8[14], aAddrPtr->au8[15]);
+    return Bstr(szTmp);
+}
+
+static Bstr composeHardwareAddress(PRTMAC aMacPtr)
+{
+    char szTmp[6*3];
+
+    RTStrPrintf(szTmp, sizeof(szTmp),
+                "%02x:%02x:%02x:%02x:%02x:%02x",
+                aMacPtr->au8[0], aMacPtr->au8[1],
+                aMacPtr->au8[2], aMacPtr->au8[3],
+                aMacPtr->au8[4], aMacPtr->au8[5]);
+    return Bstr(szTmp);
+}
+
 /**
  * Initializes the host object.
@@ -79 +109 @@
  * @param   aGuid GUID of the host network interface
  */
-HRESULT HostNetworkInterface::init (PRTNETIFINFO pIf)
+HRESULT HostNetworkInterface::init (PNETIFINFO pIf)
 {
 //    LogFlowThisFunc (("aInterfaceName={%ls}, aGuid={%s}\n",
@@ -86 +116 @@
 //    ComAssertRet (aInterfaceName, E_INVALIDARG);
 //    ComAssertRet (!aGuid.isEmpty(), E_INVALIDARG);
-    ComAssertRet (!pIf, E_INVALIDARG);
+    ComAssertRet (pIf, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -94 +124 @@
     unconst (mInterfaceName) = Bstr(pIf->szName);
     unconst (mGuid) = pIf->Uuid;
-//    m.IPAddress = pIf->IPAddress;
-//    m.networkMask = pIf->IPNetMask;
-//    m.IPv6Address = composeIPv6Address(pIf->IPv6Address, pIf->IPv6NetMask);
+    m.IPAddress = pIf->IPAddress.u;
+    m.networkMask = pIf->IPNetMask.u;
+    m.IPV6Address = composeIPv6Address(&pIf->IPv6Address);
+    m.IPV6NetworkMask = composeIPv6Address(&pIf->IPv6NetMask);
+    m.hardwareAddress = composeHardwareAddress(&pIf->MACAddress);
+    m.type = pIf->enmType;
+    m.status = pIf->enmStatus;
 
     /* Confirm a successful initialization */
@@ -200 +234 @@
 
 /**
+ * Returns the IP V6 network mask of the host network interface.
+ *
+ * @returns COM status code
+ * @param   aIPV6Mask address of result pointer
+ */
+STDMETHODIMP HostNetworkInterface::COMGETTER(IPV6NetworkMask) (BSTR *aIPV6Mask)
+{
+    CheckComArgOutPointerValid(aIPV6Mask);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    m.IPV6NetworkMask.cloneTo (aIPV6Mask);
+
+    return S_OK;
+}
+
+/**
  * Returns the hardware address of the host network interface.
  *

trunk/src/VBox/Main/Makefile.kmk

@@ -341 +341 @@
 endif
 
+ifdef VBOX_WITH_HOSTNETIF_API
+ VBoxSVC_SOURCES.win     +=     win/NetIfList-win.cpp
+ VBoxSVC_SOURCES.linux   +=   linux/NetIfList-linux.cpp
+ VBoxSVC_SOURCES.os2     +=     os2/NetIfList-os2.cpp
+ VBoxSVC_SOURCES.darwin  +=  darwin/NetIfList-darwin.cpp
+ VBoxSVC_SOURCES.solaris += solaris/NetIfList-solaris.cpp
+ VBoxSVC_DEFS            += VBOX_WITH_HOSTNETIF_API
+endif
+
 win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
 win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc

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

@@ -5902 +5902 @@
     </desc>
 
-    <const name="Up" value="0">
+    <const name="Unknown" value="0">
+      <desc>
+        The state of interface cannot be determined.
+      </desc>
+    </const>
+    <const name="Up" value="1">
       <desc>
         The interface is fully operational.
       </desc>
     </const>
-    <const name="Down" value="1">
+    <const name="Down" value="2">
       <desc>
         The interface is not functioning.
@@ -5937 +5942 @@
     <attribute name="IPV6Address" type="wstring" readonly="yes">
       <desc>Returns the IP V6 address of the interface.</desc>
+    </attribute>
+
+    <attribute name="IPV6NetworkMask" type="wstring" readonly="yes">
+      <desc>Returns the IP V6 network mask of the interface.</desc>
     </attribute>
 

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

@@ -28 +28 @@
 #include "Collection.h"
 #ifdef VBOX_WITH_HOSTNETIF_API
-#include "iprt/netif.h"
+#include "netif.h"
 #endif
 
@@ -60 +60 @@
     HRESULT init (Bstr interfaceName, Guid guid);
 #ifdef VBOX_WITH_HOSTNETIF_API
-    HRESULT init (PRTNETIFINFO pIfs);
+    HRESULT init (PNETIFINFO pIfs);
 #endif
 
@@ -69 +69 @@
     STDMETHOD(COMGETTER(NetworkMask)) (ULONG *aNetworkMask);
     STDMETHOD(COMGETTER(IPV6Address)) (BSTR *aIPV6Address);
+    STDMETHOD(COMGETTER(IPV6NetworkMask)) (BSTR *aIPV6Mask);
     STDMETHOD(COMGETTER(HardwareAddress)) (BSTR *aHardwareAddress);
     STDMETHOD(COMGETTER(Type)) (HostNetworkInterfaceType_T *aType);
@@ -88 +89 @@
         ULONG networkMask;
         Bstr IPV6Address;
+        Bstr IPV6NetworkMask;
         Bstr hardwareAddress;
         HostNetworkInterfaceType_T type;

trunk/src/VBox/Runtime/Makefile.kmk

@@ -287 +287 @@
         r3/tcp.cpp
 
-ifdef VBOX_WITH_HOSTNETIF_API
- RuntimeR3_SOURCES     += \
-        generic/RTNetIfList-generic.cpp
- RuntimeR3_DEFS        += VBOX_WITH_HOSTNETIF_API
-endif
-
 #if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
 # RuntimeR3_SOURCES += common/time/timesupA.asm