diff options
author | Damien Miller <djm@mindrot.org> | 1999-10-30 11:39:56 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-10-30 11:39:56 +1000 |
commit | 1e4772c32c109e6c69291335ad49350e7762785d (patch) | |
tree | 1a9224ff01d028a4b9f12a477ccf447624fca96f /channels.h | |
parent | 5ffa64478a963426a1ab92a7b74b87d3ae79ba53 (diff) |
Merged latest OpenBSD changes:
nchan.ms -\
channels.[ch] - remove broken x11 fix and document istate/ostate
ssh-agent.c - call setsid() regardless of argv[]
ssh.c - save a few lines when disabling rhosts-{rsa-}auth
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* RCSID("$Id: channels.h,v 1.1 1999/10/27 03:42:44 damien Exp $"); */ +/* RCSID("$Id: channels.h,v 1.2 1999/10/30 01:39:56 damien 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 */ |