From f262e1ff14f0fd3be77d380f3f1c8d7947f56566 Mon Sep 17 00:00:00 2001
From: mlaier <mlaier@FreeBSD.org>
Date: Mon, 4 Aug 2008 14:42:09 +0000
Subject: Merge state reuse for tcp.

PR:		kern/125261
Obtained from:	OpenBSD
MFC after:	1 week
---
 sys/contrib/pf/net/pf.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'sys/contrib/pf')

diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c
index fd8c395..8289c99 100644
--- a/sys/contrib/pf/net/pf.c
+++ b/sys/contrib/pf/net/pf.c
@@ -1,4 +1,5 @@
 /*	$OpenBSD: pf.c,v 1.527 2007/02/22 15:23:23 pyr Exp $ */
+/* add:	$OpenBSD: pf.c,v 1.559 2007/09/18 18:45:59 markus Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -4779,6 +4780,22 @@ pf_test_state_tcp(struct pf_state **state, int direction, struct pfi_kif *kif,
 		}
 	}
 
+	if (((th->th_flags & (TH_SYN|TH_ACK)) == TH_SYN) &&
+	    dst->state >= TCPS_FIN_WAIT_2 &&
+	    src->state >= TCPS_FIN_WAIT_2) {
+		if (pf_status.debug >= PF_DEBUG_MISC) {
+			printf("pf: state reuse ");
+			pf_print_state(*state);
+			pf_print_flags(th->th_flags);
+			printf("\n");
+		}
+		/* XXX make sure it's the same direction ?? */
+		(*state)->src.state = (*state)->dst.state = TCPS_CLOSED;
+		pf_unlink_state(*state);
+		*state = NULL;
+		return (PF_DROP);
+	}
+
 	if (src->wscale && dst->wscale && !(th->th_flags & TH_SYN)) {
 		sws = src->wscale & PF_WSCALE_MASK;
 		dws = dst->wscale & PF_WSCALE_MASK;
-- 
cgit v1.1