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

Timestamp:

Jan 21, 2021 10:05:41 PM (4 years ago)

Author:

vboxsync

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

142343

Message:

IPRT: Make RTNetStrToIPv4Cidr() accept prefix specified as netmask,
either dotted-decimal or hex. The inputs we convert here are likely
coming from a user and people have different preferences. Sometimes
they even remember specific different networks in specific formats (I
know I do :). bugref:9330

Location:

trunk/src/VBox/Runtime

Files:

• common/net/netaddrstr2.cpp (modified) (3 diffs)
• testcase/tstRTNetIPv4.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp

@@ -199 +199 @@
 RTDECL(int) RTNetStrToIPv4Cidr(const char *pcszAddr, PRTNETADDRIPV4 pAddr, int *piPrefix)
 {
-    RTNETADDRIPV4 Addr;
+    RTNETADDRIPV4 Addr, Mask;
     uint8_t u8Prefix;
     char *pszNext;
@@ -213 +213 @@
         return rc;
 
-    /* if prefix is missing, treat is as exact (/32) address specification */
+    /*
+     * If the prefix is missing, treat is as exact (/32) address
+     * specification.
+     */
     if (*pszNext == '\0' || rc == VWRN_TRAILING_SPACES)
     {
@@ -221 +224 @@
     }
 
-    if (*pszNext != '/')
-        return VERR_INVALID_PARAMETER;
-
-    ++pszNext;
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &u8Prefix);
-    if (RT_FAILURE(rc) || rc == VWRN_TRAILING_CHARS)
-        return VERR_INVALID_PARAMETER;
+    /*
+     * Be flexible about the way the prefix is specified after the
+     * slash: accept both the prefix length and the netmask, and for
+     * the latter accept both dotted-decimal and hex.  The inputs we
+     * convert here are likely coming from a user and people have
+     * different preferences.  Sometimes they just remember specific
+     * different networks in specific formats!
+     */
+    if (*pszNext == '/')
+        ++pszNext;
+    else
+        return VERR_INVALID_PARAMETER;
+
+    /* .../0x... is a hex mask */
+    if (pszNext[0] == '0' && (pszNext[1] == 'x' || pszNext[1] == 'X'))
+    {
+        rc = RTStrToUInt32Ex(pszNext, &pszNext, 16, &Mask.u);
+        if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_SPACES)
+            Mask.u = RT_H2N_U32(Mask.u);
+        else
+            return VERR_INVALID_PARAMETER;
+
+        int iPrefix;
+        rc = RTNetMaskToPrefixIPv4(&Mask, &iPrefix);
+        if (RT_SUCCESS(rc))
+            u8Prefix = (uint8_t)iPrefix;
+        else
+            return VERR_INVALID_PARAMETER;
+    }
+    else
+    {
+        char *pszLookAhead;
+        uint32_t u32;
+        rc = RTStrToUInt32Ex(pszNext, &pszLookAhead, 10, &u32);
+
+        /* single number after the slash is prefix length */
+        if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_SPACES)
+        {
+            if (u32 <= 32)
+                u8Prefix = (uint8_t)u32;
+            else
+                return VERR_INVALID_PARAMETER;
+        }
+        /* a number followed by more stuff, may be a dotted-decimal */
+        else if (rc == VWRN_TRAILING_CHARS)
+        {
+            if (*pszLookAhead != '.') /* don't even bother checking */
+                return VERR_INVALID_PARAMETER;
+
+            rc = rtNetStrToIPv4AddrEx(pszNext, &Mask, &pszNext);
+            if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_SPACES)
+            {
+                int iPrefix;
+                rc = RTNetMaskToPrefixIPv4(&Mask, &iPrefix);
+                if (RT_SUCCESS(rc))
+                    u8Prefix = (uint8_t)iPrefix;
+                else
+                    return VERR_INVALID_PARAMETER;
+            }
+            else
+                return VERR_INVALID_PARAMETER;
+        }
+        /* failed to convert to number */
+        else
+            return VERR_INVALID_PARAMETER;
+    }
 
     if (u8Prefix == 0 || u8Prefix > 32)

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

@@ -311 +311 @@
     GOODCIDR("1.2.3.4/24",      0x01020304, 24); /* address is not truncated to prefix */
 
+    GOODCIDR("1.2.3.0/0xffffff00",      0x01020300, 24);
+    GOODCIDR("1.2.3.4/0xffffff00",      0x01020304, 24);
+    GOODCIDR("1.2.3.4/0xffffffff",      0x01020304, 32);
+
+    GOODCIDR("1.2.3.0/255.255.255.0",   0x01020300, 24);
+    GOODCIDR("1.2.3.4/255.255.255.0",   0x01020304, 24);
+    GOODCIDR("1.2.3.4/255.255.255.255", 0x01020304, 32);
+
     GOODCIDR("\t " "1.2.3.4/24",       0x01020304, 24); /* leading spaces ok */
     GOODCIDR(      "1.2.3.4/24" " \t", 0x01020304, 24); /* trailing spaces ok */
     GOODCIDR("\t " "1.2.3.4/24" " \t", 0x01020304, 24); /* both are ok */
+
+    /* trailing space with netmask notation */
+    GOODCIDR("1.2.3.0/0xffffff00" " ",    0x01020300, 24);
+    GOODCIDR("1.2.3.0/255.255.255.0" " ", 0x01020300, 24);
+
+    BADCIDR("1.2.3.4/24.");
+    BADCIDR("1.2.3.4/24 .");
+    BADCIDR("1.2.3.4/240.");
+    BADCIDR("1.2.3.4/240.");
 
     BADCIDR("1.2.3.4/0");       /* prefix can't be zero */
@@ -329 +346 @@
     BADCIDR("1.2.3.0/24" " x"); /* trailing chars */
 
-
+    BADCIDR("1.2.3.0/0xffffff01");    /* non-contiguous mask */
+    BADCIDR("1.2.3.0/255.255.255.1"); /* non-contiguous mask */
 
     /* NB: RTNetIsIPv4AddrStr does NOT allow leading/trailing whitespace */