diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-03-07 23:30:20 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-03-07 23:30:20 +0000 |
| commit | cfd60bb436ec323a029a43130c30f34f22901653 (patch) | |
| tree | 31abc282f142d6cc2455333b7d78640b000bb3a8 /sys/net | |
| parent | e2ec7f70244f8417cad73d40d00acfcfef383d29 (diff) | |
Declare the inline function pf_addr_compare() non-static in pfvar.h
to make it reusable by pf fragment reassembly. No functional change.
discussed with henning@, claudio@, deraadt@, kettenis@
ok guenther@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pf.c | 6 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index df9b3048427..08bed7d7253 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.728 2011/03/05 01:53:16 bluhm Exp $ */ +/* $OpenBSD: pf.c,v 1.729 2011/03/07 23:30:18 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -297,8 +297,6 @@ enum { PF_ICMP_MULTI_NONE, PF_ICMP_MULTI_SOLICITED, PF_ICMP_MULTI_LINK }; mrm->r->states_cur--; \ } while (0) -static __inline int pf_addr_compare(struct pf_addr *, struct pf_addr *, - sa_family_t); static __inline int pf_src_compare(struct pf_src_node *, struct pf_src_node *); static __inline int pf_state_compare_key(struct pf_state_key *, struct pf_state_key *); @@ -315,7 +313,7 @@ RB_GENERATE(pf_state_tree, pf_state_key, entry, pf_state_compare_key); RB_GENERATE(pf_state_tree_id, pf_state, entry_id, pf_state_compare_id); -static __inline int +__inline int pf_addr_compare(struct pf_addr *a, struct pf_addr *b, sa_family_t af) { switch (af) { diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index f1d852b70ec..0a1cd522f36 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.321 2011/03/05 01:53:16 bluhm Exp $ */ +/* $OpenBSD: pfvar.h,v 1.322 2011/03/07 23:30:19 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1871,6 +1871,8 @@ void pf_tag_packet(struct mbuf *, int, int); u_int32_t pf_qname2qid(char *); void pf_qid2qname(u_int32_t, char *); void pf_qid_unref(u_int32_t); +int pf_addr_compare(struct pf_addr *, struct pf_addr *, + sa_family_t); extern struct pf_status pf_status; extern struct pool pf_frent_pl, pf_frag_pl; |