diff options
author | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:55:20 +0000 |
---|---|---|
committer | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:55:20 +0000 |
commit | b28479dfe2b344764dddb58a31df37c21423cfde (patch) | |
tree | 7a2c1661f3b801f814c99be7e4339e2b5cfdb86f /contrib/pf/pfctl/pfctl.h | |
parent | f9e60af5004dc157f222b733768010aa3d2e98d7 (diff) | |
download | FreeBSD-src-b28479dfe2b344764dddb58a31df37c21423cfde.zip FreeBSD-src-b28479dfe2b344764dddb58a31df37c21423cfde.tar.gz |
Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step. This is functional as is.
Tested by: freebsd-pf, pfsense.org
Obtained from: OpenBSD
Diffstat (limited to 'contrib/pf/pfctl/pfctl.h')
-rw-r--r-- | contrib/pf/pfctl/pfctl.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/contrib/pf/pfctl/pfctl.h b/contrib/pf/pfctl/pfctl.h index 2776f5e..94c6fc8 100644 --- a/contrib/pf/pfctl/pfctl.h +++ b/contrib/pf/pfctl/pfctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.h,v 1.33 2004/02/19 21:37:01 cedric Exp $ */ +/* $OpenBSD: pfctl.h,v 1.37 2005/01/05 18:23:10 mcbride Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -65,8 +65,6 @@ int pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int); 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_set_tflags(struct pfr_table *, int, int, int, int *, int *, int); -int pfr_ina_begin(struct pfr_table *, int *, int *, int); -int pfr_ina_commit(struct pfr_table *, int, int *, int *, int); int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *, int *, int, int); void pfr_buf_clear(struct pfr_buffer *); @@ -80,13 +78,14 @@ int pfi_get_ifaces(const char *, struct pfi_if *, int *, int); int pfi_clr_istats(const char *, int *, int); void pfctl_print_title(char *); -int pfctl_clear_tables(const char *, const char *, int); -int pfctl_show_tables(const char *, const char *, int); +int pfctl_clear_tables(const char *, int); +int pfctl_show_tables(const char *, int); int pfctl_command_tables(int, char *[], char *, const char *, char *, - const char *, const char *, int); + const char *, int); int pfctl_show_altq(int, const char *, int, int); void warn_namespace_collision(const char *); int pfctl_show_ifaces(const char *, int); +FILE *pfctl_fopen(const char *, const char *); #ifdef __FreeBSD__ extern int altqsupport; @@ -108,6 +107,8 @@ struct segment { double x, y, d, m; }; +extern int loadopt; + int check_commit_altq(int, int); void pfaltq_store(struct pf_altq *); void pfaltq_free(struct pf_altq *); @@ -121,9 +122,9 @@ void print_state(struct pf_state *, int); int unmask(struct pf_addr *, sa_family_t); int pfctl_cmdline_symset(char *); -int pfctl_add_trans(struct pfr_buffer *, int, const char *, const char *); +int pfctl_add_trans(struct pfr_buffer *, int, const char *); u_int32_t - pfctl_get_ticket(struct pfr_buffer *, int, const char *, const char *); + pfctl_get_ticket(struct pfr_buffer *, int, const char *); int pfctl_trans(int, struct pfr_buffer *, u_long, int); #endif /* _PFCTL_H_ */ |