GUACAMOLE-203: Add configuration option for SSH keepalives in SFTP connections.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/605ff4f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/605ff4f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/605ff4f6 Branch: refs/heads/master Commit: 605ff4f6156e96f0bf40ebce45581dce50c3b7c4 Parents: 5e9c2c6 Author: Nick Couchman <vn...@apache.org> Authored: Wed May 31 21:07:14 2017 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Wed May 31 21:07:14 2017 -0400 ---------------------------------------------------------------------- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++ .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/webapp/translations/en.json | 2 ++ 3 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/605ff4f6/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json index d7681a9..32a6b00 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json @@ -318,6 +318,10 @@ { "name" : "sftp-directory", "type" : "TEXT" + }, + { + "name" : "sftp-keepalive", + "type" : "NUMERIC" } ] } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/605ff4f6/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json index 4d42f55..a06fb8f 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json @@ -131,6 +131,10 @@ { "name" : "sftp-directory", "type" : "TEXT" + }, + { + "name" : "sftp-keepalive", + "type" : "NUMERIC" } ] }, http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/605ff4f6/guacamole/src/main/webapp/translations/en.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 2ce6932..fb17e4e 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -355,6 +355,7 @@ "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", + "FIELD_HEADER_SFTP_KEEPALIVE" : "SFTP Keepalive Interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", @@ -532,6 +533,7 @@ "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", + "FIELD_HEADER_SFTP_KEEPALIVE" : "SFTP Keepalive Interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:",