From 049f5f7c0c326879ed68366029d6b85c08727da8 Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Mon, 26 Aug 2024 15:47:17 -0400
Subject: [PATCH] GUACAMOLE-600: Name RDP timeout setting consistent with other
 protocols.

---
 src/protocols/rdp/settings.c | 10 +++++-----
 src/protocols/rdp/settings.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/protocols/rdp/settings.c b/src/protocols/rdp/settings.c
index 548345cc7..3edd11c5c 100644
--- a/src/protocols/rdp/settings.c
+++ b/src/protocols/rdp/settings.c
@@ -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,
@@ -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.
@@ -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",
@@ -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;
diff --git a/src/protocols/rdp/settings.h b/src/protocols/rdp/settings.h
index cedbee950..330fc7636 100644
--- a/src/protocols/rdp/settings.h
+++ b/src/protocols/rdp/settings.h
@@ -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.
@@ -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.