You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/06/25 19:02:27 UTC
[13/21] incubator-guacamole-server git commit: GUACAMOLE-203: Move
warning about minimum alive interval to single place in common code.
GUACAMOLE-203: Move warning about minimum alive interval to single place in common code.
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/af4d7621
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/af4d7621
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/af4d7621
Branch: refs/heads/master
Commit: af4d76214773187da5d93241c88dac05148502eb
Parents: 89b9a90
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Jun 14 12:49:49 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Jun 14 12:49:49 2017 -0400
----------------------------------------------------------------------
src/common-ssh/ssh.c | 6 ++++++
src/protocols/rdp/rdp_settings.c | 3 ---
src/protocols/ssh/settings.c | 3 ---
src/protocols/vnc/settings.c | 3 ---
4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/af4d7621/src/common-ssh/ssh.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/ssh.c b/src/common-ssh/ssh.c
index 3bff4b3..00f6327 100644
--- a/src/common-ssh/ssh.c
+++ b/src/common-ssh/ssh.c
@@ -536,6 +536,12 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
if (keepalive > 0)
libssh2_keepalive_config(common_session->session, 1, keepalive);
+ /* Warn if keepalive below minimum value */
+ if (keepalive == 1) {
+ guac_user_log(user, GUAC_LOG_WARNING, "keepalive interval will "
+ "be rounded up to minimum value of 2.");
+ }
+
/* Return created session */
return common_session;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/af4d7621/src/protocols/rdp/rdp_settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index eebf902..f73ef9d 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -788,9 +788,6 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
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_server_alive_interval == 1)
- guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed "
- "value for keepalives is 2 seconds, this will be rounded up.");
#endif
/* Read recording path */
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/af4d7621/src/protocols/ssh/settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c
index 9859415..8843923 100644
--- a/src/protocols/ssh/settings.c
+++ b/src/protocols/ssh/settings.c
@@ -291,9 +291,6 @@ guac_ssh_settings* guac_ssh_parse_args(guac_user* user,
settings->server_alive_interval =
guac_user_parse_args_int(user, GUAC_SSH_CLIENT_ARGS, argv,
IDX_SERVER_ALIVE_INTERVAL, 0);
- if (settings->server_alive_interval == 1)
- guac_user_log(user, GUAC_LOG_WARNING, "Minimum keepalive interval "
- " for libssh2 is 2 seconds.");
/* Parsing was successful */
return settings;
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/af4d7621/src/protocols/vnc/settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index cf1d8bc..697466d 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -409,9 +409,6 @@ guac_vnc_settings* guac_vnc_parse_args(guac_user* user,
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_server_alive_interval == 1)
- guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed "
- "value for keepalives is 2 seconds.");
#endif
/* Read recording path */