maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-203: Move warning about minimum alive interval to single place in common code.

Browse Source
This commit is contained in:
Nick Couchman 2017-06-14 12:49:49 -04:00
parent 89b9a905db
commit af4d762147
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common-ssh/ssh.c
View File

@ -536,6 +536,12 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
if (keepalive > 0) if (keepalive > 0)
libssh2_keepalive_config(common_session->session, 1, keepalive); 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 created session */
return common_session; return common_session;

3
src/protocols/rdp/rdp_settings.c
View File

@ -788,9 +788,6 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
settings->sftp_server_alive_interval = settings->sftp_server_alive_interval =
guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv, guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_SFTP_SERVER_ALIVE_INTERVAL, 0); 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 #endif
/* Read recording path */ /* Read recording path */

3
src/protocols/ssh/settings.c
View File

@ -291,9 +291,6 @@ guac_ssh_settings* guac_ssh_parse_args(guac_user* user,
settings->server_alive_interval = settings->server_alive_interval =
guac_user_parse_args_int(user, GUAC_SSH_CLIENT_ARGS, argv, guac_user_parse_args_int(user, GUAC_SSH_CLIENT_ARGS, argv,
IDX_SERVER_ALIVE_INTERVAL, 0); 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 */ /* Parsing was successful */
return settings; return settings;

3
src/protocols/vnc/settings.c
View File

@ -409,9 +409,6 @@ guac_vnc_settings* guac_vnc_parse_args(guac_user* user,
settings->sftp_server_alive_interval = settings->sftp_server_alive_interval =
guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv, guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv,
IDX_SFTP_SERVER_ALIVE_INTERVAL, 0); 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 #endif
/* Read recording path */ /* Read recording path */