patch-2.2.18 linux/net/ipv4/tcp_ipv4.c

• Lines: 29
• Date: Wed Nov 1 16:49:39 2000
• Orig file: v2.2.17/net/ipv4/tcp_ipv4.c
• Orig date: Sat Sep 9 18:42:51 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_ipv4.c,v 1.175.2.13 1999/11/16 06:33:53 davem Exp $
+ * Version:	$Id: tcp_ipv4.c,v 1.175.2.17 2000/10/31 22:42:58 davem Exp $
  *
  *		IPv4 specific functions
  *
@@ -1909,8 +1909,17 @@
 
 static struct sock * tcp_v4_get_sock(struct sk_buff *skb, struct tcphdr *th)
 {
-	return tcp_v4_lookup(skb->nh.iph->saddr, th->source,
-			     skb->nh.iph->daddr, th->dest, skb->dev->ifindex);
+#ifdef CONFIG_IP_TRANSPARENT_PROXY
+	if (IPCB(skb)->redirport)
+		return tcp_v4_proxy_lookup(th->dest, skb->nh.iph->saddr,
+					   th->source,  skb->nh.iph->daddr,
+					   skb->dev, IPCB(skb)->redirport,
+					   skb->dev->ifindex);
+	else
+#endif
+		return tcp_v4_lookup(skb->nh.iph->saddr, th->source,
+				     skb->nh.iph->daddr, th->dest,
+				     skb->dev->ifindex);
 }
 
 static void v4_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr)