diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /channels.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/channels.h b/channels.h index f8dc8249c..fc20fb2c3 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.74 2004/08/11 21:43:04 avsm Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.76 2005/03/01 10:09:52 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -79,6 +79,7 @@ struct Channel { | |||
79 | int ctl_fd; /* control fd (client sharing) */ | 79 | int ctl_fd; /* control fd (client sharing) */ |
80 | int isatty; /* rfd is a tty */ | 80 | int isatty; /* rfd is a tty */ |
81 | int wfd_isatty; /* wfd is a tty */ | 81 | int wfd_isatty; /* wfd is a tty */ |
82 | int client_tty; /* (client) TTY has been requested */ | ||
82 | int force_drain; /* force close on iEOF */ | 83 | int force_drain; /* force close on iEOF */ |
83 | int delayed; /* fdset hack */ | 84 | int delayed; /* fdset hack */ |
84 | Buffer input; /* data read from socket, to be sent over | 85 | Buffer input; /* data read from socket, to be sent over |
@@ -202,9 +203,11 @@ void channel_clear_permitted_opens(void); | |||
202 | void channel_input_port_forward_request(int, int); | 203 | void channel_input_port_forward_request(int, int); |
203 | int channel_connect_to(const char *, u_short); | 204 | int channel_connect_to(const char *, u_short); |
204 | int channel_connect_by_listen_address(u_short); | 205 | int channel_connect_by_listen_address(u_short); |
205 | void channel_request_remote_forwarding(u_short, const char *, u_short); | 206 | void channel_request_remote_forwarding(const char *, u_short, |
206 | void channel_request_rforward_cancel(u_short port); | 207 | const char *, u_short); |
207 | int channel_setup_local_fwd_listener(u_short, const char *, u_short, int); | 208 | int channel_setup_local_fwd_listener(const char *, u_short, |
209 | const char *, u_short, int); | ||
210 | void channel_request_rforward_cancel(const char *host, u_short port); | ||
208 | int channel_setup_remote_fwd_listener(const char *, u_short, int); | 211 | int channel_setup_remote_fwd_listener(const char *, u_short, int); |
209 | int channel_cancel_rport_listener(const char *, u_short); | 212 | int channel_cancel_rport_listener(const char *, u_short); |
210 | 213 | ||