Changeset 45116 in vbox

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84410

Message:

patch getopt-cidr.patch from xTracker/5894 with applied recommendations from comment 91.

introduces RTGETOPT_REQ_IPV4CIDR in getop.h

Location:

trunk

Files:

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

trunk/include/iprt/getopt.h

@@ -70 +70 @@
  * (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
+#if 0
+/* take placers */
+/** The value must be a valid IPv6 addr
+ * @todo: Add types and parsing routines in (iprt/net.h)
+ */
+#define RTGETOPT_REQ_IPV6ADDR                   12
+/** The value must be a valid IPv6 CIDR
+ * @todo: Add types and parsing routines in (iprt/net.h)
+ */
+#define RTGETOPT_REQ_IPV6CIDR                   13
 #endif
 /** The value must be a valid ethernet MAC address. */
@@ -164 +172 @@
     /** A RTGETOPT_REQ_IPV4ADDR option argument. */
     RTNETADDRIPV4   IPv4Addr;
+    /** A RTGETOPT_REQ_IPV4CIDR option argument. */
+    struct 
+    { 
+        RTNETADDRIPV4 IPv4Network;
+        RTNETADDRIPV4 IPv4Netmask;
+    } CidrIPv4;
 #endif
     /** A RTGETOPT_REQ_MACADDR option argument. */

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

@@ -28 +28 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include <iprt/cidr.h>
 #include <iprt/net.h>                   /* must come before getopt.h */
 #include <iprt/getopt.h>
@@ -410 +411 @@
             break;
         }
-#if 0  /** @todo CIDR */
-#endif
+
+        case RTGETOPT_REQ_IPV4CIDR:
+        {
+            RTNETADDRIPV4 network;
+            RTNETADDRIPV4 netmask;
+            if (RT_FAILURE(RTCidrStrToIPv4(pszValue, &network, &netmask)))
+              return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
+            pValueUnion->CidrIPv4.IPv4Network.u = network.u;
+            pValueUnion->CidrIPv4.IPv4Netmask.u = netmask.u;
+            break;
+        }
 
         case RTGETOPT_REQ_MACADDR: