Attachment 1719 Details for Bug 1570 – prefer to dispatch exit statuses via mux control fd

[patch] prefer to dispatch exit statuses via mux control fd

mux-recycle-sess_id.diff (text/plain), 996 bytes, created by Damien Miller on 2009-11-10 13:48:02 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2009-11-10 13:48:02 AEDT

Size: 996 bytes

patch

obsolete

>Index: clientloop.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/clientloop.c,v
>retrieving revision 1.214
>diff -u -p -r1.214 clientloop.c
>--- clientloop.c	24 Oct 2009 11:15:29 -0000	1.214
>+++ clientloop.c	10 Nov 2009 02:44:02 -0000
>@@ -1838,15 +1838,17 @@ client_input_channel_req(int type, u_int
> 		chan_rcvd_eow(c);
> 	} else if (strcmp(rtype, "exit-status") == 0) {
> 		exitval = packet_get_int();
>-		if (id == session_ident) {
>+		if (c->ctl_fd != -1) {
>+			/* Dispatch to mux client */
>+			atomicio(vwrite, c->ctl_fd, &exitval, sizeof(exitval));
>+			success = 1;
>+		} else if (id == session_ident) {
>+			/* Record exit value of local session */
> 			success = 1;
> 			exit_status = exitval;
>-		} else if (c->ctl_fd == -1) {
>+		} else {
> 			error("client_input_channel_req: unexpected channel %d",
> 			    session_ident);
>-		} else {
>-			atomicio(vwrite, c->ctl_fd, &exitval, sizeof(exitval));
>-			success = 1;
> 		}
> 		packet_check_eom();
> 	}

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1570: 1617 | 1719