Changeset 21729 in vbox

Timestamp:

Jul 20, 2009 4:06:15 PM (16 years ago)

Author:

vboxsync

Message:

VBoxManage: Don't allow disabling the network adaptor.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)

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

@@ -785 +785 @@
                 break;
             }
-            if (a->argc <= 1 + 1)
+            if (a->argc <= 2)
             {
                 errorArgument("Missing argument to '%s'", a->argv[1]);
@@ -797 +797 @@
             if (adapter)
             {
-                if (!strcmp(a->argv[2], "none"))
-                {
-                    CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (FALSE), 1);
-                }
-                else if (!strcmp(a->argv[2], "null"))
-                {
-                    CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
-                    CHECK_ERROR_RET(adapter, Detach(), 1);
-                }
-                else if (!strcmp(a->argv[2], "nat"))
-                {
-                    if (a->argc == 3)
-                        CHECK_ERROR_RET(adapter, COMSETTER(NATNetwork)(Bstr(a->argv[3])), 1);
-                    CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
-                    CHECK_ERROR_RET(adapter, AttachToNAT(), 1);
-                }
-                else if (  !strcmp(a->argv[2], "bridged")
-                        || !strcmp(a->argv[2], "hostif")) /* backward compatibility */
-                {
-                    if (a->argc <= 1 + 2)
+                BOOL fEnabled;
+                adapter->COMGETTER(Enabled)(&fEnabled);
+                if (fEnabled)
+                {
+                    if (!strcmp(a->argv[2], "null"))
                     {
-                        errorArgument("Missing argument to '%s'", a->argv[2]);
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
+                        CHECK_ERROR_RET(adapter, Detach(), 1);
+                    }
+                    else if (!strcmp(a->argv[2], "nat"))
+                    {
+                        if (a->argc == 4)
+                            CHECK_ERROR_RET(adapter, COMSETTER(NATNetwork)(Bstr(a->argv[3])), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
+                        CHECK_ERROR_RET(adapter, AttachToNAT(), 1);
+                    }
+                    else if (  !strcmp(a->argv[2], "bridged")
+                            || !strcmp(a->argv[2], "hostif")) /* backward compatibility */
+                    {
+                        if (a->argc <= 3)
+                        {
+                            errorArgument("Missing argument to '%s'", a->argv[2]);
+                            rc = E_FAIL;
+                            break;
+                        }
+                        CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3])), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
+                        CHECK_ERROR_RET(adapter, AttachToBridgedInterface(), 1);
+                    }
+                    else if (!strcmp(a->argv[2], "intnet"))
+                    {
+                        if (a->argc <= 3)
+                        {
+                            errorArgument("Missing argument to '%s'", a->argv[2]);
+                            rc = E_FAIL;
+                            break;
+                        }
+                        CHECK_ERROR_RET(adapter, COMSETTER(InternalNetwork)(Bstr(a->argv[3])), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
+                        CHECK_ERROR_RET(adapter, AttachToInternalNetwork(), 1);
+                    }
+#if defined(VBOX_WITH_NETFLT)
+                    else if (!strcmp(a->argv[2], "hostonly"))
+                    {
+                        if (a->argc <= 3)
+                        {
+                            errorArgument("Missing argument to '%s'", a->argv[2]);
+                            rc = E_FAIL;
+                            break;
+                        }
+                        CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3])), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
+                        CHECK_ERROR_RET(adapter, AttachToHostOnlyInterface(), 1);
+                    }
+#endif
+                    else
+                    {
+                        errorArgument("Invalid type '%s' specfied for NIC %lu", Utf8Str(a->argv[2]).raw(), n);
                         rc = E_FAIL;
                         break;
                     }
-                    CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3])), 1);
-                    CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
-                    CHECK_ERROR_RET(adapter, AttachToBridgedInterface(), 1);
-                }
-                else if (!strcmp(a->argv[2], "intnet"))
-                {
-                    if (a->argc <= 1 + 2)
-                    {
-                        errorArgument("Missing argument to '%s'", a->argv[2]);
-                        rc = E_FAIL;
-                        break;
-                    }
-                    CHECK_ERROR_RET(adapter, COMSETTER(InternalNetwork)(Bstr(a->argv[3])), 1);
-                    CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
-                    CHECK_ERROR_RET(adapter, AttachToInternalNetwork(), 1);
-                }
-#if defined(VBOX_WITH_NETFLT)
-                else if (!strcmp(a->argv[2], "hostonly"))
-                {
-                    if (a->argc <= 1 + 2)
-                    {
-                        errorArgument("Missing argument to '%s'", a->argv[2]);
-                        rc = E_FAIL;
-                        break;
-                    }
-                    CHECK_ERROR_RET(adapter, COMSETTER(HostInterface)(Bstr(a->argv[3])), 1);
-                    CHECK_ERROR_RET(adapter, COMSETTER(Enabled) (TRUE), 1);
-                    CHECK_ERROR_RET(adapter, AttachToHostOnlyInterface(), 1);
-                }
-#endif
+                }
                 else
                 {
-                    errorArgument("Invalid type '%s' specfied for NIC %lu", Utf8Str(a->argv[2]).raw(), n + 1);
-                    rc = E_FAIL;
-                    break;
+                    RTPrintf("The NIC %d is currently disabled and thus can't change its attachment type\n", n);
                 }
             }

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

@@ -288 +288 @@
 #ifdef VBOX_DYNAMIC_NET_ATTACH
 #if defined(VBOX_WITH_NETFLT)
-                 "                            nic<1-N> none|null|nat|bridged|intnet|hostonly\n"
+                 "                            nic<1-N> null|nat|bridged|intnet|hostonly\n"
                  "                                     [<devicename>] |\n"
 #else /* !RT_OS_LINUX && !RT_OS_DARWIN */
-                 "                            nic<1-N> none|null|nat|bridged|intnet\n"
+                 "                            nic<1-N> null|nat|bridged|intnet\n"
                  "                                     [<devicename>] |\n"
 #endif /* !RT_OS_LINUX && !RT_OS_DARWIN  */