diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 04:49:33 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-13 04:49:33 +1000 |
commit | 2fb66caca2c9e69c6a0584060114fcd52e59d5ff (patch) | |
tree | de895acfd51886da7e4ca547baea0b45e954c72e /channels.h | |
parent | 267e28bb75e97755ab3bbe128b75623734f2b3fd (diff) |
- djm@cvs.openbsd.org 2008/06/12 03:40:52
[clientloop.h mux.c channels.c clientloop.c channels.h]
Enable ~ escapes for multiplex slave sessions; give each channel
its own escape state and hook the escape filters up to muxed
channels. bz #1331
Mux slaves do not currently support the ~^Z and ~& escapes.
NB. this change cranks the mux protocol version, so a new ssh
mux client will not be able to connect to a running old ssh
mux master.
ok dtucker@
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels.h b/channels.h index dc1f483ed..450321d43 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.93 2008/06/10 04:50:25 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.94 2008/06/12 03:40:52 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -131,6 +131,7 @@ struct Channel { | |||
131 | /* filter */ | 131 | /* filter */ |
132 | channel_infilter_fn *input_filter; | 132 | channel_infilter_fn *input_filter; |
133 | channel_outfilter_fn *output_filter; | 133 | channel_outfilter_fn *output_filter; |
134 | void *filter_ctx; | ||
134 | 135 | ||
135 | /* keep boundaries */ | 136 | /* keep boundaries */ |
136 | int datagram; | 137 | int datagram; |
@@ -195,7 +196,7 @@ void channel_request_start(int, char *, int); | |||
195 | void channel_register_cleanup(int, channel_callback_fn *, int); | 196 | void channel_register_cleanup(int, channel_callback_fn *, int); |
196 | void channel_register_open_confirm(int, channel_callback_fn *, void *); | 197 | void channel_register_open_confirm(int, channel_callback_fn *, void *); |
197 | void channel_register_filter(int, channel_infilter_fn *, | 198 | void channel_register_filter(int, channel_infilter_fn *, |
198 | channel_outfilter_fn *); | 199 | channel_outfilter_fn *, void *); |
199 | void channel_register_status_confirm(int, channel_confirm_cb *, | 200 | void channel_register_status_confirm(int, channel_confirm_cb *, |
200 | channel_confirm_abandon_cb *, void *); | 201 | channel_confirm_abandon_cb *, void *); |
201 | void channel_cancel_cleanup(int); | 202 | void channel_cancel_cleanup(int); |