diff options
| author | Cedric Berger <cedric@cvs.openbsd.org> | 2003-07-31 22:25:56 +0000 |
|---|---|---|
| committer | Cedric Berger <cedric@cvs.openbsd.org> | 2003-07-31 22:25:56 +0000 |
| commit | 71024192f8e6c068fce407d284f29caf19a22881 (patch) | |
| tree | a0e5f6a9a8fa62cfce6cfea3891c42401256dfff /sys/net/pfvar.h | |
| parent | 8deaa5cb1bdad9c4505896866607f4272b307e9a (diff) | |
Make table tickets per-ruleset instead of global.
Make table tickets u_int32_t for consistency with other parts of PF.
Ok dhartmei@ henning@
Diffstat (limited to 'sys/net/pfvar.h')
| -rw-r--r-- | sys/net/pfvar.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 4c247953a71..0e15f54f07c 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.163 2003/07/19 13:08:58 cedric Exp $ */ +/* $OpenBSD: pfvar.h,v 1.164 2003/07/31 22:25:55 cedric Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -495,7 +495,9 @@ struct pf_ruleset { } active, inactive; } rules[PF_RULESET_MAX]; struct pf_anchor *anchor; + u_int32_t tticket; int tables; + int topen; }; TAILQ_HEAD(pf_rulesetqueue, pf_ruleset); @@ -915,7 +917,7 @@ struct pfioc_table { int pfrio_ndel; int pfrio_nchange; int pfrio_flags; - int pfrio_ticket; + u_int32_t pfrio_ticket; }; #define pfrio_exists pfrio_nadd #define pfrio_nzero pfrio_nadd @@ -1107,10 +1109,10 @@ int pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_tst_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); -int pfr_ina_begin(int *, int *, int); -int pfr_ina_commit(int, int *, int *, int); +int pfr_ina_begin(struct pfr_table *, u_int32_t *, int *, int); +int pfr_ina_commit(struct pfr_table *, u_int32_t, int *, int *, int); int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *, - int *, int, int); + int *, u_int32_t, int); u_int16_t pf_tagname2tag(char *); void pf_tag2tagname(u_int16_t, char *); |