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

Toss declarations to fix regular build and NO_INET6 build.

Browse Source
This commit is contained in:
Gleb Smirnoff 2015-02-16 21:52:28 +00:00
parent 46bf2f5317
commit 8dc98c2a36
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/pfvar.h
View File

@ -1574,7 +1574,7 @@ int pf_test6(int, struct ifnet *, struct mbuf **, struct inpcb *);
void pf_poolmask(struct pf_addr *, struct pf_addr*, void pf_poolmask(struct pf_addr *, struct pf_addr*,
struct pf_addr *, struct pf_addr *, u_int8_t); struct pf_addr *, struct pf_addr *, u_int8_t);
void pf_addr_inc(struct pf_addr *, sa_family_t); void pf_addr_inc(struct pf_addr *, sa_family_t);
int pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag); int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *);
#endif /* INET6 */ #endif /* INET6 */
u_int32_t pf_new_isn(struct pf_state *); u_int32_t pf_new_isn(struct pf_state *);
@ -1589,7 +1589,6 @@ int pf_match_addr_range(struct pf_addr *, struct pf_addr *,
int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t);
void pf_normalize_init(void); void pf_normalize_init(void);
int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *mtag);
void pf_normalize_cleanup(void); void pf_normalize_cleanup(void);
int pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *, int pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *,
struct pf_pdesc *); struct pf_pdesc *);

8
sys/netpfil/pf/pf_norm.c
View File

@ -148,9 +148,6 @@ static struct pf_fragment *pf_find_fragment(struct pf_fragment_cmp *key,
struct pf_frent *pf_create_fragment(u_short *); struct pf_frent *pf_create_fragment(u_short *);
static int pf_reassemble(struct mbuf **, struct ip *, int, static int pf_reassemble(struct mbuf **, struct ip *, int,
u_short *); u_short *);
int pf_reassemble6(struct mbuf **, struct ip6_hdr *,
struct ip6_frag *, uint16_t, uint16_t, int,
u_short *);
static struct mbuf *pf_fragcache(struct mbuf **, struct ip*, static struct mbuf *pf_fragcache(struct mbuf **, struct ip*,
struct pf_fragment **, int, int, int *); struct pf_fragment **, int, int, int *);
static struct pf_fragment *pf_fillup_fragment(struct pf_fragment_cmp *, static struct pf_fragment *pf_fillup_fragment(struct pf_fragment_cmp *,
@ -161,6 +158,9 @@ struct mbuf *pf_join_fragment(struct pf_fragment *);
#endif /* INET */ #endif /* INET */
#ifdef INET6 #ifdef INET6
int pf_reassemble6(struct mbuf **, struct ip6_hdr *,
struct ip6_frag *, uint16_t, uint16_t, int,
u_short *);
static void pf_scrub_ip6(struct mbuf **, u_int8_t); static void pf_scrub_ip6(struct mbuf **, u_int8_t);
#endif #endif
#define DPFPRINTF(x) do { \ #define DPFPRINTF(x) do { \
@ -1094,6 +1094,7 @@ pf_fragcache(struct mbuf **m0, struct ip *h, struct pf_fragment **frag, int mff,
return (NULL); return (NULL);
} }
#ifdef INET6
int int
pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag) pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag)
{ {
@ -1162,6 +1163,7 @@ pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag)
return (action); return (action);
} }
#endif /* INET6 */
int int
pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kif *kif, u_short *reason, pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kif *kif, u_short *reason,