Changeset 88756 in vbox for trunk/src/VBox

Timestamp:

Apr 28, 2021 8:42:47 PM (4 years ago)

Author:

vboxsync

Message:

VBoxManage/NATNetwork: Provide an option to set IPv6 prefix. When
executing the request ensure the ordering of IPv6 being
enabled/disabled and IPv6 prefix being set so that it does the right
thing when one command specifies both. bugref:8124.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp

@@ -174 +174 @@
 
     const char *pNetName = NULL;
-    const char *pNetworkCidr = NULL;
+    const char *pPrefixIPv4 = NULL;
+    const char *pPrefixIPv6 = NULL;
     int enable = -1;
     int dhcp = -1;
@@ -187 +188 @@
     LONG loopback6Offset = 0; /* ignore me */
 
+#define NATNET_CMD_OPT_IPV6_PREFIX    (256 + '6')
     static const RTGETOPTDEF g_aNATNetworkIPOptions[] =
     {
-        { "--netname",          't', RTGETOPT_REQ_STRING  },
-        { "--network",          'n', RTGETOPT_REQ_STRING  },
-        { "--dhcp",             'h', RTGETOPT_REQ_BOOL    },
-        { "--ipv6",             '6', RTGETOPT_REQ_BOOL    },
-        { "--enable",           'e', RTGETOPT_REQ_NOTHING },
-        { "--disable",          'd', RTGETOPT_REQ_NOTHING },
-        { "--port-forward-4",   'p', RTGETOPT_REQ_STRING  },
-        { "--port-forward-6",   'P', RTGETOPT_REQ_STRING  },
-        { "--loopback-4",       'l', RTGETOPT_REQ_STRING  },
-        { "--loopback-6",       'L', RTGETOPT_REQ_STRING  },
+        { "--netname",          't',                            RTGETOPT_REQ_STRING  },
+        { "--network",          'n',                            RTGETOPT_REQ_STRING  }, /* old name */
+        { "--ipv4-prefix",      'n',                            RTGETOPT_REQ_STRING  }, /* new name */
+        { "--dhcp",             'h',                            RTGETOPT_REQ_BOOL    },
+        { "--ipv6",             '6',                            RTGETOPT_REQ_BOOL    }, /* old name */
+        { "--ipv6-enable",      '6',                            RTGETOPT_REQ_BOOL    }, /* new name */
+        { "--ipv6-prefix",      NATNET_CMD_OPT_IPV6_PREFIX,     RTGETOPT_REQ_STRING  },
+        { "--enable",           'e',                            RTGETOPT_REQ_NOTHING },
+        { "--disable",          'd',                            RTGETOPT_REQ_NOTHING },
+        { "--port-forward-4",   'p',                            RTGETOPT_REQ_STRING  },
+        { "--port-forward-6",   'P',                            RTGETOPT_REQ_STRING  },
+        { "--loopback-4",       'l',                            RTGETOPT_REQ_STRING  },
+        { "--loopback-6",       'L',                            RTGETOPT_REQ_STRING  },
     };
 
@@ -218 +223 @@
 
             case 'n':   // --network
-                if (pNetworkCidr)
+                if (pPrefixIPv4)
                     return errorSyntax(USAGE_NATNETWORK, "You can only specify --network only once.");
-                pNetworkCidr = ValueUnion.psz;
+                pPrefixIPv4 = ValueUnion.psz;
                 break;
 
@@ -245 +250 @@
                     return errorSyntax(USAGE_NATNETWORK, "You can specify --ipv6 only once.");
                 ipv6 = ValueUnion.f;
+                break;
+
+            case NATNET_CMD_OPT_IPV6_PREFIX:
+                if (pPrefixIPv6)
+                    return errorSyntax(USAGE_NATNETWORK, "You can specify --ipv6-prefix only once.");
+                pPrefixIPv6 = ValueUnion.psz;
                 break;
 
@@ -330 +341 @@
     {
         case OP_ADD:
-            if (!pNetworkCidr)
+            if (!pPrefixIPv4)
                 return errorSyntax(USAGE_NATNETWORK, "You need to specify the --network option");
             break;
@@ -365 +376 @@
         case OP_MODIFY:
         {
-            if (pNetworkCidr)
-            {
-                CHECK_ERROR(net, COMSETTER(Network)(Bstr(pNetworkCidr).raw()));
+            if (pPrefixIPv4)
+            {
+                CHECK_ERROR(net, COMSETTER(Network)(Bstr(pPrefixIPv4).raw()));
                 if (FAILED(rc))
                     return errorArgument("Failed to set configuration");
@@ -378 +389 @@
             }
 
-            if (ipv6 >= 0)
-            {
-                CHECK_ERROR(net, COMSETTER(IPv6Enabled) ((BOOL)ipv6));
+            /*
+             * If we are asked to disable IPv6, do it early so that
+             * the same command can also set IPv6 prefix to empty if
+             * it so wishes.
+             */
+            if (ipv6 == 0)
+            {
+                CHECK_ERROR(net, COMSETTER(IPv6Enabled)(FALSE));
+                if (FAILED(rc))
+                    return errorArgument("Failed to set configuration");
+            }
+
+            if (pPrefixIPv6)
+            {
+                CHECK_ERROR(net, COMSETTER(IPv6Prefix)(Bstr(pPrefixIPv6).raw()));
+                if (FAILED(rc))
+                    return errorArgument("Failed to set configuration");
+            }
+
+            /*
+             * If we are asked to enable IPv6, do it late, so that the
+             * same command can also set IPv6 prefix.
+             */
+            if (ipv6 > 0)
+            {
+                CHECK_ERROR(net, COMSETTER(IPv6Enabled)(TRUE));
                 if (FAILED(rc))
                     return errorArgument("Failed to set configuration");