Attachment 219 Details for Bug 413 – about attachment (id=217)

[patch] about attachment (id=217)

openssh-3.5p1-forwardplus.patch (text/plain), 2.49 KB, created by rumen on 2003-02-07 06:32:23 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: rumen

Created: 2003-02-07 06:32:23 AEDT

Size: 2.49 KB

patch

obsolete

>--- channels.c.OLD	2003-02-06 19:16:48.000000000 +0200
>+++ channels.c	2003-02-06 19:22:08.000000000 +0200
>@@ -2041,12 +2041,15 @@
> 	 * getaddrinfo returns a loopback address if the hostname is
> 	 * set to NULL and hints.ai_flags is not AI_PASSIVE
> 	 */
>-	if (gateway_ports) {
>-		if (listen_addr == NULL || listen_addr[0] == '\0' ||
>-		    strcmp(listen_addr, "*") == 0)
>-			wildcard = 1;
>-		else
>-			addr = listen_addr;
>+	/* with new forward shema might option GatewayPorts is useless for the client. */
>+	if ( (type == SSH_CHANNEL_PORT_LISTENER ) ||
>+	    ((type == SSH_CHANNEL_RPORT_LISTENER) && gateway_ports)) {
>+		if (listen_addr != NULL && listen_addr[0] != '\0') {
>+			if (strcmp(listen_addr, "*") == 0)
>+				wildcard = 1;
>+			else
>+				addr = listen_addr;
>+		}
> 	}
> 	memset(&hints, 0, sizeof(hints));
> 	hints.ai_family = IPv4or6;
>--- readconf.c.OLD	2003-02-06 19:16:49.000000000 +0200
>+++ readconf.c	2003-02-06 19:16:08.000000000 +0200
>@@ -656,8 +656,9 @@
> 		/* construct a string for parse_forward */
> 		size = strlen(arg) + strlen(arg2) + 2;
> 		fwdarg = (char *)xmalloc(size);
>+		*fwdarg = '\0'; /* 'C' does not define allocated memory to be cleaned */
> 		strncat(fwdarg, arg, size);
>-		strncat(fwdarg, " ", size);
>+		strncat(fwdarg, ":", size);
> 		strncat(fwdarg, arg2, size);
> 
> 		if (parse_forward(&fwd, fwdarg) == 0)
>@@ -669,6 +670,8 @@
> 		if (fwd.connect_port == 0)
> 			fatal("%.200s line %d: Bad forwarding port.",
> 			    filename, linenum);
>+		xfree(fwdarg);
>+		fwdarg = NULL;
> 
> 		if (*activep) {
> 			if (opcode == oLocalForward)
>--- ssh.c.OLD	2003-02-06 19:16:48.000000000 +0200
>+++ ssh.c	2003-02-06 18:04:14.000000000 +0200
>@@ -831,7 +831,7 @@
> 		listen_host = options.local_forwards[i].listen_host;
> 		if (listen_host && listen_host[0] == '\0' && !options.gateway_ports)
> 			listen_host = NULL;
>-		debug("Connections to local port %.200s:%d forwarded to remote address %.200s:%d",
>+		debug("Local connections to %.200s:%d forwarded to remote address %.200s:%d",
> 		    listen_host,
> 		    options.local_forwards[i].listen_port,
> 		    options.local_forwards[i].connect_host,
>@@ -851,7 +851,7 @@
> 		listen_host = options.remote_forwards[i].listen_host;
> 		if (listen_host && listen_host[0] == '\0' && !options.gateway_ports)
> 			listen_host = NULL;
>-		debug("Connections to remote port %.200s:%d forwarded to local address %.200s:%d",
>+		debug("Remote connections from %.200s:%d forwarded to local address %.200s:%d",
> 		    listen_host,
> 		    options.remote_forwards[i].listen_port,
> 		    options.remote_forwards[i].connect_host,

Actions: View | Diff

Attachments on bug 413: 179 | 180 | 182 | 217 | 219 | 229 | 321 | 666 | 782 | 783 | 784 | 791 | 792 | 806 | 834