comparison cli-chansession.c @ 801:7dcb46da72d9 ecc

merge in HEAD
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 May 2013 12:09:35 +0800
parents ac2158e3e403 b2d4205b0897
children 4095b6d7c9fc
comparison
equal deleted inserted replaced
799:c344607b7341 801:7dcb46da72d9
80 } 80 }
81 81
82 82
83 /* If the main session goes, we close it up */ 83 /* If the main session goes, we close it up */
84 static void cli_closechansess(struct Channel *UNUSED(channel)) { 84 static void cli_closechansess(struct Channel *UNUSED(channel)) {
85 cli_tty_cleanup(); /* Restore tty modes etc */
85 86
86 /* This channel hasn't gone yet, so we have > 1 */ 87 /* This channel hasn't gone yet, so we have > 1 */
87 if (ses.chancount > 1) { 88 if (ses.chancount > 1) {
88 dropbear_log(LOG_INFO, "Waiting for other channels to close..."); 89 dropbear_log(LOG_INFO, "Waiting for other channels to close...");
89 } 90 }
90
91 cli_tty_cleanup(); /* Restore tty modes etc */
92
93 } 91 }
94 92
95 void cli_start_send_channel_request(struct Channel *channel, 93 void cli_start_send_channel_request(struct Channel *channel,
96 unsigned char *type) { 94 unsigned char *type) {
97 95