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

Timestamp:

Jun 15, 2017 9:41:18 PM (8 years ago)

Author:

vboxsync

Message:

Main: ASMBitSetRange and ASMBitFirstClear don't do the right thing for
network masks because of the wrong bit-order. Use new
RTNetMaskToPrefixIPv6 and RTNetPrefixToMaskIPv6 instead.

Location:

trunk/src/VBox/Main

Files:

• include/netif.h (modified) (1 diff)
• src-server/HostNetworkInterfaceImpl.cpp (modified) (2 diffs)
• src-server/win/NetIf-win.cpp (modified) (4 diffs)

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

@@ -117 +117 @@
 }
 
-DECLINLINE(ULONG) composeIPv6PrefixLenghFromAddress(PRTNETADDRIPV6 aAddrPtr)
-{
-    int res = ASMBitFirstClear(aAddrPtr, sizeof(RTNETADDRIPV6)*8);
-    return res != -1 ? res : 128;
-}
-
-DECLINLINE(int) prefixLength2IPv6Address(ULONG cPrefix, PRTNETADDRIPV6 aAddrPtr)
-{
-    if (cPrefix > 128)
-        return VERR_INVALID_PARAMETER;
-    if (!aAddrPtr)
-        return VERR_INVALID_PARAMETER;
-
-    RT_ZERO(*aAddrPtr);
-
-    ASMBitSetRange(aAddrPtr, 0, cPrefix);
-
-    return VINF_SUCCESS;
-}
-
 DECLINLINE(Bstr) composeHardwareAddress(PRTMAC aMacPtr)
 {

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -163 +163 @@
     if (RT_SUCCESS(rc))
     {
+        int iPrefixIPv6;
+
         m.realIPAddress = m.IPAddress = info.IPAddress.u;
         m.realNetworkMask = m.networkMask = info.IPNetMask.u;
         m.dhcpEnabled = info.bDhcpEnabled;
         m.realIPV6Address = m.IPV6Address = composeIPv6Address(&info.IPv6Address);
-        m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = composeIPv6PrefixLenghFromAddress(&info.IPv6NetMask);
+        RTNetMaskToPrefixIPv6(&info.IPv6NetMask, &iPrefixIPv6);
+        m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = iPrefixIPv6;
         m.hardwareAddress = composeHardwareAddress(&info.MACAddress);
 #ifdef RT_OS_WINDOWS
@@ -220 +223 @@
     mIfType = ifType;
 
+    int iPrefixIPv6;
+
     m.realIPAddress = m.IPAddress = pIf->IPAddress.u;
     m.realNetworkMask = m.networkMask = pIf->IPNetMask.u;
     m.realIPV6Address = m.IPV6Address = composeIPv6Address(&pIf->IPv6Address);
-    m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = composeIPv6PrefixLenghFromAddress(&pIf->IPv6NetMask);
+    RTNetMaskToPrefixIPv6(&pIf->IPv6NetMask, &iPrefixIPv6);
+    m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = iPrefixIPv6;
     m.dhcpEnabled = pIf->bDhcpEnabled;
     m.hardwareAddress = composeHardwareAddress(&pIf->MACAddress);

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

@@ -25 +25 @@
 #define NETIF_WITHOUT_NETCFG
 
-#include <iprt/asm.h>
 #include <iprt/err.h>
 #include <list>
@@ -181 +180 @@
                                     {
                                         fIPv6Found = true;
-                                        ASMBitSetRange(&pInfo->IPv6NetMask, 0, pPrefix->PrefixLength);
+                                        RTNetPrefixToMaskIPv6(pPrefix->PrefixLength, &pInfo->IPv6NetMask);
                                     }
                                     else
@@ -1715 +1714 @@
                     {
                         uPrefixLenV6 = pPrefix->PrefixLength;
-                        ASMBitSetRange(&pInfo->IPv6NetMask, 0, pPrefix->PrefixLength);
+                        RTNetPrefixToMaskIPv6(pPrefix->PrefixLength, &pInfo->IPv6NetMask);
                     }
                     else
@@ -1775 +1774 @@
                         netIfLog(("netIfFillInfoWithAddresses: Invalid IPv6 prefix length of %d\n", pAddrLh->OnLinkPrefixLength));
                     else
-                        ASMBitSetRange(&pInfo->IPv6NetMask, 0, pAddrLh->OnLinkPrefixLength);
+                        RTNetPrefixToMaskIPv6(pAddrLh->OnLinkPrefixLength, &pInfo->IPv6NetMask);
                 }
                 break;
         }
     }
-    netIfLog(("netIfFillInfoWithAddresses: %RTnaipv4/%u\n",
-              pInfo->IPAddress, ASMBitFirstClear(&pInfo->IPNetMask, sizeof(RTNETADDRIPV4)*8)));
-    netIfLog(("netIfFillInfoWithAddresses: %RTnaipv6/%u\n",
-              &pInfo->IPv6Address, composeIPv6PrefixLenghFromAddress(&pInfo->IPv6NetMask)));
+
+    if (fIPFound)
+    {
+        int iPrefixIPv4 = -1;
+        RTNetMaskToPrefixIPv4(&pInfo->IPNetMask, &iPrefixIPv4);
+        netIfLog(("netIfFillInfoWithAddresses: %RTnaipv4/%u\n", pInfo->IPAddress, iPrefixIPv4));
+    }
+    if (fIPv6Found)
+    {
+        int iPrefixIPv6 = -1;
+        RTNetMaskToPrefixIPv6(&pInfo->IPv6NetMask, &iPrefixIPv6);
+        netIfLog(("netIfFillInfoWithAddresses: %RTnaipv6/%u\n", &pInfo->IPv6Address, iPrefixIPv6));
+    }
 }