diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2009-11-23 16:03:11 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2009-11-23 16:03:11 +0000 |
| commit | f25c0075c80ece366422bade164e10046df5f931 (patch) | |
| tree | 2da45d9600de0fb6c6aa31eb6d120a9c30379d72 /sys/net/pfvar.h | |
| parent | 0434111a6b25ef584a3a7be6b4c7064d01bd172d (diff) | |
remove the nat_rule pointer on pf_state and pf_pdesc, obsolete after
the NAT rewrite and ever since then only checked in a couple of plaes
but never set. same for nat_src_node on pf_state.
with this the NAT rewrite made pf over 1000 lines shorter.
Diffstat (limited to 'sys/net/pfvar.h')
| -rw-r--r-- | sys/net/pfvar.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 398eb806c94..8f153cd49bd 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.299 2009/11/22 22:34:50 henning Exp $ */ +/* $OpenBSD: pfvar.h,v 1.300 2009/11/23 16:03:10 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -344,7 +344,6 @@ struct pfi_dynaddr { (neg) \ ) - struct pf_rule_uid { uid_t uid[2]; u_int8_t op; @@ -393,7 +392,6 @@ struct pf_pool { u_int8_t opts; }; - /* A packed Operating System description for fingerprinting */ typedef u_int32_t pf_osfp_t; #define PF_OSFP_ANY ((pf_osfp_t)0) @@ -768,13 +766,11 @@ struct pf_state { struct pf_rule_slist match_rules; union pf_rule_ptr rule; union pf_rule_ptr anchor; - union pf_rule_ptr nat_rule; struct pf_addr rt_addr; struct pf_state_key *key[2]; /* addresses stack and wire */ struct pfi_kif *kif; struct pfi_kif *rt_kif; struct pf_src_node *src_node; - struct pf_src_node *nat_src_node; u_int64_t packets[2]; u_int64_t bytes[2]; u_int32_t creation; @@ -1134,7 +1130,6 @@ struct pf_pdesc { void *any; } hdr; - struct pf_rule *nat_rule; /* nat/rdr rule applied to packet */ struct ether_header *eh; struct pf_addr *src; /* src address */ |