diff options
author | Matt Johnston <matt@ucc.asn.au> | 2014-08-19 23:08:56 +0800 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2014-08-19 23:08:56 +0800 |
commit | 6d2d3669f39f12182b79a0067f477b58948897f6 (patch) | |
tree | 710285eb2899e8dc49108f0d690edceb811d0644 /cli-chansession.c | |
parent | 1387654cc8ac3f14b1c144f838fee5d0f51921c0 (diff) |
Make keepalive handling more robust, this should now match what OpenSSH does
Diffstat (limited to 'cli-chansession.c')
-rw-r--r-- | cli-chansession.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cli-chansession.c b/cli-chansession.c index c16443e..57457d2 100644 --- a/cli-chansession.c +++ b/cli-chansession.c @@ -92,17 +92,6 @@ static void cli_closechansess(struct Channel *UNUSED(channel)) { } } -void cli_start_send_channel_request(struct Channel *channel, - unsigned char *type) { - - CHECKCLEARTOWRITE(); - buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); - buf_putint(ses.writepayload, channel->remotechan); - - buf_putstring(ses.writepayload, type, strlen(type)); - -} - /* Taken from OpenSSH's sshtty.c: * RCSID("OpenBSD: sshtty.c,v 1.5 2003/09/19 17:43:35 markus Exp "); */ static void cli_tty_setup() { @@ -287,7 +276,7 @@ static void send_chansess_pty_req(struct Channel *channel) { TRACE(("enter send_chansess_pty_req")) - cli_start_send_channel_request(channel, "pty-req"); + start_send_channel_request(channel, "pty-req"); /* Don't want replies */ buf_putbyte(ses.writepayload, 0); @@ -330,7 +319,7 @@ static void send_chansess_shell_req(struct Channel *channel) { reqtype = "shell"; } - cli_start_send_channel_request(channel, reqtype); + start_send_channel_request(channel, reqtype); /* XXX TODO */ buf_putbyte(ses.writepayload, 0); /* Don't want replies */ |