Index: /trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml
===================================================================
--- /trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml (revision 79617)
+++ /trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml (revision 79618)
@@ -39,5 +39,5 @@
--interface=ifname
- --ip=dhcpd-address
+ --server-ip=address
--netmask=mask
--lower-ip=address
@@ -65,8 +65,8 @@
--interface=ifname
- --ip=dhcpd-address
- --netmask=mask
+ --server-ip=address
--lower-ip=address
--upper-ip=address
+ --netmask=mask
--enable
@@ -159,10 +159,6 @@
-
+
The IP address the DHCP server should use.
-
-
-
- The network mask. Typically 255.255.255.0.
@@ -170,6 +166,10 @@
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.
+
+
+
+ The network mask. Typically 255.255.255.0.
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (revision 79617)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (revision 79618)
@@ -212,10 +212,13 @@
{
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,9 +239,9 @@
};
- 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,14 +268,14 @@
{
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,5 +378,5 @@
{
RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
- if (!pszDhcpdIp)
+ if (!pszServerIp)
rcExit = errorSyntax("Missing required option: --ip");
if (!pszNetmask)
@@ -430,14 +433,14 @@
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,13 +450,14 @@
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()));
}