AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-13 11:14:59 +03:00
Code Releases Activity

Cedar: Add support for 32 bit unsigned integer Proto options

Browse Source 
This commit also fixes a bug which caused the server to initialize all boolean options to false.

It was caused by SiLoadProtoCfg() not checking whether the item exists in the configuration file.

CfgGetBool() always returns false if the item doesn't exist.
This commit is contained in:
Davide Beatrici
2021-04-21 08:12:45 +02:00
parent 6a25ccfa28
commit 4b05de1a93
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Cedar/Command.c
View File

@ -22909,6 +22909,9 @@ UINT PsProtoOptionsSet(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
case PROTO_OPTION_BOOL:
option->Bool = GetParamYes(o, "VALUE");
break;
case PROTO_OPTION_UINT32:
option->UInt32 = GetParamInt(o, "VALUE");
break;
default:
ret = ERR_INTERNAL_ERROR;
}
@ -22979,13 +22982,19 @@ UINT PsProtoOptionsGet(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
switch (option->Type)
{
case PROTO_OPTION_STRING:
type = L"String";
value = CopyStrToUni(option->String);
break;
case PROTO_OPTION_BOOL:
type = L"Boolean";
value = option->Bool ? L"True" : L"False";
break;
case PROTO_OPTION_STRING:
type = L"String";
value = CopyStrToUni(option->String);
case PROTO_OPTION_UINT32:
type = L"32 bit unsigned integer";
char tmp[MAX_SIZE];
Format(tmp, sizeof(tmp), "%u", option->UInt32);
value = CopyStrToUni(tmp);
break;
default:
Debug("StGetProtoOptions(): unhandled option type %u!\n", option->Type);
@ -22997,7 +23006,7 @@ UINT PsProtoOptionsGet(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
CtInsert(ct, name, type, value, _UU(description_str_key));
if (option->Type == PROTO_OPTION_STRING)
if (option->Type != PROTO_OPTION_BOOL)
{
Free(value);
}