Attachment 2594 Details for Bug 2363 – clear failed forwards in mux; check for previously-cleared entries

[patch] clear failed forwards in mux; check for previously-cleared entries

mux_clear_failed_forward.diff (text/plain), 1.12 KB, created by Damien Miller on 2015-04-17 16:31:35 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2015-04-17 16:31:35 AEST

Size: 1.12 KB

patch

obsolete

>diff --git a/mux.c b/mux.c
>index 108270a..7d92ac6 100644
>--- a/mux.c
>+++ b/mux.c
>@@ -580,7 +580,9 @@ mux_confirm_remote_forward(int type, u_int32_t seq, void *ctxt)
> 		return;
> 	}
> 	buffer_init(&out);
>-	if (fctx->fid >= options.num_remote_forwards) {
>+	if (fctx->fid >= options.num_remote_forwards ||
>+	    (options.remote_forwards[fctx->fid].connect_path == NULL &&
>+	    options.remote_forwards[fctx->fid].connect_host == NULL)) {
> 		xasprintf(&failmsg, "unknown forwarding id %d", fctx->fid);
> 		goto fail;
> 	}
>@@ -614,6 +616,17 @@ mux_confirm_remote_forward(int type, u_int32_t seq, void *ctxt)
> 		else
> 			xasprintf(&failmsg, "remote port forwarding failed for "
> 			    "listen port %d", rfwd->listen_port);
>+
>+                debug2("%s: clearing registered forwarding for listen %d, "
>+		    "connect %s:%d", __func__, rfwd->listen_port,
>+		    rfwd->connect_path ? rfwd->connect_path :
>+		    rfwd->connect_host, rfwd->connect_port);
>+
>+		free(rfwd->listen_host);
>+		free(rfwd->listen_path);
>+		free(rfwd->connect_host);
>+		free(rfwd->connect_path);
>+		memset(rfwd, 0, sizeof(*rfwd));
> 	}
>  fail:
> 	error("%s: %s", __func__, failmsg);

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2363: 2565 | 2594