Changeset 45115 in vbox for trunk/src/VBox

Timestamp:

Mar 21, 2013 8:01:54 AM (12 years ago)

Author:

vboxsync

Message:

RT/net: rt-network-str2ipv4.patch from xTRacker/5894 with applyed recommendations in comment 90.
introduces RTNetStrToIPv4Addr: char* -> RTNETADDRIP4.

Location:

trunk/src/VBox/Runtime/common

Files:

• misc/getopt.cpp (modified) (2 diffs)
• net/netaddrstr.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/misc/getopt.cpp

@@ -93 +93 @@
  * Converts an stringified IPv4 address into the RTNETADDRIPV4 representation.
  *
- * @todo This should be move to some generic part of the runtime.
- *
  * @returns VINF_SUCCESS on success, VERR_GETOPT_INVALID_ARGUMENT_FORMAT on
  *          failure.
@@ -103 +101 @@
 static int rtgetoptConvertIPv4Addr(const char *pszValue, PRTNETADDRIPV4 pAddr)
 {
-    char *pszNext;
-    int rc = RTStrToUInt8Ex(RTStrStripL(pszValue), &pszNext, 10, &pAddr->au8[0]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-    if (*pszNext++ != '.')
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[1]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-    if (*pszNext++ != '.')
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[2]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-    if (*pszNext++ != '.')
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[3]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_SPACES)
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-    pszNext = RTStrStripL(pszNext);
-    if (*pszNext)
-        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
-
+    if (RT_FAILURE(RTNetStrToIPv4Addr(pszValue, pAddr)))
+        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
     return VINF_SUCCESS;
 }

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

@@ -1285 +1285 @@
 RT_EXPORT_SYMBOL(RTNetIsIPv4AddrStr);
 
+RTDECL(int) RTNetStrToIPv4Addr(const char *pszAddr, PRTNETADDRIPV4 pAddr)
+{
+    char *pszNext;
+    AssertPtrReturn(pszAddr, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pAddr, VERR_INVALID_PARAMETER);
+
+    int rc = RTStrToUInt8Ex(RTStrStripL(pszAddr), &pszNext, 10, &pAddr->au8[0]);
+    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
+        return VERR_INVALID_PARAMETER;
+    if (*pszNext++ != '.')
+        return VERR_INVALID_PARAMETER;
+
+    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[1]);
+    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
+        return VERR_INVALID_PARAMETER;
+    if (*pszNext++ != '.')
+        return VERR_INVALID_PARAMETER;
+
+    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[2]);
+    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
+        return VERR_INVALID_PARAMETER;
+    if (*pszNext++ != '.')
+        return VERR_INVALID_PARAMETER;
+
+    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[3]);
+    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_SPACES)
+        return VERR_INVALID_PARAMETER;
+    pszNext = RTStrStripL(pszNext);
+    if (*pszNext)
+        return VERR_INVALID_PARAMETER;
+
+    return VINF_SUCCESS;
+}
+RT_EXPORT_SYMBOL(RTNetStrToIPv4Addr);