Attachment 2344 Details for Bug 2147 – Simplified patch for 6.3p1 which only replaces port and not host

[patch] Simplified patch for 6.3p1 which only replaces port and not host

openssh.patch (text/plain), 1.09 KB, created by Ron Frederick on 2013-10-05 15:47:07 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Ron Frederick

Created: 2013-10-05 15:47:07 AEST

Size: 1.09 KB

patch

obsolete

>--- channels.c.orig	2013-09-12 23:19:31.000000000 -0700
>+++ channels.c	2013-10-04 22:37:44.000000000 -0700
>@@ -1385,6 +1385,8 @@
> {
> 	int direct;
> 	char buf[1024];
>+	char *local_ipaddr = get_local_ipaddr(c->sock);
>+	int local_port = get_sock_port(c->sock, 1);
> 	char *remote_ipaddr = get_peer_ipaddr(c->sock);
> 	int remote_port = get_peer_port(c->sock);
> 
>@@ -1399,9 +1401,9 @@
> 
> 	snprintf(buf, sizeof buf,
> 	    "%s: listening port %d for %.100s port %d, "
>-	    "connect from %.200s port %d",
>+	    "connect from %.200s port %d to %.100s port %d",
> 	    rtype, c->listening_port, c->path, c->host_port,
>-	    remote_ipaddr, remote_port);
>+	    remote_ipaddr, remote_port, local_ipaddr, local_port);
> 
> 	free(c->remote_name);
> 	c->remote_name = xstrdup(buf);
>@@ -1419,7 +1421,7 @@
> 		} else {
> 			/* listen address, port */
> 			packet_put_cstring(c->path);
>-			packet_put_int(c->listening_port);
>+			packet_put_int(local_port);
> 		}
> 		/* originator host and port */
> 		packet_put_cstring(remote_ipaddr);
>@@ -1436,6 +1438,7 @@
> 		packet_send();
> 	}
> 	free(remote_ipaddr);
>+	free(local_ipaddr);
> }
> 
> static void

Actions: View | Diff

Attachments on bug 2147: 2330 | 2334 | 2344