From 5fe78cac127e8b90faf921100c0a53547f135f56 Mon Sep 17 00:00:00 2001
From: Artur Grabowski <art@cvs.openbsd.org>
Date: Mon, 25 Jun 2001 10:07:16 +0000
Subject: Rename the rest of the structs to be consistent.

---
 sys/net/pf.c    |  8 ++++----
 sys/net/pfvar.h | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'sys')

diff --git a/sys/net/pf.c b/sys/net/pf.c
index c72bf89a14f..489a8f99dfa 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.30 2001/06/25 09:57:08 art Exp $ */
+/*	$OpenBSD: pf.c,v 1.31 2001/06/25 10:07:14 art Exp $ */
 
 /*
  * Copyright (c) 2001, Daniel Hartmeier
@@ -1341,7 +1341,7 @@ pf_test_state_tcp(int direction, struct ifnet *ifp, struct mbuf **m, int off,
 	if (s != NULL) {
 		u_int16_t len = h->ip_len - off - (th->th_off << 2);
 		u_int32_t seq = ntohl(th->th_seq), ack = ntohl(th->th_ack);
-		struct state_peer *src, *dst;
+		struct pf_state_peer *src, *dst;
 
 		if (direction == s->direction) {
 			src = &s->src;
@@ -1447,7 +1447,7 @@ pf_test_state_udp(int direction, struct ifnet *ifp, struct mbuf **m, int off,
 
 		u_int16_t len = h->ip_len - off - 8;
 
-		struct state_peer *src, *dst;
+		struct pf_state_peer *src, *dst;
 		if (direction == s->direction) {
 			src = &s->src;
 			dst = &s->dst;
@@ -1564,7 +1564,7 @@ pf_test_state_icmp(int direction, struct ifnet *ifp, struct mbuf **m, int off,
 			u_int32_t seq;
 			struct pf_state *s;
 			struct pf_tree_key key;
-			struct state_peer *src;
+			struct pf_state_peer *src;
 
 			th = pull_hdr(ifp, m, off, off2, sizeof(*th), h2,
 			    &dummy);
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 15a84e15657..e3ff3152f0c 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar.h,v 1.8 2001/06/25 09:31:07 art Exp $ */
+/*	$OpenBSD: pfvar.h,v 1.9 2001/06/25 10:07:15 art Exp $ */
 
 /*
  * Copyright (c) 2001, Daniel Hartmeier
@@ -38,7 +38,7 @@
 enum	{ PF_IN=0, PF_OUT=1 };
 enum	{ PF_PASS=0, PF_DROP=1, PF_DROP_RST=2 };
 
-struct rule_addr {
+struct pf_rule_addr {
 	u_int32_t	addr;
 	u_int32_t	mask;
 	u_int16_t	port[2];
@@ -49,8 +49,8 @@ struct rule_addr {
 struct pf_rule {
 	char		 ifname[IFNAMSIZ];
 	struct ifnet	*ifp;
-	struct rule_addr src;
-	struct rule_addr dst;
+	struct pf_rule_addr src;
+	struct pf_rule_addr dst;
 	struct pf_rule	*next;
 
 	u_int8_t	 action;
@@ -67,12 +67,12 @@ struct pf_rule {
 	u_int8_t	 flagset;
 };
 
-struct state_host {
+struct pf_state_host {
 	u_int32_t	addr;
 	u_int16_t	port;
 };
 
-struct state_peer {
+struct pf_state_peer {
 	u_int32_t	seqlo;
 	u_int32_t	seqhi;
 	u_int8_t	state;
@@ -80,11 +80,11 @@ struct state_peer {
 
 struct pf_state {
 	struct pf_state	*next;
-	struct state_host lan;
-	struct state_host gwy;
-	struct state_host ext;
-	struct state_peer src;
-	struct state_peer dst;
+	struct pf_state_host lan;
+	struct pf_state_host gwy;
+	struct pf_state_host ext;
+	struct pf_state_peer src;
+	struct pf_state_peer dst;
 	u_int32_t	 creation;
 	u_int32_t	 expire;
 	u_int32_t	 packets;
-- 
cgit v1.2.3