Date: Wed, 14 Oct 2009 21:39:47 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r198101 - user/eri/pf45/head/sys/contrib/pf/net Message-ID: <200910142139.n9ELdlqg049408@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eri Date: Wed Oct 14 21:39:47 2009 New Revision: 198101 URL: http://svn.freebsd.org/changeset/base/198101 Log: These functions are not used in FreeBSD(pf_find/pf_get)_divert). Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c user/eri/pf45/head/sys/contrib/pf/net/pfvar.h Modified: user/eri/pf45/head/sys/contrib/pf/net/pf.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf.c Wed Oct 14 21:34:52 2009 (r198100) +++ user/eri/pf45/head/sys/contrib/pf/net/pf.c Wed Oct 14 21:39:47 2009 (r198101) @@ -336,7 +336,9 @@ void pf_set_rt_ifp(struct pf_state *, struct pf_addr *); int pf_check_proto_cksum(struct mbuf *, int, int, u_int8_t, sa_family_t); +#ifndef __FreeBSD__ struct pf_divert *pf_get_divert(struct mbuf *); +#endif void pf_print_state_parts(struct pf_state *, struct pf_state_key *, struct pf_state_key *); int pf_addr_wrap_neq(struct pf_addr_wrap *, @@ -6358,25 +6360,21 @@ pf_check_proto_cksum(struct mbuf *m, int } #endif +#ifndef __FreeBSD__ struct pf_divert * pf_find_divert(struct mbuf *m) { -#ifdef notyet struct m_tag *mtag; if ((mtag = m_tag_find(m, PACKET_TAG_PF_DIVERT, NULL)) == NULL) return (NULL); return ((struct pf_divert *)(mtag + 1)); -#else - return NULL; -#endif } struct pf_divert * pf_get_divert(struct mbuf *m) { -#ifdef notyet struct m_tag *mtag; if ((mtag = m_tag_find(m, PACKET_TAG_PF_DIVERT, NULL)) == NULL) { @@ -6389,10 +6387,8 @@ pf_get_divert(struct mbuf *m) } return ((struct pf_divert *)(mtag + 1)); -#else - return NULL; -#endif } +#endif #ifdef INET int Modified: user/eri/pf45/head/sys/contrib/pf/net/pfvar.h ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pfvar.h Wed Oct 14 21:34:52 2009 (r198100) +++ user/eri/pf45/head/sys/contrib/pf/net/pfvar.h Wed Oct 14 21:39:47 2009 (r198101) @@ -1928,7 +1928,9 @@ extern void pf_addrcpy(struct pf_addr u_int8_t); void pf_rm_rule(struct pf_rulequeue *, struct pf_rule *); +#ifndef __FreeBSD__ struct pf_divert *pf_find_divert(struct mbuf *); +#endif #ifdef INET #ifdef __FreeBSD__
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910142139.n9ELdlqg049408>