Repository: incubator-guacamole-server Updated Branches: refs/heads/master 770a2805e -> d9c1ce773
GUACAMOLE-203: Add option entries for ServerAliveInterval. 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/f42f05aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/f42f05aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/f42f05aa Branch: refs/heads/master Commit: f42f05aab70b28a9cfd407e26978ebb5263d8787 Parents: 9ee224f Author: Nick Couchman <[email protected]> Authored: Tue May 30 16:40:33 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Wed May 31 21:02:38 2017 -0400 ---------------------------------------------------------------------- src/protocols/ssh/settings.c | 12 ++++++++++++ src/protocols/ssh/settings.h | 5 +++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/f42f05aa/src/protocols/ssh/settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c index 35f88e0..91ec9e6 100644 --- a/src/protocols/ssh/settings.c +++ b/src/protocols/ssh/settings.c @@ -51,6 +51,7 @@ const char* GUAC_SSH_CLIENT_ARGS[] = { "recording-name", "create-recording-path", "read-only", + "server-alive-interval", NULL }; @@ -165,6 +166,12 @@ enum SSH_ARGS_IDX { */ IDX_READ_ONLY, + /** + * Number of seconds between sending alive packets. A default of 0 + * tells SSH not to send these packets. + */ + IDX_SERVER_ALIVE_INTERVAL, + SSH_ARGS_COUNT }; @@ -279,6 +286,11 @@ guac_ssh_settings* guac_ssh_parse_args(guac_user* user, guac_user_parse_args_boolean(user, GUAC_SSH_CLIENT_ARGS, argv, IDX_CREATE_RECORDING_PATH, false); + /* Parse server alive interval */ + settings->server_alive_interval = + guac_user_parse_args_int(user, GUAC_SSH_CLIENT_ARGS, argv, + IDX_SERVER_ALIVE_INTERVAL, 0); + /* Parsing was successful */ return settings; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/f42f05aa/src/protocols/ssh/settings.h ---------------------------------------------------------------------- diff --git a/src/protocols/ssh/settings.h b/src/protocols/ssh/settings.h index 6d3e47a..3440e5b 100644 --- a/src/protocols/ssh/settings.h +++ b/src/protocols/ssh/settings.h @@ -181,6 +181,11 @@ typedef struct guac_ssh_settings { */ bool create_recording_path; + /** + * The number of seconds between sending server alive messages. + */ + int server_alive_interval; + } guac_ssh_settings; /**
