diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2009-11-24 13:23:56 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2009-11-24 13:23:56 +0000 |
| commit | 9b8c996d7455d74925bdd6c6f1a6754f4d96d146 (patch) | |
| tree | a69dfa6a949230707b7c826532a2f6d5c90308ea | |
| parent | 023dbd3c4918eb03cfe19320a9d1f706ef215b3a (diff) | |
kill obsolete natpass
| -rw-r--r-- | sys/net/pf_ioctl.c | 3 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 013c27c72b0..1d51adef25b 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.227 2009/11/23 16:03:10 henning Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.228 2009/11/24 13:23:55 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -788,7 +788,6 @@ pf_hash_rule(MD5_CTX *ctx, struct pf_rule *rule) PF_MD5_UPD(rule, quick); PF_MD5_UPD(rule, ifnot); PF_MD5_UPD(rule, match_tag_not); - PF_MD5_UPD(rule, natpass); PF_MD5_UPD(rule, keep_state); PF_MD5_UPD(rule, proto); PF_MD5_UPD(rule, type); diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 8f153cd49bd..1bd5304a288 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.300 2009/11/23 16:03:10 henning Exp $ */ +/* $OpenBSD: pfvar.h,v 1.301 2009/11/24 13:23:55 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -578,6 +578,7 @@ struct pf_rule { u_int16_t max_mss; u_int16_t tag; u_int16_t match_tag; + u_int16_t scrub_flags; struct pf_rule_uid uid; struct pf_rule_gid gid; @@ -590,7 +591,6 @@ struct pf_rule { u_int8_t quick; u_int8_t ifnot; u_int8_t match_tag_not; - u_int8_t natpass; #define PF_STATE_NORMAL 0x1 #define PF_STATE_MODULATE 0x2 @@ -614,8 +614,7 @@ struct pf_rule { #define PF_FLUSH 0x01 #define PF_FLUSH_GLOBAL 0x02 u_int8_t flush; - u_int16_t scrub_flags; - u_int8_t pad2[2]; + u_int8_t pad2[3]; struct { struct pf_addr addr; |