Changeset 17441 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

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

Author:

vboxsync

Message:

IPRT/RTGetOpt: Added RTGETOPT_REQ_MACADDR.

File:

• trunk/src/VBox/Runtime/common/misc/getopt.cpp (modified) (3 diffs)

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: