Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (revision 79615) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (revision 79616) @@ -113,14 +113,4 @@ typedef DHCPDCMDCTX *PDHCPDCMDCTX; - - -typedef enum enMainOpCodes -{ - OP_ADD = 1000, - OP_REMOVE, - OP_MODIFY, - OP_RESTART -} OPCODE; - typedef std::pair DhcpOptSpec; typedef std::vector DhcpOpts; @@ -136,14 +126,13 @@ VmNameSlotKey(const std::string &aVmName, uint8_t aSlot) - : VmName(aVmName) - , u8Slot(aSlot) + : VmName(aVmName) + , u8Slot(aSlot) {} - bool operator< (const VmNameSlotKey& that) const + bool operator<(const VmNameSlotKey& that) const { if (VmName == that.VmName) return u8Slot < that.u8Slot; - else - return VmName < that.VmName; + return VmName < that.VmName; } }; @@ -156,24 +145,69 @@ typedef VmSlot2OptionIdsM::iterator VmSlot2OptionIdsIterator; -typedef std::vector VmConfigs; - - -/********************************************************************************************************************************* -* Global Variables * -*********************************************************************************************************************************/ - - - -static RTEXITCODE dhcpdHandleTooManyCmds(PDHCPDCMDCTX pCtx, int argc, char **argv) -{ - // glue - start - HandlerArg *a = pCtx->pArg; - OPCODE enmCode = pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_ADD ? OP_ADD - : pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_MODIFY ? OP_MODIFY - : pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_REMOVE ? OP_REMOVE : OP_RESTART; - RT_NOREF(argc, argv); - // glue - end - - static const RTGETOPTDEF s_aDHCPIPOptions[] = + + +/** + * Helper that find the DHCP server instance. + * + * @returns The DHCP server instance. NULL if failed (complaining done). + * @param pCtx The DHCP server command context. + */ +static ComPtr dhcpdFindServer(PDHCPDCMDCTX pCtx) +{ + ComPtr ptrRet; + if (pCtx->pszNetwork || pCtx->pszInterface) + { + Assert(pCtx->pszNetwork == NULL || pCtx->pszInterface == NULL); + + /* + * We need a network name to find the DHCP server. So, if interface is + * given we have to look it up. + */ + HRESULT hrc; + Bstr bstrNetName(pCtx->pszNetwork); + if (!pCtx->pszNetwork) + { + ComPtr ptrIHost; + CHECK_ERROR2_RET(hrc, pCtx->pArg->virtualBox, COMGETTER(Host)(ptrIHost.asOutParam()), ptrRet); + + Bstr bstrInterface(pCtx->pszInterface); + ComPtr ptrIHostIf; + CHECK_ERROR2(hrc, ptrIHost, FindHostNetworkInterfaceByName(bstrInterface.raw(), ptrIHostIf.asOutParam())); + if (FAILED(hrc)) + { + errorArgument("Failed to locate host-only interface '%s'", pCtx->pszInterface); + return ptrRet; + } + + CHECK_ERROR2_RET(hrc, ptrIHostIf, COMGETTER(NetworkName)(bstrNetName.asOutParam()), ptrRet); + } + + /* + * Now, try locate the server + */ + hrc = pCtx->pArg->virtualBox->FindDHCPServerByNetworkName(bstrNetName.raw(), ptrRet.asOutParam()); + if (SUCCEEDED(hrc)) + return ptrRet; + if (pCtx->pszNetwork) + errorArgument("Failed to find DHCP server for network '%s'", pCtx->pszNetwork); + else + errorArgument("Failed to find DHCP server for host-only interface '%s' (network '%ls')", + pCtx->pszInterface, bstrNetName.raw()); + } + else + errorSyntax("You need to specify either --network or --interface to identify the DHCP server"); + return ptrRet; +} + + +/** + * Handles the 'add' and 'modify' subcommands. + */ +static RTEXITCODE dhcpdHandleAddAndModify(PDHCPDCMDCTX pCtx, int argc, char **argv) +{ + /* + * Parse options. + */ + static const RTGETOPTDEF s_aOptions[] = { DHCPD_CMD_COMMON_OPTION_DEFS(), @@ -202,11 +236,9 @@ }; - bool fNeedValueOrRemove = false; /* Only used with --id; remove in 6.1+ */ - - const char *pszDhcpdIp = NULL; - const char *pszNetmask = NULL; - const char *pszLowerIp = NULL; - const char *pszUpperIp = NULL; - int fEnabled = -1; + const char *pszDhcpdIp = NULL; + const char *pszNetmask = NULL; + const char *pszLowerIp = NULL; + const char *pszUpperIp = NULL; + int fEnabled = -1; DhcpOpts GlobalDhcpOptions; @@ -214,27 +246,23 @@ VmSlot2OptionsM VmSlot2Options; VmSlot2OptionIdsM VmSlot2Options2Delete; - /// @todo what was this for: VmConfigs VmConfigs2Delete; const char *pszVmName = NULL; - uint8_t u8OptId = 0; uint8_t u8Slot = 0; DhcpOpts *pScopeOptions = &GlobalDhcpOptions; DhcpOptIds *pScopeOptions2Delete = &GlobalDhcpOptions2Delete; - int c; + bool fNeedValueOrRemove = false; /* Only used with --id; remove in 6.1+ */ + uint8_t u8OptId = 0; /* Only used too keep --id for following --value/--remove. remove in 6.1+ */ + + RTGETOPTSTATE GetState; + int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0); + AssertRCReturn(vrc, RTEXITCODE_FAILURE); + RTGETOPTUNION ValueUnion; - RTGETOPTSTATE GetState; - RTGetOptInit(&GetState, - a->argc, - a->argv, - s_aDHCPIPOptions, - enmCode != OP_REMOVE ? RT_ELEMENTS(s_aDHCPIPOptions) : 4, /* we use only --netname and --ifname for remove*/ - 1, - 0); - while ((c = RTGetOpt(&GetState, &ValueUnion))) - { - switch (c) + while ((vrc = RTGetOpt(&GetState, &ValueUnion))) + { + switch (vrc) { - DHCPD_CMD_COMMON_OPTION_CASES(pCtx, c, &ValueUnion); + DHCPD_CMD_COMMON_OPTION_CASES(pCtx, vrc, &ValueUnion); case 'a': // -ip pszDhcpdIp = ValueUnion.psz; @@ -288,7 +316,7 @@ { uint8_t const idAddOpt = ValueUnion.u8; - c = RTGetOptFetchValue(&GetState, &ValueUnion, RTGETOPT_REQ_STRING); - if (RT_FAILURE(c)) - return errorFetchValue(1, "--add-opt", c, &ValueUnion); + vrc = RTGetOptFetchValue(&GetState, &ValueUnion, RTGETOPT_REQ_STRING); + if (RT_FAILURE(vrc)) + return errorFetchValue(1, "--add-opt", vrc, &ValueUnion); pScopeOptions->push_back(DhcpOptSpec((DhcpOpt_T)idAddOpt, std::string(ValueUnion.psz))); break; @@ -296,5 +324,5 @@ case 'D': // --del-opt num - if (enmCode == OP_ADD) + if (pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_ADD) return errorSyntax("--del-opt does not apply to the 'add' subcommand"); pScopeOptions2Delete->push_back((DhcpOpt_T)ValueUnion.u8); @@ -323,5 +351,5 @@ case 'r': // --remove - if (enmCode == OP_ADD) + if (pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_ADD) return errorSyntax("--remove does not apply to the 'add' subcommand"); if (!fNeedValueOrRemove) @@ -333,37 +361,33 @@ default: - return errorGetOpt(c, &ValueUnion); + return errorGetOpt(vrc, &ValueUnion); } } + /* + * Ensure we've got mandatory options and supply defaults + * where needed (modify case) + */ if (!pCtx->pszNetwork && !pCtx->pszInterface) return errorSyntax("You need to specify either --network or --interface to identify the DHCP server"); - if ( enmCode != OP_REMOVE - && enmCode != OP_RESTART - && GlobalDhcpOptions.empty() - && VmSlot2Options.empty() - && GlobalDhcpOptions2Delete.empty() - && VmSlot2Options2Delete.empty()) - { - /** @todo For the 'modify' subcmd, missing configuration parameters could be - * retrieved from the current config. All are only required for 'add'! - * The 'fEnabled' attribute does not come into play here. */ - if (fEnabled < 0 || pszDhcpdIp || pszNetmask || pszLowerIp || pszUpperIp) - { - RTEXITCODE rcExit = RTEXITCODE_SUCCESS; - if (!pszDhcpdIp) - rcExit = errorSyntax("Missing required option: --ip"); - if (!pszNetmask) - rcExit = errorSyntax("Missing required option: --netmask"); - if (!pszLowerIp) - rcExit = errorSyntax("Missing required option: --lowerip"); - if (!pszUpperIp) - rcExit = errorSyntax("Missing required option: --upperip"); - if (rcExit != RTEXITCODE_SUCCESS) - return rcExit; - } - } - + if (pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_ADD) + { + RTEXITCODE rcExit = RTEXITCODE_SUCCESS; + if (!pszDhcpdIp) + rcExit = errorSyntax("Missing required option: --ip"); + if (!pszNetmask) + rcExit = errorSyntax("Missing required option: --netmask"); + if (!pszLowerIp) + rcExit = errorSyntax("Missing required option: --lowerip"); + if (!pszUpperIp) + rcExit = errorSyntax("Missing required option: --upperip"); + if (rcExit != RTEXITCODE_SUCCESS) + return rcExit; + } + + /* + * Find or create the server. + */ HRESULT rc; Bstr NetName; @@ -371,5 +395,5 @@ { ComPtr host; - CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam())); + CHECK_ERROR(pCtx->pArg->virtualBox, COMGETTER(Host)(host.asOutParam())); ComPtr hif; @@ -388,125 +412,163 @@ ComPtr svr; - rc = a->virtualBox->FindDHCPServerByNetworkName(NetName.mutableRaw(), svr.asOutParam()); - if(enmCode == OP_ADD) + rc = pCtx->pArg->virtualBox->FindDHCPServerByNetworkName(NetName.mutableRaw(), svr.asOutParam()); + if (pCtx->pCmdDef->fSubcommandScope == HELP_SCOPE_DHCPSERVER_ADD) { if (SUCCEEDED(rc)) return errorArgument("DHCP server already exists"); - CHECK_ERROR(a->virtualBox, CreateDHCPServer(NetName.mutableRaw(), svr.asOutParam())); + CHECK_ERROR(pCtx->pArg->virtualBox, CreateDHCPServer(NetName.mutableRaw(), svr.asOutParam())); if (FAILED(rc)) return errorArgument("Failed to create the DHCP server"); } else if (FAILED(rc)) - { return errorArgument("DHCP server does not exist"); - } - - 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 (pszDhcpdIp || pszNetmask || pszLowerIp || pszUpperIp) + + /* + * Apply settings. + */ + HRESULT hrc; + RTEXITCODE rcExit = RTEXITCODE_SUCCESS; + if (pszDhcpdIp || pszNetmask || pszLowerIp || pszUpperIp) + { + Bstr bstrDhcpdIp(pszDhcpdIp); + Bstr bstrNetmask(pszNetmask); + Bstr bstrLowerIp(pszLowerIp); + Bstr bstrUpperIp(pszUpperIp); + + if (!pszDhcpdIp) + CHECK_ERROR2_RET(hrc, svr, COMGETTER(IPAddress)(bstrDhcpdIp.asOutParam()), RTEXITCODE_FAILURE); + if (!pszNetmask) + CHECK_ERROR2_RET(hrc, svr, COMGETTER(NetworkMask)(bstrNetmask.asOutParam()), RTEXITCODE_FAILURE); + if (!pszLowerIp) + CHECK_ERROR2_RET(hrc, svr, COMGETTER(LowerIP)(bstrNetmask.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")); + } + + if (fEnabled >= 0) + CHECK_ERROR2_STMT(hrc, svr, COMSETTER(Enabled)((BOOL)fEnabled), rcExit = RTEXITCODE_FAILURE); + + /* Remove options: */ + for (DhcpOptIdIterator itOptId = GlobalDhcpOptions2Delete.begin(); itOptId != GlobalDhcpOptions2Delete.end(); ++itOptId) + CHECK_ERROR2_STMT(hrc, svr, RemoveGlobalOption(*itOptId), rcExit = RTEXITCODE_FAILURE); + + for (VmSlot2OptionIdsIterator itIdVector = VmSlot2Options2Delete.begin(); + itIdVector != VmSlot2Options2Delete.end(); ++itIdVector) + for (DhcpOptIdIterator itOptId = itIdVector->second.begin(); itOptId != itIdVector->second.end(); ++itOptId) + CHECK_ERROR2_STMT(hrc, svr, RemoveVmSlotOption(Bstr(itIdVector->first.VmName.c_str()).raw(), + itIdVector->first.u8Slot, *itOptId), + rcExit = RTEXITCODE_FAILURE); + + /* Global Options */ + for (DhcpOptIterator itOpt = GlobalDhcpOptions.begin(); itOpt != GlobalDhcpOptions.end(); ++itOpt) + CHECK_ERROR2_STMT(hrc, svr, AddGlobalOption(itOpt->first, com::Bstr(itOpt->second.c_str()).raw()), + rcExit = RTEXITCODE_FAILURE); + + /* VM slot options. */ + for (VmSlot2OptionsIterator it = VmSlot2Options.begin(); it != VmSlot2Options.end(); ++it) + for (DhcpOptIterator itOpt = it->second.begin(); itOpt != it->second.end(); ++itOpt) + CHECK_ERROR2_STMT(hrc, svr, AddVmSlotOption(Bstr(it->first.VmName.c_str()).raw(), it->first.u8Slot, itOpt->first, + com::Bstr(itOpt->second.c_str()).raw()), + rcExit = RTEXITCODE_FAILURE); + + return rcExit; +} + + +/** + * Handles the 'remove' subcommand. + */ +static RTEXITCODE dhcpdHandleRemove(PDHCPDCMDCTX pCtx, int argc, char **argv) +{ + /* + * Parse the command line. + */ + static const RTGETOPTDEF s_aOptions[] = + { + DHCPD_CMD_COMMON_OPTION_DEFS(), + }; + + RTGETOPTSTATE GetState; + int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0); + AssertRCReturn(vrc, RTEXITCODE_FAILURE); + + RTGETOPTUNION ValueUnion; + while ((vrc = RTGetOpt(&GetState, &ValueUnion))) + { + switch (vrc) { - CHECK_ERROR(svr, SetConfiguration(Bstr(pszDhcpdIp).mutableRaw(), - Bstr(pszNetmask).mutableRaw(), - Bstr(pszLowerIp).mutableRaw(), - Bstr(pszUpperIp).mutableRaw())); - if (FAILED(rc)) - return errorArgument("Failed to set configuration"); + DHCPD_CMD_COMMON_OPTION_CASES(pCtx, vrc, &ValueUnion); + default: + return errorGetOpt(vrc, &ValueUnion); } - - if (fEnabled >= 0) - CHECK_ERROR(svr, COMSETTER(Enabled)((BOOL)fEnabled)); - - /* Remove options: */ - for (DhcpOptIdIterator itOptId = GlobalDhcpOptions2Delete.begin(); itOptId != GlobalDhcpOptions2Delete.end(); ++itOptId) - CHECK_ERROR(svr, RemoveGlobalOption(*itOptId)); - - for (VmSlot2OptionIdsIterator itIdVector = VmSlot2Options2Delete.begin(); - itIdVector != VmSlot2Options2Delete.end(); ++itIdVector) - for (DhcpOptIdIterator itOptId = itIdVector->second.begin(); itOptId != itIdVector->second.end(); ++itOptId) - CHECK_ERROR(svr, RemoveVmSlotOption(Bstr(itIdVector->first.VmName.c_str()).raw(), - itIdVector->first.u8Slot, *itOptId)); - - /* Global Options */ - for (DhcpOptIterator itOpt = GlobalDhcpOptions.begin(); itOpt != GlobalDhcpOptions.end(); ++itOpt) - CHECK_ERROR(svr, AddGlobalOption(itOpt->first, com::Bstr(itOpt->second.c_str()).raw())); - - /* VM slot options. */ - for (VmSlot2OptionsIterator it = VmSlot2Options.begin(); it != VmSlot2Options.end(); ++it) - for (DhcpOptIterator itOpt = it->second.begin(); itOpt != it->second.end(); ++itOpt) - CHECK_ERROR(svr, AddVmSlotOption(Bstr(it->first.VmName.c_str()).raw(), it->first.u8Slot, itOpt->first, - com::Bstr(itOpt->second.c_str()).raw())); - } - - return RTEXITCODE_SUCCESS; + } + + /* + * Locate the server and perform the requested operation. + */ + ComPtr ptrDHCPServer = dhcpdFindServer(pCtx); + if (ptrDHCPServer.isNotNull()) + { + HRESULT hrc; + CHECK_ERROR2(hrc, pCtx->pArg->virtualBox, RemoveDHCPServer(ptrDHCPServer)); + if (SUCCEEDED(hrc)) + return RTEXITCODE_SUCCESS; + errorArgument("Failed to remove server"); + } + return RTEXITCODE_FAILURE; } /** - * Helper that find the DHCP server instance. - * - * @returns The DHCP server instance. NULL if failed (complaining done). - * @param pCtx The DHCP server command context. - */ -static ComPtr dhcpdFindServer(PDHCPDCMDCTX pCtx) -{ - ComPtr ptrRet; - if (pCtx->pszNetwork || pCtx->pszInterface) - { - Assert(pCtx->pszNetwork == NULL || pCtx->pszInterface == NULL); - - /* - * We need a network name to find the DHCP server. So, if interface is - * given we have to look it up. - */ + * Handles the 'restart' subcommand. + */ +static RTEXITCODE dhcpdHandleRestart(PDHCPDCMDCTX pCtx, int argc, char **argv) +{ + /* + * Parse the command line. + */ + static const RTGETOPTDEF s_aOptions[] = + { + DHCPD_CMD_COMMON_OPTION_DEFS(), + }; + + RTGETOPTSTATE GetState; + int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0); + AssertRCReturn(vrc, RTEXITCODE_FAILURE); + + RTGETOPTUNION ValueUnion; + while ((vrc = RTGetOpt(&GetState, &ValueUnion))) + { + switch (vrc) + { + DHCPD_CMD_COMMON_OPTION_CASES(pCtx, vrc, &ValueUnion); + default: + return errorGetOpt(vrc, &ValueUnion); + } + } + + /* + * Locate the server and perform the requested operation. + */ + ComPtr ptrDHCPServer = dhcpdFindServer(pCtx); + if (ptrDHCPServer.isNotNull()) + { HRESULT hrc; - Bstr bstrNetName(pCtx->pszNetwork); - if (!pCtx->pszNetwork) - { - ComPtr ptrIHost; - CHECK_ERROR2_RET(hrc, pCtx->pArg->virtualBox, COMGETTER(Host)(ptrIHost.asOutParam()), ptrRet); - - Bstr bstrInterface(pCtx->pszInterface); - ComPtr ptrIHostIf; - CHECK_ERROR2(hrc, ptrIHost, FindHostNetworkInterfaceByName(bstrInterface.raw(), ptrIHostIf.asOutParam())); - if (FAILED(hrc)) - { - errorArgument("Failed to locate host-only interface '%s'", pCtx->pszInterface); - return ptrRet; - } - - CHECK_ERROR2_RET(hrc, ptrIHostIf, COMGETTER(NetworkName)(bstrNetName.asOutParam()), ptrRet); - } - - /* - * Now, try locate the server - */ - hrc = pCtx->pArg->virtualBox->FindDHCPServerByNetworkName(bstrNetName.raw(), ptrRet.asOutParam()); + CHECK_ERROR2(hrc, ptrDHCPServer, Restart()); if (SUCCEEDED(hrc)) - return ptrRet; - if (pCtx->pszNetwork) - errorArgument("Failed to find DHCP server for network '%s'", pCtx->pszNetwork); - else - errorArgument("Failed to find DHCP server for host-only interface '%s' (network '%ls')", - pCtx->pszInterface, bstrNetName.raw()); - } - else - errorSyntax("You need to specify either --network or --interface to identify the DHCP server"); - return ptrRet; + return RTEXITCODE_SUCCESS; + errorArgument("Failed to restart server"); + } + return RTEXITCODE_FAILURE; } +/** + * Handles the 'findlease' subcommand. + */ static RTEXITCODE dhcpdHandleFindLease(PDHCPDCMDCTX pCtx, int argc, char **argv) { @@ -592,4 +654,7 @@ +/** + * Handles the 'dhcpserver' command. + */ RTEXITCODE handleDHCPServer(HandlerArg *pArg) { @@ -599,8 +664,8 @@ static const DHCPDCMDDEF s_aCmdDefs[] = { - { "add", dhcpdHandleTooManyCmds, HELP_SCOPE_DHCPSERVER_ADD }, - { "modify", dhcpdHandleTooManyCmds, HELP_SCOPE_DHCPSERVER_MODIFY }, - { "remove", dhcpdHandleTooManyCmds, HELP_SCOPE_DHCPSERVER_REMOVE }, - { "restart", dhcpdHandleTooManyCmds, HELP_SCOPE_DHCPSERVER_RESTART }, + { "add", dhcpdHandleAddAndModify, HELP_SCOPE_DHCPSERVER_ADD }, + { "modify", dhcpdHandleAddAndModify, HELP_SCOPE_DHCPSERVER_MODIFY }, + { "remove", dhcpdHandleRemove, HELP_SCOPE_DHCPSERVER_REMOVE }, + { "restart", dhcpdHandleRestart, HELP_SCOPE_DHCPSERVER_RESTART }, { "findlease", dhcpdHandleFindLease, HELP_SCOPE_DHCPSERVER_FINDLEASE }, }; @@ -616,15 +681,15 @@ static const RTGETOPTDEF s_CommonOptions[] = { DHCPD_CMD_COMMON_OPTION_DEFS() }; - - int ch; + RTGETOPTSTATE GetState; + int vrc = RTGetOptInit(&GetState, pArg->argc, pArg->argv, s_CommonOptions, RT_ELEMENTS(s_CommonOptions), 0, + 0 /* No sorting! */); + AssertRCReturn(vrc, RTEXITCODE_FAILURE); + RTGETOPTUNION ValueUnion; - RTGETOPTSTATE GetState; - RTGetOptInit(&GetState, pArg->argc, pArg->argv, s_CommonOptions, RT_ELEMENTS(s_CommonOptions), 0, 0 /* No sorting! */); - - while ((ch = RTGetOpt(&GetState, &ValueUnion)) != 0) - { - switch (ch) + while ((vrc = RTGetOpt(&GetState, &ValueUnion)) != 0) + { + switch (vrc) { - DHCPD_CMD_COMMON_OPTION_CASES(&CmdCtx, ch, &ValueUnion); + DHCPD_CMD_COMMON_OPTION_CASES(&CmdCtx, vrc, &ValueUnion); case VINF_GETOPT_NOT_OPTION: @@ -644,5 +709,5 @@ default: - return errorGetOpt(ch, &ValueUnion); + return errorGetOpt(vrc, &ValueUnion); } }