summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-06-03 12:34:05 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-06-03 12:34:05 +0000
commit1fb7088aa35b34099638abe7575434151652e4e5 (patch)
treeface51457c959ec59aaf313cb664021081dc50f0
parent809196520a7a7fddd15b5dae4321b9f24db50995 (diff)
move some prototypes to pfvar.h. needed soon.
pf_tagname2tag, pf_tag2tagname, pf_tag_unref, pf_tag_packet
-rw-r--r--sys/net/pf.c4
-rw-r--r--sys/net/pf_ioctl.c5
-rw-r--r--sys/net/pfvar.h7
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 34c4828c3bc..d04fc4f98a4 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.360 2003/05/18 19:58:56 henning Exp $ */
+/* $OpenBSD: pf.c,v 1.361 2003/06/03 12:34:04 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -186,8 +186,6 @@ struct pf_tag *pf_get_tag(struct mbuf *);
int pf_match_tag(struct mbuf *, struct pf_rule *,
struct pf_rule *, struct pf_rule *,
struct pf_tag *, int *);
-int pf_tag_packet(struct mbuf *, struct pf_tag *,
- int);
#ifdef INET6
void pf_poolmask(struct pf_addr *, struct pf_addr*,
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 896213c37d3..ab2f76c8601 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_ioctl.c,v 1.66 2003/06/03 12:30:33 henning Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.67 2003/06/03 12:34:04 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -83,9 +83,6 @@ void pf_remove_if_empty_ruleset(struct pf_ruleset *);
void pf_mv_pool(struct pf_palist *, struct pf_palist *);
void pf_empty_pool(struct pf_palist *);
int pfioctl(dev_t, u_long, caddr_t, int, struct proc *);
-u_int16_t pf_tagname2tag(char *);
-void pf_tag2tagname(u_int16_t, char *);
-void pf_tag_unref(u_int16_t);
void pf_tag_purge(void);
extern struct timeout pf_expire_to;
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 7ad7c2b1847..dcd63338423 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar.h,v 1.152 2003/05/17 02:01:21 henning Exp $ */
+/* $OpenBSD: pfvar.h,v 1.153 2003/06/03 12:34:04 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1103,6 +1103,11 @@ int pfr_ina_commit(int, int *, int *, int);
int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *,
int *, int, int);
+u_int16_t pf_tagname2tag(char *);
+void pf_tag2tagname(u_int16_t, char *);
+void pf_tag_unref(u_int16_t);
+int pf_tag_packet(struct mbuf *, struct pf_tag *, int);
+
extern struct pf_status pf_status;
extern struct pool pf_frent_pl, pf_frag_pl;