Changeset 91919 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 21, 2021 1:10:52 AM (3 years ago)

Author:

vboxsync

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

147724

Message:

IPRT: Make RTNetStrToIPv4Cidr() and RTNetStrToIPv4Cidr() accept zero
prefix, mostly for the benefit of 0.0.0.0/0 and ::/0 respectively.

While here fix RTNetStrToIPv6Cidr to do stricter checks on the prefix.
When the number is too big RTStrToUInt8Ex returns a warning, not an
error. bugref:9330.

(should have been part of r147723).

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstRTNetIPv4.cpp (modified) (2 diffs)
• tstRTNetIPv6.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/testcase/tstRTNetIPv4.cpp

@@ -319 +319 @@
     GOODCIDR("1.2.3.4/255.255.255.255", 0x01020304, 32);
 
-#if 0
-    /** @todo doesn't support 0/0 yet */
     GOODCIDR("0.0.0.0/0",       0x00000000,  0);
     GOODCIDR("0.0.0.0/0x0",     0x00000000,  0);
     GOODCIDR("0.0.0.0/0.0.0.0", 0x00000000,  0);
-#endif
+
+    /*
+     * we allow zero prefix mostly for the sake of the above
+     * "everything"/default case, but allow it on everything - a
+     * conscientious caller should be doing more checks on the result
+     * anyway.
+     */
+    GOODCIDR("1.2.3.4/0",       0x01020304,  0);        /* prefix can be zero */
 
     GOODCIDR("\t " "1.2.3.4/24",       0x01020304, 24); /* leading spaces ok */
@@ -339 +344 @@
     BADCIDR("1.2.3.4/240.");
 
-    BADCIDR("1.2.3.4/0");       /* prefix can't be zero */
     BADCIDR("1.2.3.4/33");      /* prefix is too big */
+    BADCIDR("1.2.3.4/256");     /* prefix is too big */
+    BADCIDR("1.2.3.4/257");     /* prefix is too big */
     BADCIDR("1.2.3.4/-1");      /* prefix is negative */
     BADCIDR("1.2.3.4/");        /* prefix is missing */

trunk/src/VBox/Runtime/testcase/tstRTNetIPv6.cpp

@@ -247 +247 @@
     GOODCIDR("1:2:3:4::%if/64", 0x00010002, 0x00030004,          0,          0,  64);
 
-#if 0
-    /** @todo doesn't support ::/0 yet */
+
     GOODCIDR("::/0", 0, 0, 0, 0, 0);
-#endif
+
+    /*
+     * we allow zero prefix mostly for the sake of the above
+     * "everything"/default case, but allow it on everything - a
+     * conscientious caller should be doing more checks on the result
+     * anyway.
+     */
+    GOODCIDR("1:2:3:4::/0",    0x00010002, 0x00030004,          0,          0,    0);
+
 
     BADCIDR("1:2:3:4:: 64");
     BADCIDR("1:2:3:4::/64x");
-    BADCIDR("1:2:3:4::/0");
     BADCIDR("1:2:3:4::/-1");
     BADCIDR("1:2:3:4::/129");