Attachment 148203 Details for Bug 205966 – patch to fix problem w/o breaking abi

[patch] patch to fix problem w/o breaking abi

ipct.patch (text/plain), 1.60 KB, created by Neil Horman on 2007-02-16 16:13:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-02-16 16:13:45 UTC

Size: 1.60 KB

patch

obsolete

>--- linux-2.6.9/include/linux/netfilter_ipv4/ip_conntrack.h.orig	2007-02-16 10:47:26.000000000 -0500
>+++ linux-2.6.9/include/linux/netfilter_ipv4/ip_conntrack.h	2007-02-16 10:52:23.000000000 -0500
>@@ -215,6 +215,13 @@ struct ip_conntrack
> 	/* Traversed often, so hopefully in different cacheline to top */
> 	/* These are my tuples; original and reply */
> 	struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];
>+
>+	/*
>+	 * Normally these go inside ip_ct_tcp, but in order
>+	 * to preserve abi, they need to go here
>+	 */
>+	u_int32_t last_ack;
>+	u_int32_t last_win;
> };
> 
> /* get master conntrack via master expectation */
>--- linux-2.6.9/net/ipv4/netfilter/ip_conntrack_proto_tcp.c.orig	2007-02-16 10:52:45.000000000 -0500
>+++ linux-2.6.9/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2007-02-16 10:59:58.000000000 -0500
>@@ -509,7 +509,8 @@ static int tcp_in_window(struct ip_ct_tc
> 	struct ip_ct_tcp_state *receiver = &state->seen[!dir];
> 	__u32 seq, ack, sack, end, win, swin;
> 	int res;
>-	
>+	struct ip_conntrack *ip_ct = container_of(state,struct ip_conntrack, proto);
>+
> 	/*
> 	 * Get the required data from the packet.
> 	 */
>@@ -663,12 +664,16 @@ static int tcp_in_window(struct ip_ct_tc
> 		if (*index == TCP_ACK_SET) {
> 			if (state->last_dir == dir
> 			    && state->last_seq == seq
>-			    && state->last_end == end)
>+			    && state->last_end == end
>+			    && ip_ct->last_ack == ack
>+			    && ip_ct->last_win == win)
> 				state->retrans++;
> 			else {
> 				state->last_dir = dir;
> 				state->last_seq = seq;
> 				state->last_end = end;
>+				ip_ct->last_ack = ack;
>+				ip_ct->last_win = win;
> 				state->retrans = 0;
> 			}
> 		}

Actions: View | Diff

Attachments on bug 205966: 135942 | 148203 | 148644