GUACAMOLE-203: Change alive interval from int to unsigned.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/df718395 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/df718395 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/df718395 Branch: refs/heads/master Commit: df718395e8a40f48aa863dafc9bfb902abc070ae Parents: 193051d Author: Nick Couchman <[email protected]> Authored: Wed Jun 14 10:17:28 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Wed Jun 14 10:17:28 2017 -0400 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/rdp/rdp.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index 7b52a91..d06fad3 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) { http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/rdp/rdp_settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c index 2b6635f..98ecdbb 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 */ http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/rdp/rdp_settings.h ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_settings.h b/src/protocols/rdp/rdp_settings.h index 47e5289..e2013b7 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 /** http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/ssh/settings.h ---------------------------------------------------------------------- diff --git a/src/protocols/ssh/settings.h b/src/protocols/ssh/settings.h index e831d9e..101caf7 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; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/vnc/settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c index a9e4228..cf1d8bc 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 */ http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/vnc/settings.h ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/settings.h b/src/protocols/vnc/settings.h index ba1bfdd..a9ce82c 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 /** http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/df718395/src/protocols/vnc/vnc.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c index 9aac436..81d46f1 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) {
