From 4c128c08a4a5a6a3fce86b266c2d1c235267789f Mon Sep 17 00:00:00 2001
From: Ryan Thomas McBride <mcbride@cvs.openbsd.org>
Date: Wed, 24 Sep 2003 17:18:04 +0000
Subject: Remove state setup no-ops.

ok cedric@ frantzen@ henning@
---
 sys/net/pf.c | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

(limited to 'sys/net/pf.c')

diff --git a/sys/net/pf.c b/sys/net/pf.c
index c2c2c724320..6d951718424 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.389 2003/09/01 15:08:39 henning Exp $ */
+/*	$OpenBSD: pf.c,v 1.390 2003/09/24 17:18:03 mcbride Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -2413,10 +2413,8 @@ pf_test_tcp(struct pf_rule **rm, struct pf_state **sm, int direction,
 		}
 		if (th->th_flags & TH_FIN)
 			s->src.seqhi++;
-		s->dst.seqlo = 0;	/* Haven't seen these yet */
 		s->dst.seqhi = 1;
 		s->dst.max_win = 1;
-		s->dst.seqdiff = 0;	/* Defer random generation */
 		s->src.state = TCPS_SYN_SENT;
 		s->dst.state = TCPS_CLOSED;
 		s->creation = time.tv_sec;
@@ -2689,15 +2687,7 @@ pf_test_udp(struct pf_rule **rm, struct pf_state **sm, int direction,
 				s->gwy.port = s->lan.port;
 			}
 		}
-		s->src.seqlo = 0;
-		s->src.seqhi = 0;
-		s->src.seqdiff = 0;
-		s->src.max_win = 0;
 		s->src.state = PFUDPS_SINGLE;
-		s->dst.seqlo = 0;
-		s->dst.seqhi = 0;
-		s->dst.seqdiff = 0;
-		s->dst.max_win = 0;
 		s->dst.state = PFUDPS_NO_TRAFFIC;
 		s->creation = time.tv_sec;
 		s->expire = time.tv_sec;
@@ -2947,16 +2937,6 @@ pf_test_icmp(struct pf_rule **rm, struct pf_state **sm, int direction,
 				PF_ACPY(&s->gwy.addr, &s->lan.addr, af);
 			s->gwy.port = icmpid;
 		}
-		s->src.seqlo = 0;
-		s->src.seqhi = 0;
-		s->src.seqdiff = 0;
-		s->src.max_win = 0;
-		s->src.state = 0;
-		s->dst.seqlo = 0;
-		s->dst.seqhi = 0;
-		s->dst.seqdiff = 0;
-		s->dst.max_win = 0;
-		s->dst.state = 0;
 		s->creation = time.tv_sec;
 		s->expire = time.tv_sec;
 		s->timeout = PFTM_ICMP_FIRST_PACKET;
@@ -3169,34 +3149,20 @@ pf_test_other(struct pf_rule **rm, struct pf_state **sm, int direction,
 		s->af = af;
 		if (direction == PF_OUT) {
 			PF_ACPY(&s->gwy.addr, saddr, af);
-			s->gwy.port = 0;
 			PF_ACPY(&s->ext.addr, daddr, af);
-			s->ext.port = 0;
 			if (nat != NULL)
 				PF_ACPY(&s->lan.addr, &baddr, af);
 			else
 				PF_ACPY(&s->lan.addr, &s->gwy.addr, af);
-			s->lan.port = 0;
 		} else {
 			PF_ACPY(&s->lan.addr, daddr, af);
-			s->lan.port = 0;
 			PF_ACPY(&s->ext.addr, saddr, af);
-			s->ext.port = 0;
 			if (rdr != NULL)
 				PF_ACPY(&s->gwy.addr, &baddr, af);
 			else
 				PF_ACPY(&s->gwy.addr, &s->lan.addr, af);
-			s->gwy.port = 0;
 		}
-		s->src.seqlo = 0;
-		s->src.seqhi = 0;
-		s->src.seqdiff = 0;
-		s->src.max_win = 0;
 		s->src.state = PFOTHERS_SINGLE;
-		s->dst.seqlo = 0;
-		s->dst.seqhi = 0;
-		s->dst.seqdiff = 0;
-		s->dst.max_win = 0;
 		s->dst.state = PFOTHERS_NO_TRAFFIC;
 		s->creation = time.tv_sec;
 		s->expire = time.tv_sec;
-- 
cgit v1.2.3