diff options
| -rw-r--r-- | usr.bin/ssh/channels.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/channels.h | 7 | ||||
| -rw-r--r-- | usr.bin/ssh/nchan.ms | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 01bbcd1c406..8717ffa7bb3 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -16,7 +16,7 @@ arbitrary tcp/ip connections, and the authentication agent connection. */ #include "includes.h" -RCSID("$Id: channels.c,v 1.17 1999/10/26 22:39:44 markus Exp $"); +RCSID("$Id: channels.c,v 1.18 1999/10/28 21:26:09 markus Exp $"); #include "ssh.h" #include "packet.h" @@ -155,7 +155,6 @@ int channel_allocate(int type, int sock, char *remote_name) chan_init_iostates(c); c->self = found; c->type = type; - c->x11 = 0; c->sock = sock; c->remote_id = -1; c->remote_name = remote_name; @@ -316,8 +315,6 @@ void channel_prepare_select(fd_set *readset, fd_set *writeset) /* Start normal processing for the channel. */ ch->type = SSH_CHANNEL_OPEN; - /* Enable X11 Problem FIX */ - ch->x11 = 1; goto redo; reject: diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h index 9cdf10f3111..3cb4d3eb051 100644 --- a/usr.bin/ssh/channels.h +++ b/usr.bin/ssh/channels.h @@ -1,4 +1,4 @@ -/* RCSID("$Id: channels.h,v 1.3 1999/10/17 16:56:09 markus Exp $"); */ +/* RCSID("$Id: channels.h,v 1.4 1999/10/28 21:26:09 markus Exp $"); */ #ifndef CHANNELS_H #define CHANNELS_H @@ -26,9 +26,8 @@ typedef struct Channel int self; /* my own channel identifier */ int remote_id; /* channel identifier for remote peer */ /* peer can be reached over encrypted connection, via packet-sent */ - int istate; - int ostate; - int x11; + int istate; /* input from channel (state of receive half) */ + int ostate; /* output to channel (state of transmit half) */ int sock; /* data socket, linked to this channel */ Buffer input; /* data read from socket, to be sent over encrypted connection */ Buffer output; /* data received over encrypted connection for send on socket */ diff --git a/usr.bin/ssh/nchan.ms b/usr.bin/ssh/nchan.ms index b01512f780d..18e7e9a9a89 100644 --- a/usr.bin/ssh/nchan.ms +++ b/usr.bin/ssh/nchan.ms @@ -50,9 +50,9 @@ Notes The input buffer is filled with data from the socket (the socket represents the local comsumer/producer of the forwarded channel). -The data is then sent over the INPUT-end of the channel to the +The data is then sent over the INPUT-end (transmit-end) of the channel to the remote peer. -Data sent by the peer is received on the OUTPUT-end, +Data sent by the peer is received on the OUTPUT-end (receive-end), saved in the output buffer and written to the socket. .PP If the local protocol instance has forwarded all data on the |