Changeset 29837 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

May 27, 2010 10:01:51 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

62053

Message:

Runtime: fixed cDelimiterLimit calculation, short form (n.n/16 is the same as n.n.0.0/16). more testcases added.

File:

• trunk/src/VBox/Runtime/common/misc/cidr.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/misc/cidr.cpp

@@ -55 +55 @@
     *(uint32_t *)addr = 0;
     if (pszNetmask == NULL)
-        cBits = 0; 
+        cBits = 32; 
     else 
     { 
@@ -72 +72 @@
     if (cBits < 9)
         cDelimiterLimit = 0;
-    else if (cBits < 16)
+    else if (cBits <= 16)
         cDelimiterLimit = 1;
-    else if (cBits < 25)
+    else if (cBits <= 24)
         cDelimiterLimit = 2;
     else if (cBits <= 32)
@@ -84 +84 @@
         if (*pszNext == '.')
             cDelimiter++;
-        else if(cDelimiter >= cDelimiterLimit)
+        else if(   cDelimiter >= cDelimiterLimit
+                && (   *pszNext == '\0'
+                    || *pszNext == '/'))
             break;
         else