GUACAMOLE-203: Merge support for SSH/SFTP connection keep-alive packets.
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/d9c1ce77 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/d9c1ce77 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/d9c1ce77 Branch: refs/heads/master Commit: d9c1ce77387679cdfe61704eb4cc9e7ccde92654 Parents: 770a280 a5efbb5 Author: Michael Jumper <mjum...@apache.org> Authored: Sun Jun 25 12:01:02 2017 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Sun Jun 25 12:01:02 2017 -0700 ---------------------------------------------------------------------- src/common-ssh/common-ssh/ssh.h | 2 +- src/common-ssh/ssh.c | 16 +++++++++++++++- src/protocols/rdp/rdp.c | 2 +- src/protocols/rdp/rdp_settings.c | 13 +++++++++++++ src/protocols/rdp/rdp_settings.h | 8 ++++++++ src/protocols/ssh/settings.c | 13 +++++++++++++ src/protocols/ssh/settings.h | 10 ++++++++++ src/protocols/ssh/ssh.c | 22 ++++++++++++++++++---- src/protocols/vnc/settings.c | 14 ++++++++++++++ src/protocols/vnc/settings.h | 8 ++++++++ src/protocols/vnc/vnc.c | 2 +- 11 files changed, 102 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
