d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pf: Move prototypes for userspace functions to userspace header

Browse Source 
These functions no longer exist in the kernel, so there's no reason to
keep the prototypes in a kernel header. Move them to pfctl where they're
actually implemented.

Reviewed by:	glebius
MFC after:	4 weeks
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D29643
This commit is contained in:
Kristof Provost 2021-04-07 19:49:51 +02:00
parent 956e7d2325
commit a9b338b260
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/pfctl/pf_ruleset.c
View File

@ -64,6 +64,8 @@ __FBSDID("$FreeBSD$");
#define rs_malloc(x) calloc(1, x)
#define rs_free(x) free(x)
#include "pfctl.h"
#ifdef PFDEBUG
#include <sys/stdarg.h>
#define DPFPRINTF(format, x...) fprintf(stderr, format , ##x)

8
sbin/pfctl/pfctl.h
View File

@ -128,4 +128,12 @@ u_int32_t
pfctl_get_ticket(struct pfr_buffer *, int, const char *);
int pfctl_trans(int, struct pfr_buffer *, u_long, int);
int pf_get_ruleset_number(u_int8_t);
void pf_init_ruleset(struct pf_ruleset *);
int pf_anchor_setup(struct pf_rule *,
const struct pf_ruleset *, const char *);
void pf_remove_if_empty_ruleset(struct pf_ruleset *);
struct pf_ruleset *pf_find_ruleset(const char *);
struct pf_ruleset *pf_find_or_create_ruleset(const char *);
#endif /* _PFCTL_H_ */

9
sys/netpfil/pf/pf.h
View File

@ -637,13 +637,6 @@ struct pf_anchor {
RB_PROTOTYPE(pf_anchor_global, pf_anchor, entry_global, pf_anchor_compare);
RB_PROTOTYPE(pf_anchor_node, pf_anchor, entry_node, pf_anchor_compare);
/* these ruleset functions can be linked into userland programs (pfctl) */
int pf_get_ruleset_number(u_int8_t);
void pf_init_ruleset(struct pf_ruleset *);
int pf_anchor_setup(struct pf_rule *,
const struct pf_ruleset *, const char *);
void pf_remove_if_empty_ruleset(struct pf_ruleset *);
struct pf_ruleset *pf_find_ruleset(const char *);
struct pf_ruleset *pf_find_or_create_ruleset(const char *);
int pf_get_ruleset_number(u_int8_t);
#endif /* _NET_PF_H_ */