dropbear: cli-chansession.c annotate

annotate cli-chansession.c @ 785:ff6e551da826

Don't enable CLI_IMMEDIATE_AUTH by default, it breaks blank password logins

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 18 Apr 2013 21:47:38 +0800
parents	b2d4205b0897
children	7dcb46da72d9 84e4259dae3e

rev	line source
74 e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	1 /*
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	2 * Dropbear SSH
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	3 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	5 * Copyright (c) 2004 by Mihnea Stoenescu
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	6 * All rights reserved.
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	7 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	8 * Permission is hereby granted, free of charge, to any person obtaining a copy
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	9 * of this software and associated documentation files (the "Software"), to deal
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	10 * in the Software without restriction, including without limitation the rights
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	12 * copies of the Software, and to permit persons to whom the Software is
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	13 * furnished to do so, subject to the following conditions:
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	14 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	15 * The above copyright notice and this permission notice shall be included in
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	16 * all copies or substantial portions of the Software.
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	17 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	24 * SOFTWARE. */
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	25
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "includes.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "packet.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "buffer.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "session.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "dbutil.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "channel.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "ssh.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "runopts.h"
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	34 #include "termcodes.h"
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	35 #include "chansession.h"
560 52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	36 #include "agentfwd.h"
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 static void cli_closechansess(struct Channel *channel);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 static int cli_initchansess(struct Channel *channel);
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	40 static void cli_chansessreq(struct Channel *channel);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 static void send_chansess_pty_req(struct Channel *channel);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 static void send_chansess_shell_req(struct Channel *channel);
722 4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	43 static void cli_escape_handler(struct Channel channel, unsigned char buf, int *len);
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	44
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 static void cli_tty_setup();
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47
107 d3eb1fa8484e Nasty. Matt Johnston <matt@ucc.asn.au> parents: 99 diff changeset	48 const struct ChanType clichansess = {
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 0, /* sepfds */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 "session", /* name */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 cli_initchansess, /* inithandler */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 NULL, /* checkclosehandler */
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	53 cli_chansessreq, /* reqhandler */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 cli_closechansess, /* closehandler */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 };
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	57 static void cli_chansessreq(struct Channel *channel) {
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	58
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	59 unsigned char* type = NULL;
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	60 int wantreply;
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	61
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	62 TRACE(("enter cli_chansessreq"))
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	63
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	64 type = buf_getstring(ses.payload, NULL);
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	65 wantreply = buf_getbool(ses.payload);
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	66
422 a9e0ddac5ba7 Ignore "exit-signal" request rather than returning failure Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	67 if (strcmp(type, "exit-status") == 0) {
a9e0ddac5ba7 Ignore "exit-signal" request rather than returning failure Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	68 cli_ses.retval = buf_getint(ses.payload);
a9e0ddac5ba7 Ignore "exit-signal" request rather than returning failure Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	69 TRACE(("got exit-status of '%d'", cli_ses.retval))
a9e0ddac5ba7 Ignore "exit-signal" request rather than returning failure Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	70 } else if (strcmp(type, "exit-signal") == 0) {
a9e0ddac5ba7 Ignore "exit-signal" request rather than returning failure Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	71 TRACE(("got exit-signal, ignoring it"))
a9e0ddac5ba7 Ignore "exit-signal" request rather than returning failure Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	72 } else {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	73 TRACE(("unknown request '%s'", type))
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	74 send_msg_channel_failure(channel);
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	75 goto out;
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	76 }
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	77
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	78 out:
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	79 m_free(type);
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	80 }
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	81
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	82
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 /* If the main session goes, we close it up */
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	84 static void cli_closechansess(struct Channel *UNUSED(channel)) {
769 b2d4205b0897 reset terminal modes before printing a message Matt Johnston <matt@ucc.asn.au> parents: 722 diff changeset	85 cli_tty_cleanup(); /* Restore tty modes etc */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 /* This channel hasn't gone yet, so we have > 1 */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 if (ses.chancount > 1) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 dropbear_log(LOG_INFO, "Waiting for other channels to close...");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92
560 52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	93 void cli_start_send_channel_request(struct Channel *channel,
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 unsigned char *type) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 CHECKCLEARTOWRITE();
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 buf_putint(ses.writepayload, channel->remotechan);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 buf_putstring(ses.writepayload, type, strlen(type));
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 /* Taken from OpenSSH's sshtty.c:
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 * RCSID("OpenBSD: sshtty.c,v 1.5 2003/09/19 17:43:35 markus Exp "); */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 static void cli_tty_setup() {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 struct termios tio;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	110 TRACE(("enter cli_pty_setup"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 if (cli_ses.tty_raw_mode == 1) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	113 TRACE(("leave cli_tty_setup: already in raw mode!"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 return;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 if (tcgetattr(STDIN_FILENO, &tio) == -1) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 dropbear_exit("Failed to set raw TTY mode");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 /* make a copy */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 cli_ses.saved_tio = tio;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 tio.c_iflag \|= IGNPAR;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 tio.c_iflag &= ~(ISTRIP \| INLCR \| IGNCR \| ICRNL \| IXON \| IXANY \| IXOFF);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 #ifdef IUCLC
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 tio.c_iflag &= ~IUCLC;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 #endif
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 tio.c_lflag &= ~(ISIG \| ICANON \| ECHO \| ECHOE \| ECHOK \| ECHONL);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 #ifdef IEXTEN
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 tio.c_lflag &= ~IEXTEN;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 #endif
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 tio.c_oflag &= ~OPOST;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 tio.c_cc[VMIN] = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 tio.c_cc[VTIME] = 0;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 if (tcsetattr(STDIN_FILENO, TCSADRAIN, &tio) == -1) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 dropbear_exit("Failed to set raw TTY mode");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 cli_ses.tty_raw_mode = 1;
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	141 TRACE(("leave cli_tty_setup"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	144 void cli_tty_cleanup() {
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	146 TRACE(("enter cli_tty_cleanup"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 if (cli_ses.tty_raw_mode == 0) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	149 TRACE(("leave cli_tty_cleanup: not in raw mode"))
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	150 return;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 if (tcsetattr(STDIN_FILENO, TCSADRAIN, &cli_ses.saved_tio) == -1) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 dropbear_log(LOG_WARNING, "Failed restoring TTY");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 } else {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156 cli_ses.tty_raw_mode = 0;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	159 TRACE(("leave cli_tty_cleanup"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	162 static void put_termcodes() {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	163
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	164 struct termios tio;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	165 unsigned int sshcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	166 const struct TermCode *termcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	167 unsigned int value;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	168 unsigned int mapcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	169
311 36d21680a9d3 A few more fixups, make sure that variable declarations are the Matt Johnston <matt@ucc.asn.au> parents: 300 diff changeset	170 unsigned int bufpos1, bufpos2;
300 baea1d43e7eb Some cleanups/fixes for various TRACE statements Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	171
311 36d21680a9d3 A few more fixups, make sure that variable declarations are the Matt Johnston <matt@ucc.asn.au> parents: 300 diff changeset	172 TRACE(("enter put_termcodes"))
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	173
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	174 if (tcgetattr(STDIN_FILENO, &tio) == -1) {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	175 dropbear_log(LOG_WARNING, "Failed reading termmodes");
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	176 buf_putint(ses.writepayload, 1); /* Just the terminator */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	177 buf_putbyte(ses.writepayload, 0); /* TTY_OP_END */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	178 return;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	179 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	180
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	181 bufpos1 = ses.writepayload->pos;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	182 buf_putint(ses.writepayload, 0); /* A placeholder for the final length */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	183
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	184 /* As with Dropbear server, we ignore baud rates for now */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	185 for (sshcode = 1; sshcode < MAX_TERMCODE; sshcode++) {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	186
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	187 termcode = &termcodes[sshcode];
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	188 mapcode = termcode->mapcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	189
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	190 switch (termcode->type) {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	191
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	192 case TERMCODE_NONE:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	193 continue;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	194
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	195 case TERMCODE_CONTROLCHAR:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	196 value = tio.c_cc[mapcode];
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	197 break;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	198
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	199 case TERMCODE_INPUT:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	200 value = tio.c_iflag & mapcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	201 break;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	202
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	203 case TERMCODE_OUTPUT:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	204 value = tio.c_oflag & mapcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	205 break;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	206
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	207 case TERMCODE_LOCAL:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	208 value = tio.c_lflag & mapcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	209 break;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	210
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	211 case TERMCODE_CONTROL:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	212 value = tio.c_cflag & mapcode;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	213 break;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	214
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	215 default:
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	216 continue;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	217
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	218 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	219
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	220 /* If we reach here, we have something to say */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	221 buf_putbyte(ses.writepayload, sshcode);
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	222 buf_putint(ses.writepayload, value);
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	223 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	224
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	225 buf_putbyte(ses.writepayload, 0); /* THE END, aka TTY_OP_END */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	226
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	227 /* Put the string length at the start of the buffer */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	228 bufpos2 = ses.writepayload->pos;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	229
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	230 buf_setpos(ses.writepayload, bufpos1); /* Jump back */
61 3a4f0ef1e8c3 Write the correct termcodes length Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	231 buf_putint(ses.writepayload, bufpos2 - bufpos1 - 4); /* len(termcodes) */
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	232 buf_setpos(ses.writepayload, bufpos2); /* Back where we were */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	233
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	234 TRACE(("leave put_termcodes"))
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	235 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	236
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	237 static void put_winsize() {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	238
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	239 struct winsize ws;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	240
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	241 if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) < 0) {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	242 /* Some sane defaults */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	243 ws.ws_row = 25;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	244 ws.ws_col = 80;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	245 ws.ws_xpixel = 0;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	246 ws.ws_ypixel = 0;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	247 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	248
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	249 buf_putint(ses.writepayload, ws.ws_col); /* Cols */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	250 buf_putint(ses.writepayload, ws.ws_row); /* Rows */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	251 buf_putint(ses.writepayload, ws.ws_xpixel); /* Width */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	252 buf_putint(ses.writepayload, ws.ws_ypixel); /* Height */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	253
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	254 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	255
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	256 static void sigwinch_handler(int UNUSED(unused)) {
41 18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	257
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	258 cli_ses.winchange = 1;
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	259
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	260 }
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	261
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	262 void cli_chansess_winchange() {
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	263
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	264 unsigned int i;
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	265 struct Channel *channel = NULL;
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	266
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	267 for (i = 0; i < ses.chansize; i++) {
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	268 channel = ses.channels[i];
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	269 if (channel != NULL && channel->type == &clichansess) {
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	270 CHECKCLEARTOWRITE();
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	271 buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST);
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	272 buf_putint(ses.writepayload, channel->remotechan);
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	273 buf_putstring(ses.writepayload, "window-change", 13);
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	274 buf_putbyte(ses.writepayload, 0); /* FALSE says the spec */
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	275 put_winsize();
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	276 encrypt_packet();
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	277 }
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	278 }
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	279 cli_ses.winchange = 0;
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	280 }
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	281
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 static void send_chansess_pty_req(struct Channel *channel) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 unsigned char* term = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	286 TRACE(("enter send_chansess_pty_req"))
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	287
560 52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	288 cli_start_send_channel_request(channel, "pty-req");
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	290 /* Don't want replies */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	291 buf_putbyte(ses.writepayload, 0);
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	292
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	293 /* Get the terminal */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 term = getenv("TERM");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 if (term == NULL) {
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	296 term = "vt100"; /* Seems a safe default */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298 buf_putstring(ses.writepayload, term, strlen(term));
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	300 /* Window size */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	301 put_winsize();
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	302
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	303 /* Terminal mode encoding */
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	304 put_termcodes();
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	305
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 encrypt_packet();
41 18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	307
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	308 /* Set up a window-change handler */
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	309 if (signal(SIGWINCH, sigwinch_handler) == SIG_ERR) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 582 diff changeset	310 dropbear_exit("Signal error");
41 18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	311 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	312 TRACE(("leave send_chansess_pty_req"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 static void send_chansess_shell_req(struct Channel *channel) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 unsigned char* reqtype = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	319 TRACE(("enter send_chansess_shell_req"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 if (cli_opts.cmd) {
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 485 diff changeset	322 if (cli_opts.is_subsystem) {
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 485 diff changeset	323 reqtype = "subsystem";
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 485 diff changeset	324 } else {
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 485 diff changeset	325 reqtype = "exec";
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 485 diff changeset	326 }
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 } else {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 reqtype = "shell";
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330
560 52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	331 cli_start_send_channel_request(channel, reqtype);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 /* XXX TODO */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 buf_putbyte(ses.writepayload, 0); /* Don't want replies */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 if (cli_opts.cmd) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 buf_putstring(ses.writepayload, cli_opts.cmd, strlen(cli_opts.cmd));
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339 encrypt_packet();
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	340 TRACE(("leave send_chansess_shell_req"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	341 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	343 /* Shared for normal client channel and netcat-alike */
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	344 static int cli_init_stdpipe_sess(struct Channel *channel) {
253 84925eceeb13 * rename infd/outfd to writefd/readfd, to avoid confusion Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	345 channel->writefd = STDOUT_FILENO;
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	346 setnonblocking(STDOUT_FILENO);
2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	347
253 84925eceeb13 * rename infd/outfd to writefd/readfd, to avoid confusion Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	348 channel->readfd = STDIN_FILENO;
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	349 setnonblocking(STDIN_FILENO);
2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	350
107 d3eb1fa8484e Nasty. Matt Johnston <matt@ucc.asn.au> parents: 99 diff changeset	351 channel->errfd = STDERR_FILENO;
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	352 setnonblocking(STDERR_FILENO);
2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	353
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	354 channel->extrabuf = cbuf_new(opts.recv_window);
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	355 return 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	356 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	357
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	358 static int cli_initchansess(struct Channel *channel) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	359
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	360 cli_init_stdpipe_sess(channel);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361
560 52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	362 #ifdef ENABLE_CLI_AGENTFWD
52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	363 if (cli_opts.agent_fwd) {
52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	364 cli_setup_agent(channel);
52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	365 }
52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	366 #endif
52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	367
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368 if (cli_opts.wantpty) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 send_chansess_pty_req(channel);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 send_chansess_shell_req(channel);
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374 if (cli_opts.wantpty) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 cli_tty_setup();
722 4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	376 channel->read_mangler = cli_escape_handler;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	377 cli_ses.last_char = '\r';
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	378 }
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 return 0; /* Success */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	383 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	384
582 6b9d12477953 - make structure static Matt Johnston <matt@ucc.asn.au> parents: 564 diff changeset	385 static const struct ChanType cli_chan_netcat = {
564 fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	386 0, /* sepfds */
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	387 "direct-tcpip",
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	388 cli_init_stdpipe_sess, /* inithandler */
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	389 NULL,
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	390 NULL,
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	391 cli_closechansess
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	392 };
fad3eb63b907 - Move netcat struct to where it stays in scope. Matt Johnston <matt@ucc.asn.au> parents: 560 diff changeset	393
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	394 void cli_send_netcat_request() {
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	396 const unsigned char* source_host = "127.0.0.1";
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	397 const int source_port = 22;
296 6b41e2cbf071 A hack to make dbclient to tcp forwarding netcat style. Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	398
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	399 cli_opts.wantpty = 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	400
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	401 if (send_msg_channel_open_init(STDIN_FILENO, &cli_chan_netcat)
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 == DROPBEAR_FAILURE) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 dropbear_exit("Couldn't open initial channel");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	406 buf_putstring(ses.writepayload, cli_opts.netcat_host,
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	407 strlen(cli_opts.netcat_host));
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	408 buf_putint(ses.writepayload, cli_opts.netcat_port);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	409
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	410 /* originator ip - localhost is accurate enough */
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	411 buf_putstring(ses.writepayload, source_host, strlen(source_host));
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	412 buf_putint(ses.writepayload, source_port);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	413
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	414 encrypt_packet();
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	415 TRACE(("leave cli_send_chansess_request"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	416 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	417 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	418
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	419 void cli_send_chansess_request() {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	420
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	421 TRACE(("enter cli_send_chansess_request"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	422
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	423 if (send_msg_channel_open_init(STDIN_FILENO, &clichansess)
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	424 == DROPBEAR_FAILURE) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	425 dropbear_exit("Couldn't open initial channel");
296 6b41e2cbf071 A hack to make dbclient to tcp forwarding netcat style. Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	426 }
6b41e2cbf071 A hack to make dbclient to tcp forwarding netcat style. Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	427
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	428 /* No special channel request data */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 encrypt_packet();
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	430 TRACE(("leave cli_send_chansess_request"))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 }
722 4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	433
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	434 // returns 1 if the character should be consumed, 0 to pass through
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	435 static int
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	436 do_escape(unsigned char c) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	437 switch (c) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	438 case '.':
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	439 dropbear_exit("Terminated");
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	440 return 1;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	441 break;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	442 case 0x1a:
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	443 // ctrl-z
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	444 cli_tty_cleanup();
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	445 kill(getpid(), SIGTSTP);
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	446 // after continuation
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	447 cli_tty_setup();
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	448 cli_ses.winchange = 1;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	449 return 1;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	450 break;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	451 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	452 return 0;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	453 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	454
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	455 static
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	456 void cli_escape_handler(struct Channel channel, unsigned char buf, int *len) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	457 char c;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	458 int skip_char = 0;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	459
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	460 // only handle escape characters if they are read one at a time. simplifies
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	461 // the code and avoids nasty people putting ~. at the start of a line to paste
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	462 if (*len != 1) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	463 cli_ses.last_char = 0x0;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	464 return;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	465 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	466
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	467 c = buf[0];
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	468
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	469 if (cli_ses.last_char == DROPBEAR_ESCAPE_CHAR) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	470 skip_char = do_escape(c);
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	471 cli_ses.last_char = 0x0;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	472 } else {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	473 if (c == DROPBEAR_ESCAPE_CHAR) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	474 if (cli_ses.last_char == '\r') {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	475 cli_ses.last_char = DROPBEAR_ESCAPE_CHAR;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	476 skip_char = 1;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	477 } else {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	478 cli_ses.last_char = 0x0;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	479 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	480 } else {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	481 cli_ses.last_char = c;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	482 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	483 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	484
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	485 if (skip_char) {
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	486 *len = 0;
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	487 }
4a274f47eabd Add ~. and ~^Z handling to exit/suspend dbclient Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	488 }

Mercurial > dropbear

annotate cli-chansession.c @ 785:ff6e551da826