diff options
| author | dtucker <dtucker> | 2013-06-05 22:11:40 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2013-06-05 22:11:40 +0000 |
| commit | 6264b925e8872a1e29f6f131a9440323485584a5 (patch) | |
| tree | 76ba6658998c3440bebb13f07b6b204e30b8551c | |
| parent | d06ad53ac71104ad18da89935b5043aed2e0ddc5 (diff) | |
| download | openssh-6264b925e8872a1e29f6f131a9440323485584a5.tar.gz | |
- dtucker@cvs.openbsd.org 2013/06/02 23:36:29
[clientloop.h clientloop.c mux.c]
No need for the mux cleanup callback to be visible so restore it to static
and call it through the detach_user function pointer. ok djm@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | clientloop.c | 6 | ||||
| -rw-r--r-- | clientloop.h | 3 | ||||
| -rw-r--r-- | mux.c | 4 |
4 files changed, 10 insertions, 7 deletions
@@ -13,6 +13,10 @@ - dtucker@cvs.openbsd.org 2013/06/02 21:01:51 [channels.h] typo in comment + - dtucker@cvs.openbsd.org 2013/06/02 23:36:29 + [clientloop.h clientloop.c mux.c] + No need for the mux cleanup callback to be visible so restore it to static + and call it through the detach_user function pointer. ok djm@ 20130602 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy diff --git a/clientloop.c b/clientloop.c index 4b071eb9..6a296358 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.251 2013/06/01 13:15:51 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.252 2013/06/02 23:36:29 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1109,8 +1109,8 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr, if (c && c->ctl_chan != -1) { chan_read_failed(c); chan_write_failed(c); - mux_master_session_cleanup_cb(c->self, - NULL); + if (c->detach_user) + c->detach_user(c->self, NULL); return 0; } else quit_pending = 1; diff --git a/clientloop.h b/clientloop.h index d2baa032..338d4518 100644 --- a/clientloop.h +++ b/clientloop.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.h,v 1.30 2012/08/17 00:45:45 dtucker Exp $ */ +/* $OpenBSD: clientloop.h,v 1.31 2013/06/02 23:36:29 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -76,5 +76,4 @@ void muxserver_listen(void); void muxclient(const char *); void mux_exit_message(Channel *, int); void mux_tty_alloc_failed(Channel *); -void mux_master_session_cleanup_cb(int, void *); @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.41 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.42 2013/06/02 23:36:29 dtucker Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -184,7 +184,7 @@ static const struct { /* Cleanup callback fired on closure of mux slave _session_ channel */ /* ARGSUSED */ -void +static void mux_master_session_cleanup_cb(int cid, void *unused) { Channel *cc, *c = channel_by_id(cid); |