Changeset 79618 in vbox

Timestamp:

Jul 9, 2019 12:51:37 AM (5 years ago)

Author:

vboxsync

Message:

VBoxManage/dhcpserver, manpage: Adjustmens and fixes. bugref:9288

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-dhcpserver.xml (modified) (4 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (modified) (6 diffs)

trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml

@@ -39 +39 @@
         <arg choice="plain">--interface=<replaceable>ifname</replaceable></arg>
       </group>
-      <arg choice="req">--ip=<replaceable>dhcpd-address</replaceable></arg>
+      <arg choice="req">--server-ip=<replaceable>address</replaceable></arg>
       <arg choice="req">--netmask=<replaceable>mask</replaceable></arg>
       <arg choice="req">--lower-ip=<replaceable>address</replaceable></arg>
@@ -65 +65 @@
         <arg choice="plain">--interface=<replaceable>ifname</replaceable></arg>
       </group>
-      <arg choice="opt">--ip=<replaceable>dhcpd-address</replaceable></arg>
-      <arg choice="opt">--netmask=<replaceable>mask</replaceable></arg>
+      <arg choice="opt">--server-ip=<replaceable>address</replaceable></arg>
       <arg choice="opt">--lower-ip=<replaceable>address</replaceable></arg>
       <arg choice="opt">--upper-ip=<replaceable>address</replaceable></arg>
+      <arg choice="opt">--netmask=<replaceable>mask</replaceable></arg>
       <group choice="opt">
         <arg choice="plain">--enable</arg>
@@ -159 +159 @@
       <variablelist>
         <varlistentry>
-          <term><option>--ip=<replaceable>dhcpd-address</replaceable></option></term>
+          <term><option>--server-ip=<replaceable>address</replaceable></option></term>
           <listitem><para>The IP address the DHCP server should use.</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--netmask=<replaceable>mask</replaceable></option></term>
-          <listitem><para>The network mask.  Typically 255.255.255.0.</para></listitem>
         </varlistentry>
         <varlistentry>
@@ -170 +166 @@
           <listitem><para>The IP address range for the DHCP server to manage.  This
             should not include the address of the DHCP server itself, but it must be
-            in the same network as it is.  The boundraries are inclusive, so both the
+            in the same network as it.  The boundraries are inclusive, so both the
             lower and upper addresses will be handed out to clients.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--netmask=<replaceable>mask</replaceable></option></term>
+          <listitem><para>The network mask.  Typically 255.255.255.0.</para></listitem>
         </varlistentry>
         <varlistentry>

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

@@ -212 +212 @@
     {
         DHCPD_CMD_COMMON_OPTION_DEFS(),
-        { "--ip",               'a', RTGETOPT_REQ_STRING  },
+        { "--server-ip",        'a', RTGETOPT_REQ_STRING  },
+        { "--ip",               'a', RTGETOPT_REQ_STRING  },    // deprecated
         { "-ip",                'a', RTGETOPT_REQ_STRING  },    // deprecated
         { "--netmask",          'm', RTGETOPT_REQ_STRING  },
         { "-netmask",           'm', RTGETOPT_REQ_STRING  },    // deprecated
+        { "--lower-ip",         'l', RTGETOPT_REQ_STRING  },
         { "--lowerip",          'l', RTGETOPT_REQ_STRING  },
         { "-lowerip",           'l', RTGETOPT_REQ_STRING  },    // deprecated
+        { "--upper-ip",         'u', RTGETOPT_REQ_STRING  },
         { "--upperip",          'u', RTGETOPT_REQ_STRING  },
         { "-upperip",           'u', RTGETOPT_REQ_STRING  },    // deprecated
@@ -236 +239 @@
     };
 
-    const char       *pszDhcpdIp = NULL;
-    const char       *pszNetmask = NULL;
-    const char       *pszLowerIp = NULL;
-    const char       *pszUpperIp = NULL;
-    int               fEnabled   = -1;
+    const char       *pszServerIp           = NULL;
+    const char       *pszNetmask            = NULL;
+    const char       *pszLowerIp            = NULL;
+    const char       *pszUpperIp            = NULL;
+    int               fEnabled              = -1;
 
     DhcpOpts          GlobalDhcpOptions;
@@ -265 +268 @@
         {
             DHCPD_CMD_COMMON_OPTION_CASES(pCtx, vrc, &ValueUnion);
-            case 'a':   // -ip
-                pszDhcpdIp = ValueUnion.psz;
+            case 'a':   // --server-ip
+                pszServerIp = ValueUnion.psz;
                 break;
             case 'm':   // --netmask
                 pszNetmask = ValueUnion.psz;
                 break;
-            case 'l':   // --lowerip
+            case 'l':   // --lower-ip
                 pszLowerIp = ValueUnion.psz;
                 break;
-            case 'u':   // --upperip
+            case 'u':   // --upper-ip
                 pszUpperIp = ValueUnion.psz;
                 break;
@@ -375 +378 @@
     {
         RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
-        if (!pszDhcpdIp)
+        if (!pszServerIp)
             rcExit = errorSyntax("Missing required option: --ip");
         if (!pszNetmask)
@@ -430 +433 @@
     HRESULT hrc;
     RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
-    if (pszDhcpdIp || pszNetmask || pszLowerIp || pszUpperIp)
-    {
-        Bstr bstrDhcpdIp(pszDhcpdIp);
+    if (pszServerIp || pszNetmask || pszLowerIp || pszUpperIp)
+    {
+        Bstr bstrServerIp(pszServerIp);
         Bstr bstrNetmask(pszNetmask);
         Bstr bstrLowerIp(pszLowerIp);
         Bstr bstrUpperIp(pszUpperIp);
 
-        if (!pszDhcpdIp)
-        {
-            CHECK_ERROR2_RET(hrc, svr, COMGETTER(IPAddress)(bstrDhcpdIp.asOutParam()), RTEXITCODE_FAILURE);
+        if (!pszServerIp)
+        {
+            CHECK_ERROR2_RET(hrc, svr, COMGETTER(IPAddress)(bstrServerIp.asOutParam()), RTEXITCODE_FAILURE);
         }
         if (!pszNetmask)
@@ -447 +450 @@
         if (!pszLowerIp)
         {
-            CHECK_ERROR2_RET(hrc, svr, COMGETTER(LowerIP)(bstrNetmask.asOutParam()), RTEXITCODE_FAILURE);
+            CHECK_ERROR2_RET(hrc, svr, COMGETTER(LowerIP)(bstrLowerIp.asOutParam()), RTEXITCODE_FAILURE);
         }
         if (!pszUpperIp)
         {
-            CHECK_ERROR2_RET(hrc, svr, COMGETTER(UpperIP)(bstrNetmask.asOutParam()), RTEXITCODE_FAILURE);
-        }
-
-        CHECK_ERROR2_STMT(hrc, svr, SetConfiguration(bstrDhcpdIp.raw(), bstrNetmask.raw(), bstrLowerIp.raw(), bstrUpperIp.raw()),
-                          rcExit = errorArgument("Failed to set configuration"));
+            CHECK_ERROR2_RET(hrc, svr, COMGETTER(UpperIP)(bstrUpperIp.asOutParam()), RTEXITCODE_FAILURE);
+        }
+
+        CHECK_ERROR2_STMT(hrc, svr, SetConfiguration(bstrServerIp.raw(), bstrNetmask.raw(), bstrLowerIp.raw(), bstrUpperIp.raw()),
+                          rcExit = errorArgument("Failed to set configuration (%ls, %ls, %ls, %ls)", bstrServerIp.raw(),
+                                                 bstrNetmask.raw(), bstrLowerIp.raw(), bstrUpperIp.raw()));
     }