Changeset 50418 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Feb 11, 2014 6:50:58 PM (11 years ago)

Author:

vboxsync

Message:

Add RTNetStrToIPv4AddrEx - a variant of IPv4 dotted-decimal parsing
function with ppszNext argument. Express RTNetStrToIPv4Addr and
RTNetIsIPv4AddrStr in its terms.

Note that RTNetIsIPv4AddrStr does not accept leading/trailing
whitespace while RTNetStrToIPv4Addr does - this is existing behaviour
that these changes keep.

File:

• trunk/src/VBox/Runtime/testcase/tstRTNetIPv4.cpp (modified) (2 diffs)

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

@@ -66 +66 @@
 
 
+#define CHECKADDREX(String, Trailer, rcExpected, ExpectedAddr)          \
+    do {                                                                \
+        RTNETADDRIPV4 Addr;                                             \
+        const char *strAll = String /* concat */ Trailer;               \
+        const char *pTrailer = strAll + sizeof(String) - 1;             \
+        char *pNext = NULL;                                             \
+        int rc2 = RTNetStrToIPv4AddrEx(strAll, &Addr, &pNext);          \
+        if ((rcExpected) && !rc2)                                       \
+        {                                                               \
+            RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc\n", \
+                          __LINE__, String, (rcExpected), rc2);         \
+        }                                                               \
+        else if ((rcExpected) != rc2                                    \
+                 || (rc2 == VINF_SUCCESS                                \
+                     && (RT_H2N_U32_C(ExpectedAddr) != Addr.u           \
+                         || pTrailer != pNext)))                        \
+        {                                                               \
+            RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc,"   \
+                          " expected address %RTnaipv4 got %RTnaipv4"   \
+                          " expected trailer \"%s\" got %s%s%s"         \
+                          "\n",                                         \
+                          __LINE__, String, rcExpected, rc2,            \
+                          RT_H2N_U32_C(ExpectedAddr), Addr.u,           \
+                          pTrailer,                                     \
+                          pNext ? "\"" : "",                            \
+                          pNext ? pNext : "(null)",                     \
+                          pNext ? "\"" : "");                           \
+        }                                                               \
+    } while (0)
+
+
 int main()
 {
@@ -91 +122 @@
     BADADDR("1.2.3.666");
 
+    /*
+     * Parsing itself is covered by the tests above, here we only
+     * check trailers
+     */
+    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.444", "",  VERR_INVALID_PARAMETER,          0);
+
     return RTTestSummaryAndDestroy(hTest);
 }