Changeset 93278 in vbox

Timestamp:

Jan 17, 2022 3:51:51 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage/NATNetwork: bugref:8124. Add --ipv6-default option to
control INATNetwork::advertiseDefaultIPv6RouteEnabled

File:

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

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

@@ -181 +181 @@
     int dhcp = -1;
     int ipv6 = -1;
+    int ipv6_default = -1;
 
     VPF2DELETE vPfName2Delete;
@@ -190 +191 @@
     LONG loopback6Offset = 0; /* ignore me */
 
-#define NATNET_CMD_OPT_IPV6_PREFIX    (256 + '6')
+    enum
+    {
+        kNATNetworkIota = 1000,
+        kNATNetwork_IPv6Default,
+        kNATNetwork_IPv6Prefix,
+    };
+
     static const RTGETOPTDEF g_aNATNetworkIPOptions[] =
     {
@@ -198 +205 @@
         { "--dhcp",             'h',                            RTGETOPT_REQ_BOOL    },
         { "--ipv6",             '6',                            RTGETOPT_REQ_BOOL    }, /* old name */
+        { "--ipv6-default",     kNATNetwork_IPv6Default,        RTGETOPT_REQ_BOOL    },
         { "--ipv6-enable",      '6',                            RTGETOPT_REQ_BOOL    }, /* new name */
-        { "--ipv6-prefix",      NATNET_CMD_OPT_IPV6_PREFIX,     RTGETOPT_REQ_STRING  },
+        { "--ipv6-prefix",      kNATNetwork_IPv6Prefix,         RTGETOPT_REQ_STRING  },
         { "--enable",           'e',                            RTGETOPT_REQ_NOTHING },
         { "--disable",          'd',                            RTGETOPT_REQ_NOTHING },
@@ -254 +262 @@
                 break;
 
-            case NATNET_CMD_OPT_IPV6_PREFIX:
+            case kNATNetwork_IPv6Prefix:
                 if (pPrefixIPv6)
                     return errorSyntax(USAGE_NATNETWORK, Nat::tr("You can specify --ipv6-prefix only once."));
                 pPrefixIPv6 = ValueUnion.psz;
+                break;
+
+            case kNATNetwork_IPv6Default: // XXX: uwe
+                if (ipv6_default != -1)
+                    return errorSyntax(USAGE_NATNETWORK, Nat::tr("You can specify --ipv6-default only once."));
+                ipv6_default = ValueUnion.f;
                 break;
 
@@ -417 +431 @@
             {
                 CHECK_ERROR(net, COMSETTER(IPv6Enabled)(TRUE));
+                if (FAILED(rc))
+                    return errorArgument(Nat::tr("Failed to set configuration"));
+            }
+
+            if (ipv6_default != -1)
+            {
+                BOOL fIPv6Default = RT_BOOL(ipv6_default);
+                CHECK_ERROR(net, COMSETTER(AdvertiseDefaultIPv6RouteEnabled)(fIPv6Default));
                 if (FAILED(rc))
                     return errorArgument(Nat::tr("Failed to set configuration"));