Changeset 75918 in vbox

Timestamp:

Dec 3, 2018 5:09:43 PM (6 years ago)

Author:

vboxsync

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

127124

Message:

Main/DHCPServer: (bugref:9288) Renamed '--slot' to '--nic' and made it 1-based instead of 0-based.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageDHCPServer.cpp (modified) (6 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (1 diff)

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

@@ -116 +116 @@
     { "--options",          'o', RTGETOPT_REQ_NOTHING },
     { "--vm",               'n', RTGETOPT_REQ_STRING}, /* only with -o */
-    { "--slot",             's', RTGETOPT_REQ_UINT8}, /* only with -o and -n */
+    { "--nic",              'c', RTGETOPT_REQ_UINT8}, /* only with -o and -n */
     { "--id",               'i', RTGETOPT_REQ_UINT8}, /* only with -o */
     { "--value",            'p', RTGETOPT_REQ_STRING}, /* only with -i */
@@ -240 +240 @@
                 {
         // {"--vm",                'n', RTGETOPT_REQ_STRING}, /* only with -o */
-        // {"--slot",              's', RTGETOPT_REQ_UINT8}, /* only with -o and -n*/
+        // {"--nic",               'c', RTGETOPT_REQ_UINT8}, /* only with -o and -n*/
         // {"--id",                'i', RTGETOPT_REQ_UINT8}, /* only with -o */
         // {"--value",             'p', RTGETOPT_REQ_STRING} /* only with -i */
@@ -266 +266 @@
                 break; /* end of --vm-name */
 
-            case 's': // --slot
+            case 'c': // --nic
                 {
                     if (!fVmOptionRead)
@@ -273 +273 @@
 
                     u8Slot = ValueUnion.u8;
-                }
-                break; /* end of --slot */
+
+                    if (u8Slot < 1)
+                        return errorSyntax(USAGE_DHCPSERVER,
+                                           "invalid NIC number: %u", u8Slot);
+                    --u8Slot;
+                }
+                break; /* end of --nic */
 
             case 'i': // --id
@@ -298 +303 @@
                         && u8Slot == (uint8_t)~0)
                         return errorSyntax(USAGE_DHCPSERVER,
-                                           "--slot wasn't found");
+                                           "--nic wasn't found");
 
                     DhcpOpts &opts = fVmOptionRead ? VmSlot2Options[VmNameSlotKey(pszVmName, u8Slot)]
@@ -320 +325 @@
                         && u8Slot == (uint8_t)~0)
                         return errorSyntax(USAGE_DHCPSERVER,
-                                           "--slot wasn't found");
+                                           "--nic wasn't found");
 
                     DhcpOptIds &optIds = fVmOptionRead ? VmSlot2Options2Delete[VmNameSlotKey(pszVmName, u8Slot)]

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

@@ -1211 +1211 @@
                      "                            --upperip <upper_ip>]\n"
                      "                            [--enable | --disable]\n"
-                     "                            [--options [--vm <name> --slot <number>]\n"
+                     "                            [--options [--vm <name> --nic <1-N>]\n"
                      "                             --id <number> [--value <string> | --remove]]\n"
                      "                             (multiple options allowed after --options)\n\n"

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

@@ -796 +796 @@
     CHECK_ERROR2I_RET(pSrv, GetVmSlotOptions(vmName.raw(), uSlot, ComSafeArrayAsOutParam(options)), hrcCheck);
     if (options.size())
-        RTPrintf("Options for slot #%d of '%ls':\n", uSlot, vmName.raw());
+        RTPrintf("Options for NIC %d of '%ls':\n", uSlot + 1, vmName.raw());
     for (size_t i = 0; i < options.size(); ++i)
         RTPrintf("   %ls\n", options[i]);