Changeset 75512 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 16, 2018 11:33:38 AM (6 years ago)

Author:

vboxsync

Message:

Main/DHCPD: bugref:9288 Use new implementation of DHCP server.

File:

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

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

@@ -52 +52 @@
     OP_ADD = 1000,
     OP_REMOVE,
-    OP_MODIFY
+    OP_MODIFY,
+    OP_RESTART
 } OPCODE;
 
@@ -319 +320 @@
 
     if(   enmCode != OP_REMOVE
+       && enmCode != OP_RESTART
        && GlobalDhcpOptions.empty()
        && VmSlot2Options.empty())
@@ -374 +376 @@
     }
 
-    if(enmCode != OP_REMOVE)
+    if (enmCode == OP_RESTART)
+    {
+        CHECK_ERROR(svr, Restart());
+        if(FAILED(rc))
+            return errorArgument("Failed to restart server");
+    }
+    else if (enmCode == OP_REMOVE)
+    {
+        CHECK_ERROR(a->virtualBox, RemoveDHCPServer(svr));
+        if(FAILED(rc))
+            return errorArgument("Failed to remove server");
+    }
+    else
     {
         if (pIp || pNetmask || pLowerIp || pUpperIp)
@@ -425 +439 @@
         }
     }
-    else
-    {
-        CHECK_ERROR(a->virtualBox, RemoveDHCPServer(svr));
-        if(FAILED(rc))
-            return errorArgument("Failed to remove server");
-    }
 
     return RTEXITCODE_SUCCESS;
@@ -448 +456 @@
     else if (strcmp(a->argv[0], "remove") == 0)
         rcExit = handleOp(a, OP_REMOVE, 1);
+    else if (strcmp(a->argv[0], "restart") == 0)
+        rcExit = handleOp(a, OP_RESTART, 1);
     else
         rcExit = errorSyntax(USAGE_DHCPSERVER, "Invalid parameter '%s'", Utf8Str(a->argv[0]).c_str());