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.c | |
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.c')
-rw-r--r-- | channels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels.c b/channels.c index 233c2247b..c539990f6 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.278 2008/06/10 04:50:25 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.279 2008/06/12 03:40:52 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -731,7 +731,7 @@ channel_cancel_cleanup(int id) | |||
731 | 731 | ||
732 | void | 732 | void |
733 | channel_register_filter(int id, channel_infilter_fn *ifn, | 733 | channel_register_filter(int id, channel_infilter_fn *ifn, |
734 | channel_outfilter_fn *ofn) | 734 | channel_outfilter_fn *ofn, void *ctx) |
735 | { | 735 | { |
736 | Channel *c = channel_lookup(id); | 736 | Channel *c = channel_lookup(id); |
737 | 737 | ||
@@ -741,6 +741,7 @@ channel_register_filter(int id, channel_infilter_fn *ifn, | |||
741 | } | 741 | } |
742 | c->input_filter = ifn; | 742 | c->input_filter = ifn; |
743 | c->output_filter = ofn; | 743 | c->output_filter = ofn; |
744 | c->filter_ctx = ctx; | ||
744 | } | 745 | } |
745 | 746 | ||
746 | void | 747 | void |