diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-06 08:11:40 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-06 08:11:40 +1000 |
commit | ea8342c248ad6c0a4fe1a70de133f954973bd2b2 (patch) | |
tree | cb631673729078e481759f3df99c41d3b34122ca | |
parent | 5d12b8f05d79ba89d0807910a664fa80f6f3bf8c (diff) |
- 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 @@ | |||
13 | - dtucker@cvs.openbsd.org 2013/06/02 21:01:51 | 13 | - dtucker@cvs.openbsd.org 2013/06/02 21:01:51 |
14 | [channels.h] | 14 | [channels.h] |
15 | typo in comment | 15 | typo in comment |
16 | - dtucker@cvs.openbsd.org 2013/06/02 23:36:29 | ||
17 | [clientloop.h clientloop.c mux.c] | ||
18 | No need for the mux cleanup callback to be visible so restore it to static | ||
19 | and call it through the detach_user function pointer. ok djm@ | ||
16 | 20 | ||
17 | 20130602 | 21 | 20130602 |
18 | - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy | 22 | - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy |
diff --git a/clientloop.c b/clientloop.c index 4b071eb91..6a2963583 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.251 2013/06/01 13:15:51 dtucker Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.252 2013/06/02 23:36:29 dtucker 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 |
@@ -1109,8 +1109,8 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr, | |||
1109 | if (c && c->ctl_chan != -1) { | 1109 | if (c && c->ctl_chan != -1) { |
1110 | chan_read_failed(c); | 1110 | chan_read_failed(c); |
1111 | chan_write_failed(c); | 1111 | chan_write_failed(c); |
1112 | mux_master_session_cleanup_cb(c->self, | 1112 | if (c->detach_user) |
1113 | NULL); | 1113 | c->detach_user(c->self, NULL); |
1114 | return 0; | 1114 | return 0; |
1115 | } else | 1115 | } else |
1116 | quit_pending = 1; | 1116 | quit_pending = 1; |
diff --git a/clientloop.h b/clientloop.h index d2baa0324..338d45186 100644 --- a/clientloop.h +++ b/clientloop.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.h,v 1.30 2012/08/17 00:45:45 dtucker Exp $ */ | 1 | /* $OpenBSD: clientloop.h,v 1.31 2013/06/02 23:36:29 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -76,5 +76,4 @@ void muxserver_listen(void); | |||
76 | void muxclient(const char *); | 76 | void muxclient(const char *); |
77 | void mux_exit_message(Channel *, int); | 77 | void mux_exit_message(Channel *, int); |
78 | void mux_tty_alloc_failed(Channel *); | 78 | void mux_tty_alloc_failed(Channel *); |
79 | void mux_master_session_cleanup_cb(int, void *); | ||
80 | 79 | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.41 2013/05/17 00:13:13 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.42 2013/06/02 23:36:29 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -184,7 +184,7 @@ static const struct { | |||
184 | 184 | ||
185 | /* Cleanup callback fired on closure of mux slave _session_ channel */ | 185 | /* Cleanup callback fired on closure of mux slave _session_ channel */ |
186 | /* ARGSUSED */ | 186 | /* ARGSUSED */ |
187 | void | 187 | static void |
188 | mux_master_session_cleanup_cb(int cid, void *unused) | 188 | mux_master_session_cleanup_cb(int cid, void *unused) |
189 | { | 189 | { |
190 | Channel *cc, *c = channel_by_id(cid); | 190 | Channel *cc, *c = channel_by_id(cid); |