儲存庫 vbox 的更動 17319

時間撮記:

2009-3-4 上午03:18:37 (16 年 以前)

作者:

vboxsync

訊息:

IPRT: Added RTGETOPT_REQ_IPV4ADDR to RTGetOpt.

位置:

trunk

檔案:

• include/iprt/getopt.h (修改) (3 筆差異)
• src/VBox/Runtime/common/misc/getopt.cpp (修改) (3 筆差異)
• src/VBox/Runtime/testcase/tstGetOpt.cpp (修改) (4 筆差異)

trunk/include/iprt/getopt.h

@@ -70 +70 @@
 /** The value must be a valid unsigned 64-bit integer or an error will be returned. */
 #define RTGETOPT_REQ_UINT64                     9
+/** The value must be a valid IPv4 address.
+ * (Not a name, but 4 values in the 0..255 range with dots separating them). */
+#define RTGETOPT_REQ_IPV4ADDR                   10
 /** The mask of the valid required types. */
 #define RTGETOPT_REQ_MASK                       15
@@ -117 +120 @@
      * This can be NULL for some errors. */
     PCRTGETOPTDEF   pDef;
-    /** A RTGETOPT_ARG_FORMAT_STRING option argument. */
+    /** A RTGETOPT_REQ_STRING option argument. */
     const char     *psz;
 
@@ -124 +127 @@
 #endif
 
-    /** A RTGETOPT_ARG_FORMAT_INT8 option argument. */
+    /** A RTGETOPT_REQ_INT8 option argument. */
     int8_t          i8;
-    /** A RTGETOPT_ARG_FORMAT_UINT8 option argument . */
+    /** A RTGETOPT_REQ_UINT8 option argument . */
     uint8_t         u8;
-    /** A RTGETOPT_ARG_FORMAT_INT16 option argument. */
+    /** A RTGETOPT_REQ_INT16 option argument. */
     int16_t         i16;
-    /** A RTGETOPT_ARG_FORMAT_UINT16 option argument . */
+    /** A RTGETOPT_REQ_UINT16 option argument . */
     uint16_t        u16;
-    /** A RTGETOPT_ARG_FORMAT_INT16 option argument. */
+    /** A RTGETOPT_REQ_INT16 option argument. */
     int32_t         i32;
-    /** A RTGETOPT_ARG_FORMAT_UINT32 option argument . */
+    /** A RTGETOPT_REQ_UINT32 option argument . */
     uint32_t        u32;
-    /** A RTGETOPT_ARG_FORMAT_INT64 option argument. */
+    /** A RTGETOPT_REQ_INT64 option argument. */
     int64_t         i64;
-    /** A RTGETOPT_ARG_FORMAT_UINT64 option argument. */
+    /** A RTGETOPT_REQ_UINT64 option argument. */
     uint64_t        u64;
+#ifdef ___iprt_net_h
+    /** A RTGETOPT_REQ_IPV4ADDR option argument. */
+    RTNETADDRIPV4   IPv4Addr;
+#endif
     /** A signed integer value. */
     int64_t         i;

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

@@ -32 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include <iprt/net.h>
 #include <iprt/getopt.h>
 #include <iprt/err.h>
@@ -64 +65 @@
     /** @todo Add an flag for sorting the arguments so that all the options comes
      *        first. */
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Converts an stringified IPv4 address into the RTNETADDRIPV4 representation.
+ *
+ * This should be move to some generic part of the runtime.
+ *
+ * @returns VINF_SUCCESS on success, VERR_GETOPT_INVALID_ARGUMENT_FORMAT on
+ *          failure.
+ *
+ * @param   pszValue        The value to convert.
+ * @param   pAddr           Where to store the result.
+ */
+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;
+
     return VINF_SUCCESS;
 }
@@ -315 +359 @@
                 MY_BASE_INT_CASE(RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_OCT, uint32_t, u,   RTStrToUInt32Full, 8)
                 MY_BASE_INT_CASE(RTGETOPT_REQ_UINT64 | RTGETOPT_FLAG_OCT, uint64_t, u,   RTStrToUInt64Full, 8)
+
 #undef MY_INT_CASE
 #undef MY_BASE_INT_CASE
+
+                case RTGETOPT_REQ_IPV4ADDR:
+                {
+                    RTNETADDRIPV4 Addr;
+                    if (rtgetoptConvertIPv4Addr(pszValue, &Addr) != VINF_SUCCESS)
+                        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
+                    pValueUnion->IPv4Addr = Addr;
+                    break;
+                }
 
                 default:

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

@@ -30 +30 @@
 
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include <iprt/net.h>
 #include <iprt/getopt.h>
 #include <iprt/stream.h>
@@ -83 +87 @@
         { "nodash",             387, RTGETOPT_REQ_NOTHING },
         { "nodashval",          388, RTGETOPT_REQ_STRING },
+        { "--gateway",          'g', RTGETOPT_REQ_IPV4ADDR },
     };
 
@@ -118 +123 @@
 
         "-vqi999",
+
+        "-g192.168.1.1",
         NULL
     };
@@ -191 +198 @@
     CHECK(Val.i32 == 999);
 
+    /* IPv4 */
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 'g', 1);
+    CHECK(Val.IPv4Addr.u == RT_H2N_U32_C(RT_BSWAP_U32_C(RT_MAKE_U32_FROM_U8(192,168,1,1))));
+
     /* the end */
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 0, 0);