mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed /gt:xxx settings (#7808)

Browse Source 
* Disable websocket support with RPC
* Use settings getter/setter
This commit is contained in:
akallabeth 2022-04-19 14:47:57 +02:00 committed by GitHub
parent 73cdcdfe09
commit f99491c354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/common/cmdline.c
View File

@ -2202,8 +2202,10 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
{ {
if (_stricmp(arg->Value, "rpc") == 0) if (_stricmp(arg->Value, "rpc") == 0)
{ {
settings->GatewayRpcTransport = TRUE; if (!freerdp_settings_set_bool(settings, FreeRDP_GatewayRpcTransport, TRUE) ||
settings->GatewayHttpTransport = FALSE; !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpTransport, FALSE) ||
!freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpUseWebsockets, FALSE))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
} }
else else
{ {
@ -2212,21 +2214,24 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
{ {
*c++ = '\0'; *c++ = '\0';
if (_stricmp(c, "no-websockets") != 0) if (_stricmp(c, "no-websockets") != 0)
{
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE; return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpUseWebsockets, FALSE); if (!freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpUseWebsockets,
FALSE))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
} }
if (_stricmp(arg->Value, "http") == 0) if (_stricmp(arg->Value, "http") == 0)
{ {
settings->GatewayRpcTransport = FALSE; if (!freerdp_settings_set_bool(settings, FreeRDP_GatewayRpcTransport, FALSE) ||
settings->GatewayHttpTransport = TRUE; !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpTransport, TRUE))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
} }
else if (_stricmp(arg->Value, "auto") == 0) else if (_stricmp(arg->Value, "auto") == 0)
{ {
settings->GatewayRpcTransport = TRUE; if (!freerdp_settings_set_bool(settings, FreeRDP_GatewayRpcTransport, TRUE) ||
settings->GatewayHttpTransport = TRUE; !freerdp_settings_set_bool(settings, FreeRDP_GatewayHttpTransport, TRUE))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
} }
} }
} }