You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/09/22 00:27:28 UTC
[4/8] guacamole-server git commit: GUACAMOLE-622: Ensure connection
to guacd is kept alive even if the SSH daemon is taking its time responding.
Lengthy connect times due to DNS verification, PAM, etc. are not uncommon.
GUACAMOLE-622: Ensure connection to guacd is kept alive even if the SSH daemon is taking its time responding. Lengthy connect times due to DNS verification, PAM, etc. are not uncommon.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/286cbf32
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/286cbf32
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/286cbf32
Branch: refs/heads/master
Commit: 286cbf32a7a178cd6483a52983a33d486edc9129
Parents: 4606607
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Sep 1 21:26:37 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Sep 2 23:04:14 2018 -0700
----------------------------------------------------------------------
src/protocols/ssh/ssh.c | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/286cbf32/src/protocols/ssh/ssh.c
----------------------------------------------------------------------
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index 0760f29..cddb2fe 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -233,6 +233,9 @@ void* ssh_client_thread(void* data) {
return NULL;
}
+ /* Ensure connection is kept alive during lengthy connects */
+ guac_socket_require_keep_alive(client->socket);
+
/* Open SSH session */
ssh_client->session = guac_common_ssh_create_session(client,
settings->hostname, settings->port, ssh_client->user, settings->server_alive_interval,