Changeset 67431 in vbox for trunk/src/VBox/Main/src-server/win

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.

File:

• trunk/src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (4 diffs)

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));
+    }
 }