1c1
< /* $OpenBSD: pfctl_parser.h,v 1.80 2005/02/07 18:18:14 david Exp $ */
---
> /* $OpenBSD: pfctl_parser.h,v 1.86 2006/10/31 23:46:25 mcbride Exp $ */
31c31
< * $FreeBSD: head/contrib/pf/pfctl/pfctl_parser.h 145840 2005-05-03 16:55:20Z mlaier $
---
> * $FreeBSD: head/contrib/pf/pfctl/pfctl_parser.h 171172 2007-07-03 12:30:03Z mlaier $
51d50
< #define PF_OPT_OPTIMIZE_PROFILE 0x1000
52a52
> #define PF_OPT_RECURSE 0x4000
58a59,61
> #define PF_OPTIMIZE_BASIC 0x0001
> #define PF_OPTIMIZE_PROFILE 0x0002
>
67,68d69
< struct pf_opt_rule;
< TAILQ_HEAD(pf_opt_queue, pf_opt_rule);
73a75
> int optimize;
75c77,79
< u_int32_t tticket; /* table ticket */
---
> int asd; /* anchor stack depth */
> int bn; /* brace number */
> int brace;
77c81,82
< u_int32_t rule_nr;
---
> #define PFCTL_ANCHOR_STACK_DEPTH 64
> struct pf_anchor *astack[PFCTL_ANCHOR_STACK_DEPTH];
82c87
< const char *anchor;
---
> struct pf_anchor *anchor, *alast;
84d88
< struct pf_opt_queue opt_queue;
121,124d124
< /* special flags used by ifa_exists */
< #define PF_IFA_FLAG_GROUP 0x10000
< #define PF_IFA_FLAG_DYNAMIC 0x20000
< #define PF_IFA_FLAG_CLONABLE 0x40000
208d207
< char por_anchor[MAXPATHLEN];
213a213
> TAILQ_HEAD(pf_opt_queue, pf_opt_rule);
215,216c215,216
< int pfctl_rules(int, char *, int, char *, struct pfr_buffer *);
< int pfctl_optimize_rules(struct pfctl *);
---
> int pfctl_rules(int, char *, FILE *, int, int, char *, struct pfr_buffer *);
> int pfctl_optimize_ruleset(struct pfctl *, struct pf_ruleset *);
220a221
> void pfctl_move_pool(struct pf_pool *, struct pf_pool *);
233c234
< int pfctl_load_anchors(int, int, struct pfr_buffer *);
---
> int pfctl_load_anchors(int, struct pfctl *, struct pfr_buffer *);
295c296
< struct node_host *ifa_exists(const char *, int);
---
> struct node_host *ifa_exists(const char *);