Attachment 2181 Details for Bug 2033 – Cleanup channels when using ControlMaster and ~.

[patch] Cleanup channels when using ControlMaster and ~.

openssh-mux-escape.patch (text/plain), 1.50 KB, created by Darren Tucker on 2012-08-17 10:40:22 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2012-08-17 10:40:22 AEST

Size: 1.50 KB

patch

obsolete

>Index: clientloop.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/clientloop.c,v
>retrieving revision 1.240
>diff -u -p -r1.240 clientloop.c
>--- clientloop.c	20 Jun 2012 04:42:58 -0000	1.240
>+++ clientloop.c	30 Jul 2012 11:58:12 -0000
>@@ -1037,6 +1037,8 @@ process_escapes(Channel *c, Buffer *bin,
> 				if (c && c->ctl_chan != -1) {
> 					chan_read_failed(c);
> 					chan_write_failed(c);
>+					mux_master_session_cleanup_cb(c->self,
>+					    NULL);
> 					return 0;
> 				} else
> 					quit_pending = 1;
>Index: clientloop.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/clientloop.h,v
>retrieving revision 1.29
>diff -u -p -r1.29 clientloop.h
>--- clientloop.h	9 Sep 2011 22:46:44 -0000	1.29
>+++ clientloop.h	30 Jul 2012 11:52:58 -0000
>@@ -76,4 +76,5 @@ 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 *);
> 
>Index: mux.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/mux.c,v
>retrieving revision 1.36
>diff -u -p -r1.36 mux.c
>--- mux.c	6 Jul 2012 01:37:21 -0000	1.36
>+++ mux.c	30 Jul 2012 11:52:19 -0000
>@@ -171,7 +171,7 @@ static const struct {
> 
> /* Cleanup callback fired on closure of mux slave _session_ channel */
> /* ARGSUSED */
>-static void
>+void
> mux_master_session_cleanup_cb(int cid, void *unused)
> {
> 	Channel *cc, *c = channel_by_id(cid);

Actions: View | Diff

Attachments on bug 2033: 2181