Changeset 76061 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Dec 7, 2018 3:13:22 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Add RTNetStrToIPv4Cidr() that is intended as a better API
replacement for RTCidrStrToIPv4(). Existing call sites for the latter
are not converted to the new function yet to avoid risky churn right
before the release.

File:

• trunk/src/VBox/Runtime/common/net/netaddrstr2.cpp (modified) (1 diff)

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

@@ -196 +196 @@
 
 
+RTDECL(int) RTNetStrToIPv4Cidr(const char *pcszAddr, PRTNETADDRIPV4 pAddr, int *piPrefix)
+{
+    RTNETADDRIPV4 Addr;
+    uint8_t u8Prefix;
+    char *pszNext;
+    int rc;
+
+    AssertPtrReturn(pcszAddr, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pAddr, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(piPrefix, VERR_INVALID_PARAMETER);
+
+    pcszAddr = RTStrStripL(pcszAddr);
+    rc = rtNetStrToIPv4AddrEx(pcszAddr, &Addr, &pszNext);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* if prefix is missing, treat is as exact (/32) address specification */
+    if (*pszNext == '\0' || rc == VWRN_TRAILING_SPACES)
+    {
+        *pAddr = Addr;
+        *piPrefix = 32;
+        return VINF_SUCCESS;
+    }
+
+    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;
+
+    if (u8Prefix == 0 || u8Prefix > 32)
+        return VERR_INVALID_PARAMETER;
+
+    *pAddr = Addr;
+    *piPrefix = u8Prefix;
+    return VINF_SUCCESS;
+}
+RT_EXPORT_SYMBOL(RTNetStrToIPv4Cidr);
+
+
 static int rtNetStrToHexGroup(const char *pcszValue, char **ppszNext,
                               uint16_t *pu16)