Attachment 1250 Details for Bug 1295 – Remove auto-generated files from diff

[patch] Remove auto-generated files from diff

openssh-linux-transproxy.patch (text/plain), 1.24 KB, created by Darren Tucker on 2007-03-12 13:29:54 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2007-03-12 13:29:54 AEDT

Size: 1.24 KB

patch

obsolete

>Index: channels.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh/channels.c,v
>retrieving revision 1.251
>diff -u -p -r1.251 channels.c
>--- channels.c	28 Jan 2007 23:16:28 -0000	1.251
>+++ channels.c	12 Mar 2007 00:56:37 -0000
>@@ -1138,6 +1138,28 @@ channel_pre_dynamic(Channel *c, fd_set *
> 	u_char *p;
> 	u_int have;
> 	int ret;
>+	struct sockaddr_in orig_addr;
>+	socklen_t orig_len;
>+	struct sockaddr_in sock_addr;
>+	socklen_t sock_len;
>+	
>+#ifdef __linux__
>+	orig_len = sizeof(orig_addr);
>+	sock_len = sizeof(sock_addr);
>+	if(!getsockopt(c->sock, SOL_IP, /*SO_ORIGINAL_DST*/ 80, (struct sockaddr *) &orig_addr, &orig_len)
>+			&& orig_addr.sin_addr.s_addr
>+			&& !getsockname(c->sock, (struct sockaddr*)&sock_addr, &sock_len)
>+			&& (orig_addr.sin_family != sock_addr.sin_family || orig_addr.sin_addr.s_addr != sock_addr.sin_addr.s_addr || orig_addr.sin_port != sock_addr.sin_port)  
>+			)
>+	{
>+		c->host_port = ntohs(orig_addr.sin_port);
>+		inet_ntop(orig_addr.sin_family, &orig_addr.sin_addr.s_addr, c->path, sizeof(c->path));
>+		c->delayed = 0;
>+		c->type = SSH_CHANNEL_OPENING;
>+		port_open_helper(c, "direct-tcpip");
>+		return;
>+	}
>+#endif
> 
> 	have = buffer_len(&c->input);
> 	c->delayed = 0;

Actions: View | Diff

Attachments on bug 1295: 1249 | 1250 | 1251