Changeset 17441 in vbox

Timestamp:

Mar 6, 2009 7:05:58 AM (16 years ago)

Author:

vboxsync

Message:

IPRT/RTGetOpt: Added RTGETOPT_REQ_MACADDR.

Location:

trunk

Files:

• include/iprt/getopt.h (modified) (2 diffs)
• src/VBox/Runtime/common/misc/getopt.cpp (modified) (3 diffs)
• src/VBox/Runtime/testcase/tstGetOpt.cpp (modified) (3 diffs)

trunk/include/iprt/getopt.h

@@ -73 +73 @@
  * (Not a name, but 4 values in the 0..255 range with dots separating them). */
 #define RTGETOPT_REQ_IPV4ADDR                   10
+#if 0
+/** The value must be a valid IPv4 CIDR.
+ * As with RTGETOPT_REQ_IPV4ADDR, no name.
+ * @todo Mix CIDR with types.h or/and net.h first and find a way to make the
+ *       mask optional like with ifconfig. See RTCidrStrToIPv4. */
+#define RTGETOPT_REQ_IPV4CIDR                   11
+#endif
+/** The value must be a valid ethernet MAC address. */
+#define RTGETOPT_REQ_MACADDR                    14
 /** The mask of the valid required types. */
 #define RTGETOPT_REQ_MASK                       15
@@ -147 +156 @@
     RTNETADDRIPV4   IPv4Addr;
 #endif
+    /** A RTGETOPT_REQ_MACADDR option argument. */
+    RTMAC           MacAddr;
     /** A signed integer value. */
     int64_t         i;

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

@@ -72 +72 @@
  * Converts an stringified IPv4 address into the RTNETADDRIPV4 representation.
  *
- * This should be move to some generic part of the runtime.
+ * @todo This should be move to some generic part of the runtime.
  *
  * @returns VINF_SUCCESS on success, VERR_GETOPT_INVALID_ARGUMENT_FORMAT on
@@ -102 +102 @@
 
     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;
+}
+
+
+/**
+ * Converts an stringified Ethernet MAC address into the RTMAC 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.
+ *
+ * @param   pszValue        The value to convert.
+ * @param   pAddr           Where to store the result.
+ */
+static int rtgetoptConvertMacAddr(const char *pszValue, PRTMAC pAddr)
+{
+    /*
+     * Not quite sure if I should accept stuff like "08::27:::1" here...
+     * The code is accepting "::" patterns now, except for for the first
+     * and last parts.
+     */
+
+    /* first */
+    char *pszNext;
+    int rc = RTStrToUInt8Ex(RTStrStripL(pszValue), &pszNext, 16, &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;
+
+    /* middle */
+    for (unsigned i = 1; i < 5; i++)
+    {
+        if (*pszNext == ':')
+            pAddr->au8[i] = 0;
+        else
+        {
+            rc = RTStrToUInt8Ex(pszNext, &pszNext, 16, &pAddr->au8[i]);
+            if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
+                return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
+            if (*pszNext != ':')
+                return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
+        }
+        pszNext++;
+    }
+
+    /* last */
+    rc = RTStrToUInt8Ex(pszNext, &pszNext, 16, &pAddr->au8[5]);
     if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_SPACES)
         return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
@@ -371 +426 @@
                     break;
                 }
+#if 0  /** @todo CIDR */
+#endif
+
+                case RTGETOPT_REQ_MACADDR:
+                {
+                    RTMAC Addr;
+                    if (rtgetoptConvertMacAddr(pszValue, &Addr) != VINF_SUCCESS)
+                        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
+                    pValueUnion->MacAddr = Addr;
+                    break;
+                }
 
                 default:

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

@@ -88 +88 @@
         { "nodashval",          388, RTGETOPT_REQ_STRING },
         { "--gateway",          'g', RTGETOPT_REQ_IPV4ADDR },
+        { "--mac",              'm', RTGETOPT_REQ_MACADDR },
     };
 
@@ -125 +126 @@
 
         "-g192.168.1.1",
+
+        "-m08:0:27:00:ab:f3",
+        "--mac:1:::::c",
+
         NULL
     };
@@ -202 +207 @@
     CHECK(Val.IPv4Addr.u == RT_H2N_U32_C(RT_BSWAP_U32_C(RT_MAKE_U32_FROM_U8(192,168,1,1))));
 
+    /* Ethernet MAC address. */
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 'm', 1);
+    CHECK(   Val.MacAddr.au8[0] == 0x08
+          && Val.MacAddr.au8[1] == 0x00
+          && Val.MacAddr.au8[2] == 0x27
+          && Val.MacAddr.au8[3] == 0x00
+          && Val.MacAddr.au8[4] == 0xab
+          && Val.MacAddr.au8[5] == 0xf3);
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 'm', 1);
+    CHECK(   Val.MacAddr.au8[0] == 0x01
+          && Val.MacAddr.au8[1] == 0x00
+          && Val.MacAddr.au8[2] == 0x00
+          && Val.MacAddr.au8[3] == 0x00
+          && Val.MacAddr.au8[4] == 0x00
+          && Val.MacAddr.au8[5] == 0x0c);
+
     /* the end */
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 0, 0);