D32698.id97587.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32698.id97587.diff
View Options

	Index: sys/netinet/siftr.c
	===================================================================
	--- sys/netinet/siftr.c
	+++ sys/netinet/siftr.c
	@@ -99,7 +99,7 @@

	#ifdef SIFTR_IPV6
	#include <netinet/ip6.h>
	-#include <netinet/ip6_var.h>
	+#include <netinet6/ip6_var.h>
	#include <netinet6/in6_pcb.h>
	#endif /* SIFTR_IPV6 */

	@@ -1007,8 +1007,9 @@
	}

	#ifdef SIFTR_IPV6
	-static int
	-siftr_chkpkt6(struct mbuf *m, struct ifnet ifp, int flags, struct inpcb *inp)
	+static pfil_return_t
	+siftr_chkpkt6(struct mbuf *m, struct ifnet ifp, int flags,
	+ void ruleset __unused, struct inpcb inp)
	{
	struct pkt_node *pn;
	struct ip6_hdr *ip6;
	@@ -1127,14 +1128,13 @@
	INP_RUNLOCK(inp);

	ret6:
	- /* Returning 0 ensures pfil will not discard the pkt. */
	- return (0);
	+ return (PFIL_PASS);
	}
	#endif /* #ifdef SIFTR_IPV6 */

	VNET_DEFINE_STATIC(pfil_hook_t, siftr_inet_hook);
	#define V_siftr_inet_hook VNET(siftr_inet_hook)
	-#ifdef INET6
	+#ifdef SIFTR_IPV6
	VNET_DEFINE_STATIC(pfil_hook_t, siftr_inet6_hook);
	#define V_siftr_inet6_hook VNET(siftr_inet6_hook)
	#endif