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

GUACAMOLE-203: Change parameter name for consistency

Browse Source
This commit is contained in:
Nick Couchman 2017-06-14 08:40:07 -04:00
parent 070bd25721
commit 193051dfd5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ const char* GUAC_RDP_CLIENT_ARGS[] = {
"sftp-private-key", "sftp-private-key",
"sftp-passphrase", "sftp-passphrase",
"sftp-directory", "sftp-directory",
"sftp-keepalive", "sftp-server-alive-interval",
#endif #endif
"recording-path", "recording-path",
@ -373,7 +373,7 @@ enum RDP_ARGS_IDX {
* of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner * of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner
* cases. * cases.
*/ */
IDX_SFTP_KEEPALIVE, IDX_SFTP_SERVER_ALIVE_INTERVAL,
#endif #endif
/** /**
@ -787,7 +787,7 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
/* Default keepalive value */ /* Default keepalive value */
settings->sftp_keepalive = settings->sftp_keepalive =
guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv, guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_SFTP_KEEPALIVE, 0); IDX_SFTP_SERVER_ALIVE_INTERVAL, 0);
if (settings->sftp_keepalive == 1) if (settings->sftp_keepalive == 1)
guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed " guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed "
"value for keepalives by libssh2 is 2 seconds."); "value for keepalives by libssh2 is 2 seconds.");

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

@ -66,7 +66,7 @@ const char* GUAC_VNC_CLIENT_ARGS[] = {
"sftp-private-key", "sftp-private-key",
"sftp-passphrase", "sftp-passphrase",
"sftp-directory", "sftp-directory",
"sftp-keepalive", "sftp-server-alive-interval",
#endif #endif
"recording-path", "recording-path",
@ -232,10 +232,10 @@ enum VNC_ARGS_IDX {
/** /**
* The interval at which SSH keepalive messages are sent to the server for * The interval at which SSH keepalive messages are sent to the server for
* SFTP connections. The default is 0 (disabling keepalives), and a value * SFTP connections. The default is 0 (disabling keepalives), and a value
* of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner * of 1 is automatically incremented to 2 by libssh2 to avoid busy loop corner
* cases. * cases.
*/ */
IDX_SFTP_KEEPALIVE, IDX_SFTP_SERVER_ALIVE_INTERVAL,
#endif #endif
/** /**
@ -408,7 +408,7 @@ guac_vnc_settings* guac_vnc_parse_args(guac_user* user,
/* Default keepalive value */ /* Default keepalive value */
settings->sftp_keepalive = settings->sftp_keepalive =
guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv, guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv,
IDX_SFTP_KEEPALIVE, 0); IDX_SFTP_SERVER_ALIVE_INTERVAL, 0);
if (settings->sftp_keepalive == 1) if (settings->sftp_keepalive == 1)
guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed " guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed "
"value for keepalives by libssh2 is 2 seconds."); "value for keepalives by libssh2 is 2 seconds.");