diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-04-14 16:33:21 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-04-14 16:33:21 +0000 |
| commit | f38e8ebb4d051ef9b25d767d54567fdc712a6a67 (patch) | |
| tree | 493e9c83b7b855518498c03b186480c4582a7977 /usr.bin/ssh/ssh.c | |
| parent | f9e9c12e9fea79bc7c95093f1e2b5a84e0bcf82c (diff) | |
protocol 2 tty modes support; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 512a5af0dbc..470a4d41259 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.114 2001/04/13 01:26:17 stevesk Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.115 2001/04/14 16:33:20 stevesk Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -67,6 +67,7 @@ RCSID("$OpenBSD: ssh.c,v 1.114 2001/04/13 01:26:17 stevesk Exp $"); #include "misc.h" #include "kex.h" #include "mac.h" +#include "sshtty.h" extern char *__progname; @@ -858,7 +859,7 @@ ssh_session(void) packet_put_int(ws.ws_ypixel); /* Store tty modes in the packet. */ - tty_make_modes(fileno(stdin)); + tty_make_modes(fileno(stdin), NULL); /* Send the packet, and wait for it to leave. */ packet_send(); @@ -962,6 +963,7 @@ ssh_session2_callback(int id, void *arg) { int len; int interactive = 0; + struct termios tio; debug("client_init id %d arg %ld", id, (long)arg); @@ -981,7 +983,8 @@ ssh_session2_callback(int id, void *arg) packet_put_int(ws.ws_row); packet_put_int(ws.ws_xpixel); packet_put_int(ws.ws_ypixel); - packet_put_cstring(""); /* XXX: encode terminal modes */ + tio = get_saved_tio(); + tty_make_modes(/*ignored*/ 0, &tio); packet_send(); interactive = 1; /* XXX wait for reply */ |