Changeset 71435 in vbox for trunk/src

Timestamp:

Mar 21, 2018 2:30:29 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/net: RTNetStrToIPv4AddrEx - return VWRN_TRAILING_SPACES and
VWRN_TRAILING_CHARS. Adapt callers. Add more test cases to make sure
trailers are handled as before.

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

@@ -72 +72 @@
     if (ppszNext != NULL)
         *ppszNext = pszNext;
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -94 +94 @@
     pcszAddr = RTStrStripL(pcszAddr);
     rc = rtNetStrToIPv4AddrEx(pcszAddr, pAddr, &pszNext);
-    if (rc != VINF_SUCCESS)
-        return VERR_INVALID_PARAMETER;
-
-    pszNext = RTStrStripL(pszNext);
-    if (*pszNext != '\0')
+    if (RT_FAILURE(rc) || rc == VWRN_TRAILING_CHARS)
         return VERR_INVALID_PARAMETER;
 
@@ -138 +134 @@
     pcszAddr = RTStrStripL(pcszAddr);
     rc = rtNetStrToIPv4AddrEx(pcszAddr, &addrIPv4, &pszNext);
-    if (rc != VINF_SUCCESS)
-        return false;
-
-    pszNext = RTStrStripL(pszNext);
-    if (*pszNext != '\0')
+    if (RT_FAILURE(rc) || rc == VWRN_TRAILING_CHARS)
         return false;
 

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

@@ -97 +97 @@
 
 
+#define CHECKISADDR(String, fExpected)                                  \
+    do {                                                                \
+        bool fRc = RTNetIsIPv4AddrStr(String);                          \
+        if (fRc != fExpected)                                           \
+        {                                                               \
+            RTTestIFailed("at line %d: '%s':"                           \
+                          " expected %RTbool got %RTbool\n",            \
+                          __LINE__, (String), fExpected, fRc);          \
+        }                                                               \
+    } while (0)
+
+#define IS_ADDR(String)  CHECKISADDR((String), true)
+#define NOT_ADDR(String) CHECKISADDR((String), false)
+
+
 #define CHECKANY(String, fExpected)                                     \
     do {                                                                \
@@ -256 +271 @@
      */
     CHECKADDREX("1.2.3.4",  "",   VINF_SUCCESS,           0x01020304);
-    CHECKADDREX("1.2.3.4",  " ",  VINF_SUCCESS,           0x01020304);
-    CHECKADDREX("1.2.3.4",  "x",  VINF_SUCCESS,           0x01020304);
+    CHECKADDREX("1.2.3.4",  " ",  VWRN_TRAILING_SPACES,   0x01020304);
+    CHECKADDREX("1.2.3.4",  "x",  VWRN_TRAILING_CHARS,    0x01020304);
     CHECKADDREX("1.2.3.444", "",  VERR_INVALID_PARAMETER,          0);
 
+    /* NB: RTNetIsIPv4AddrStr does NOT allow leading/trailing whitespace */
+    IS_ADDR("1.2.3.4");
+    NOT_ADDR(" 1.2.3.4");
+    NOT_ADDR("1.2.3.4 ");
+    NOT_ADDR("1.2.3.4x");
 
     IS_ANY("0.0.0.0");
-    IS_ANY("\t 0.0.0.0 \t");
+    IS_ANY("\t 0.0.0.0 \t");    /* ... but RTNetStrIsIPv4AddrAny does */
 
     NOT_ANY("1.1.1.1");         /* good address, but not INADDR_ANY */