Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GUACAMOLE-600: Name RDP timeout setting consistent with other protocols. #537

Merged
merged 1 commit into from
Aug 27, 2024
Merged

GUACAMOLE-600: Name RDP timeout setting consistent with other protocols. #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/protocols/rdp/settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const char fips_nla_mode_warning[] = (
const char* GUAC_RDP_CLIENT_ARGS[] = {
"hostname",
"port",
"server-timeout",
"timeout",
GUAC_RDP_ARGV_DOMAIN,
GUAC_RDP_ARGV_USERNAME,
GUAC_RDP_ARGV_PASSWORD,
Expand Down Expand Up @@ -169,7 +169,7 @@ enum RDP_ARGS_IDX {
/**
* The amount of time to wait for the server to respond, in seconds.
*/
IDX_SERVER_TIMEOUT,
IDX_TIMEOUT,

/**
* The domain of the user logging in.
Expand Down Expand Up @@ -830,9 +830,9 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
settings->security_mode == GUAC_SECURITY_VMCONNECT ? RDP_DEFAULT_VMCONNECT_PORT : RDP_DEFAULT_PORT);

/* Look for timeout settings and parse or set defaults. */
settings->server_timeout =
settings->timeout =
guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_SERVER_TIMEOUT, RDP_DEFAULT_SERVER_TIMEOUT);
IDX_TIMEOUT, RDP_DEFAULT_TIMEOUT);

guac_user_log(user, GUAC_LOG_DEBUG,
"User resolution is %ix%i at %i DPI",
Expand Down Expand Up @@ -1744,7 +1744,7 @@ void guac_rdp_push_settings(guac_client* client,
/* Connection */
rdp_settings->ServerHostname = guac_strdup(guac_settings->hostname);
rdp_settings->ServerPort = guac_settings->port;
rdp_settings->TcpAckTimeout = guac_settings->server_timeout * 1000;
rdp_settings->TcpAckTimeout = guac_settings->timeout * 1000;

/* Session */
rdp_settings->ColorDepth = guac_settings->color_depth;
Expand Down
4 changes: 2 additions & 2 deletions src/protocols/rdp/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/**
* The default server response timeout, in seconds.
*/
#define RDP_DEFAULT_SERVER_TIMEOUT 10
#define RDP_DEFAULT_TIMEOUT 10

/**
* The default RDP port.
Expand Down Expand Up @@ -169,7 +169,7 @@ typedef struct guac_rdp_settings {
/**
* The timeout, in seconds, to wait for the remote host to respond.
*/
int server_timeout;
int timeout;

/**
* The domain of the user logging in.
Expand Down
Loading