From df718395e8a40f48aa863dafc9bfb902abc070ae Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Wed, 14 Jun 2017 10:17:28 -0400
Subject: [PATCH] GUACAMOLE-203: Change alive interval from int to unsigned.

---
 src/protocols/rdp/rdp.c          | 2 +-
 src/protocols/rdp/rdp_settings.c | 6 +++---
 src/protocols/rdp/rdp_settings.h | 2 +-
 src/protocols/ssh/settings.h     | 2 +-
 src/protocols/vnc/settings.c     | 6 +++---
 src/protocols/vnc/settings.h     | 2 +-
 src/protocols/vnc/vnc.c          | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c
index 7b52a917..d06fad32 100644
--- a/src/protocols/rdp/rdp.c
+++ b/src/protocols/rdp/rdp.c
@@ -977,7 +977,7 @@ void* guac_rdp_client_thread(void* data) {
         /* Attempt SSH connection */
         rdp_client->sftp_session =
             guac_common_ssh_create_session(client, settings->sftp_hostname,
-                    settings->sftp_port, rdp_client->sftp_user, settings->sftp_keepalive);
+                    settings->sftp_port, rdp_client->sftp_user, settings->sftp_server_alive_interval);
 
         /* Fail if SSH connection does not succeed */
         if (rdp_client->sftp_session == NULL) {
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index 2b6635f8..98ecdbbf 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -785,12 +785,12 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
                 IDX_SFTP_DIRECTORY, NULL);
 
     /* Default keepalive value */
-    settings->sftp_keepalive =
+    settings->sftp_server_alive_interval =
         guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
                 IDX_SFTP_SERVER_ALIVE_INTERVAL, 0);
-    if (settings->sftp_keepalive == 1)
+    if (settings->sftp_server_alive_interval == 1)
         guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed "
-                "value for keepalives by libssh2 is 2 seconds.");
+                "value for keepalives is 2 seconds.");
 #endif
 
     /* Read recording path */
diff --git a/src/protocols/rdp/rdp_settings.h b/src/protocols/rdp/rdp_settings.h
index 47e5289a..e2013b7b 100644
--- a/src/protocols/rdp/rdp_settings.h
+++ b/src/protocols/rdp/rdp_settings.h
@@ -366,7 +366,7 @@ typedef struct guac_rdp_settings {
      * of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner
      * cases.
      */
-    int sftp_keepalive;
+    unsigned sftp_server_alive_interval;
 #endif
 
     /**
diff --git a/src/protocols/ssh/settings.h b/src/protocols/ssh/settings.h
index e831d9e9..101caf70 100644
--- a/src/protocols/ssh/settings.h
+++ b/src/protocols/ssh/settings.h
@@ -189,7 +189,7 @@ typedef struct guac_ssh_settings {
     /**
      * The number of seconds between sending server alive messages.
      */
-    int server_alive_interval;
+    unsigned server_alive_interval;
 
 } guac_ssh_settings;
 
diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index a9e4228a..cf1d8bca 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -406,12 +406,12 @@ guac_vnc_settings* guac_vnc_parse_args(guac_user* user,
                 IDX_SFTP_DIRECTORY, NULL);
 
     /* Default keepalive value */
-    settings->sftp_keepalive =
+    settings->sftp_server_alive_interval =
         guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv,
                 IDX_SFTP_SERVER_ALIVE_INTERVAL, 0);
-    if (settings->sftp_keepalive == 1)
+    if (settings->sftp_server_alive_interval == 1)
         guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed "
-                "value for keepalives by libssh2 is 2 seconds.");
+                "value for keepalives is 2 seconds.");
 #endif
 
     /* Read recording path */
diff --git a/src/protocols/vnc/settings.h b/src/protocols/vnc/settings.h
index ba1bfdde..a9ce82c5 100644
--- a/src/protocols/vnc/settings.h
+++ b/src/protocols/vnc/settings.h
@@ -180,7 +180,7 @@ typedef struct guac_vnc_settings {
      * of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner
      * cases.
      */
-    int sftp_keepalive;
+    unsigned sftp_server_alive_interval;
 #endif
 
     /**
diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c
index 9aac436b..81d46f1b 100644
--- a/src/protocols/vnc/vnc.c
+++ b/src/protocols/vnc/vnc.c
@@ -261,7 +261,7 @@ void* guac_vnc_client_thread(void* data) {
         /* Attempt SSH connection */
         vnc_client->sftp_session =
             guac_common_ssh_create_session(client, settings->sftp_hostname,
-                    settings->sftp_port, vnc_client->sftp_user, settings->sftp_keepalive);
+                    settings->sftp_port, vnc_client->sftp_user, settings->sftp_server_alive_interval);
 
         /* Fail if SSH connection does not succeed */
         if (vnc_client->sftp_session == NULL) {