Changeset 17380 in vbox

Timestamp:

Mar 5, 2009 10:05:30 AM (16 years ago)

Author:

vboxsync

Message:

Main: net if API fixes

Location:

trunk/src/VBox/Main

Files:

• HostNetworkInterfaceImpl.cpp (modified) (1 diff)
• include/netif.h (modified) (1 diff)
• win/NetIfList-win.cpp (modified) (1 diff)

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -75 +75 @@
 
 #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);
-}
 
 HRESULT HostNetworkInterface::updateConfig (struct NETIFINFO *pIf)

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

@@ -82 +82 @@
 int NetIfEnableDynamicIpConfig(HostNetworkInterface * pIf);
 
+DECLINLINE(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);
+}
+
+DECLINLINE(int) prefixLength2IPv6Address(ULONG cPrefix, PRTNETADDRIPV6 aAddrPtr)
+{
+    if(cPrefix > 128)
+        return VERR_INVALID_PARAMETER;
+    if(!aAddrPtr)
+        return VERR_INVALID_PARAMETER;
+
+    ULONG index    = cPrefix >> 3;
+    ULONG subindex = cPrefix & 0x7;
+    ULONG i;
+
+    for(i = 0; i < index; i++)
+        aAddrPtr->au8[i] = ~0;
+
+    for(i = index + 1; i < 16; i++)
+        aAddrPtr->au8[i] = 0;
+
+    if(subindex)
+        aAddrPtr->au32[index] = (~0) >> (8 - subindex);
+
+    return VINF_SUCCESS;
+}
+
+DECLINLINE(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);
+}
+
 #endif
 

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

@@ -733 +733 @@
 int NetIfEnableStaticIpConfigV6(HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength, IN_BSTR aIPV6DefaultGateway)
 {
-    return VERR_GENERAL_FAILURE;
+    RTNETADDRIPV6 Mask;
+    int rc = prefixLength2IPv6Address(aIPV6MaskPrefixLength, &Mask);
+    if(RT_SUCCESS(rc))
+    {
+        Bstr maskStr = composeIPv6Address(&Mask);
+        rc = NetIfEnableStaticIpConfigV6(pIf, aIPV6Address, maskStr, aIPV6DefaultGateway);
+    }
+    return rc;
 }