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:28 UTC
[14/21] incubator-guacamole-server git commit: GUACAMOLE-203: Change
timer to timeout
GUACAMOLE-203: Change timer to timeout
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/8c24c77d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/8c24c77d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/8c24c77d
Branch: refs/heads/master
Commit: 8c24c77d555312d4227ab79713a5c2333a76c623
Parents: af4d762
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Jun 14 13:00:30 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Jun 14 13:00:30 2017 -0400
----------------------------------------------------------------------
src/protocols/ssh/settings.h | 4 ++--
src/protocols/ssh/ssh.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/8c24c77d/src/protocols/ssh/settings.h
----------------------------------------------------------------------
diff --git a/src/protocols/ssh/settings.h b/src/protocols/ssh/settings.h
index 101caf7..ea9f5ac 100644
--- a/src/protocols/ssh/settings.h
+++ b/src/protocols/ssh/settings.h
@@ -54,9 +54,9 @@
#define GUAC_SSH_DEFAULT_RECORDING_NAME "recording"
/**
- * The default polling timer for SSH activity in milliseconds.
+ * The default polling timeout for SSH activity in milliseconds.
*/
-#define GUAC_SSH_DEFAULT_POLL_TIMER 1000
+#define GUAC_SSH_DEFAULT_POLL_TIMEOUT 1000
/**
* Settings for the SSH connection. The values for this structure are parsed
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/8c24c77d/src/protocols/ssh/ssh.c
----------------------------------------------------------------------
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index 59039bb..afbfe33 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -343,7 +343,7 @@ void* ssh_client_thread(void* data) {
}
/* If keepalive is not configured, sleep for the default of 1 second */
else
- timer = GUAC_SSH_DEFAULT_POLL_TIMER;
+ timer = GUAC_SSH_DEFAULT_POLL_TIMEOUT;
/* Read terminal data */
bytes_read = libssh2_channel_read(ssh_client->term_channel,