Bye bye pf_test6(). Only one pf_test function for both IPv4 and v6.

The functions were 95% identical anyway. While there use struct pf_addr
in struct pf_divert instead of some union which is the same.
OK bluhm@ mcbride@ and most probably henning@ as well

10 files changed, 83 insertions, 324 deletions

diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 7049b923f81..730c902ab80 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.192 2011/05/16 20:06:28 henning Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.193 2011/07/04 06:54:49 claudio Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -2449,29 +2449,12 @@ bridge_ipsec(struct bridge_softc *sc, struct ifnet *ifp,
 			 * bridge will do that for us.
 			 */
 #if NPF > 0
-			switch (af) {
-#ifdef INET
-			case AF_INET:
-				if ((encif = enc_getif(tdb->tdb_rdomain,
-				    tdb->tdb_tap)) == NULL ||
-				    pf_test(dir, encif,
-				    &m, NULL) != PF_PASS) {
-					m_freem(m);
-					return (1);
-				}
-				break;
-#endif /* INET */
-#ifdef INET6
-			case AF_INET6:
-				if ((encif = enc_getif(tdb->tdb_rdomain,
-				    tdb->tdb_tap)) == NULL ||
-				    pf_test6(dir, encif,
-				    &m, NULL) != PF_PASS) {
-					m_freem(m);
-					return (1);
-				}
-				break;
-#endif /* INET6 */
+			if ((encif = enc_getif(tdb->tdb_rdomain,
+			    tdb->tdb_tap)) == NULL ||
+			    pf_test(af, dir, encif,
+			    &m, NULL) != PF_PASS) {
+				m_freem(m);
+				return (1);
 			}
 			if (m == NULL)
 				return (1);
@@ -2616,7 +2599,7 @@ bridge_ip(struct bridge_softc *sc, int dir, struct ifnet *ifp,
 #endif /* IPSEC */
 #if NPF > 0
 		/* Finally, we get to filter the packet! */
-		if (pf_test(dir, ifp, &m, eh) != PF_PASS)
+		if (pf_test(AF_INET, dir, ifp, &m, eh) != PF_PASS)
 			goto dropit;
 		if (m == NULL)
 			goto dropit;
@@ -2667,7 +2650,7 @@ bridge_ip(struct bridge_softc *sc, int dir, struct ifnet *ifp,
 #endif /* IPSEC */
 
 #if NPF > 0
-		if (pf_test6(dir, ifp, &m, eh) != PF_PASS)
+		if (pf_test(AF_INET6, dir, ifp, &m, eh) != PF_PASS)
 			goto dropit;
 		if (m == NULL)
 			return (NULL);
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 51e69af953b..235e6a586d4 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.756 2011/07/03 23:37:55 zinke Exp $ */
+/*	$OpenBSD: pf.c,v 1.757 2011/07/04 06:54:49 claudio Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -5151,7 +5151,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
 
 
 	if (oifp != ifp) {
-		if (pf_test(PF_OUT, ifp, &m0, NULL) != PF_PASS)
+		if (pf_test(AF_INET, PF_OUT, ifp, &m0, NULL) != PF_PASS)
 			goto bad;
 		else if (m0 == NULL)
 			goto done;
@@ -5316,7 +5316,7 @@ pf_route6(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
 		goto bad;
 
 	if (oifp != ifp) {
-		if (pf_test6(PF_OUT, ifp, &m0, NULL) != PF_PASS)
+		if (pf_test(AF_INET6, PF_OUT, ifp, &m0, NULL) != PF_PASS)
 			goto bad;
 		else if (m0 == NULL)
 			goto done;
@@ -5541,6 +5541,8 @@ pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0,
 		pd->tos = h->ip_tos;
 		pd->tot_len = ntohs(h->ip_len);
 		pd->rdomain = rtable_l2(m->m_pkthdr.rdomain);
+		if (h->ip_hl > 5)	/* has options */
+			pd->rh_cnt++;
 
 		if (h->ip_off & htons(IP_MF | IP_OFFMASK)) {
 			/*
@@ -5796,9 +5798,8 @@ pf_counters_inc(int dir, int action, struct pf_pdesc *pd,
 	}
 }
 
-#ifdef INET
 int
-pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
+pf_test(sa_family_t af, int fwdir, struct ifnet *ifp, struct mbuf **m0,
     struct ether_header *eh)
 {
 	struct pfi_kif		*kif;
@@ -5810,6 +5811,7 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
 	struct pf_pdesc		 pd;
 	union pf_headers	 hdrs;
 	int			 off, hdrlen;
+	int			 dir = (fwdir == PF_FWD) ? PF_OUT : fwdir;
 	u_int32_t		 qid, pqid = 0;
 
 	if (!pf_status.running)
@@ -5846,7 +5848,7 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
 		return (PF_PASS);
 	}
 
-	if (pf_setup_pdesc(AF_INET, dir, &pd, m0, &action, &reason, kif, &a, &r,
+	if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, kif, &a, &r,
 	    &ruleset, &off, &hdrlen) == -1) {
 		if (action == PF_PASS)
 			return (PF_PASS);
@@ -5903,6 +5905,12 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
 	}
 
 	case IPPROTO_ICMP: {
+		if (af == AF_INET6) {
+			action = PF_DROP;
+			DPFPRINTF(LOG_NOTICE,
+			    "dropping IPv6 packet with ICMPv4 payload");
+			goto done;
+		}
 		action = pf_test_state_icmp(&s, dir, kif, m, off, &pd,
 		    &reason);
 		if (action == PF_PASS) {
@@ -5919,254 +5927,12 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
 	}
 
 	case IPPROTO_ICMPV6: {
-		action = PF_DROP;
-		DPFPRINTF(LOG_NOTICE,
-		    "dropping IPv4 packet with ICMPv6 payload");
-		goto done;
-	}
-
-	default:
-		action = pf_test_state_other(&s, dir, kif, m, &pd);
-		if (action == PF_PASS) {
-#if NPFSYNC > 0
-			pfsync_update_state(s);
-#endif /* NPFSYNC */
-			r = s->rule.ptr;
-			a = s->anchor.ptr;
-			pd.pflog |= s->log;
-		} else if (s == NULL)
-			action = pf_test_rule(&r, &s, dir, kif, m, off,
-			    &pd, &a, &ruleset, hdrlen);
-		break;
-	}
-
-done:
-	if (action != PF_DROP) {
-		if (s) {
-			/* The non-state case is handled in pf_test_rule() */
-			struct ip	*h = mtod(m, struct ip *);
-			if (action == PF_PASS && h->ip_hl > 5 &&
-			    !(s->state_flags & PFSTATE_ALLOWOPTS)) {
-				action = PF_DROP;
-				REASON_SET(&reason, PFRES_IPOPTIONS);
-				pd.pflog |= PF_LOG_FORCE;
-				DPFPRINTF(LOG_NOTICE, "dropping packet with "
-				    "ip options in pf_test()");
-			}
-
-			pf_scrub(m, s->state_flags, pd.af, s->min_ttl,
-			    s->set_tos);
-			pf_tag_packet(m, s->tag, s->rtableid[pd.didx]);
-			if (pqid || (pd.tos & IPTOS_LOWDELAY))
-				qid = s->pqid;
-			else
-				qid = s->qid;
-		} else {
-			pf_scrub(m, r->scrub_flags, pd.af, r->min_ttl,
-			    r->set_tos);
-			if (pqid || (pd.tos & IPTOS_LOWDELAY))
-				qid = r->pqid;
-			else
-				qid = r->qid;
-		}
-	}
-
-	if (dir == PF_IN && s && s->key[PF_SK_STACK])
-		m->m_pkthdr.pf.statekey = s->key[PF_SK_STACK];
-
-#ifdef ALTQ
-	if (action == PF_PASS && qid) {
-		m->m_pkthdr.pf.qid = qid;
-		m->m_pkthdr.pf.hdr = mtod(m, caddr_t);	/* hints for ecn */
-	}
-#endif /* ALTQ */
-
-	/*
-	 * connections redirected to loopback should not match sockets
-	 * bound specifically to loopback due to security implications,
-	 * see tcp_input() and in_pcblookup_listen().
-	 */
-	if (pd.destchg &&
-	    (ntohl(pd.dst->v4.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
-		m->m_pkthdr.pf.flags |= PF_TAG_TRANSLATE_LOCALHOST;
-	/* We need to redo the route lookup on outgoing routes. */
-	if (pd.destchg && dir == PF_OUT)
-		m->m_pkthdr.pf.flags |= PF_TAG_REROUTE;
-
-	if (dir == PF_IN && action == PF_PASS && r->divert.port) {
-		struct pf_divert *divert;
-
-		if ((divert = pf_get_divert(m))) {
-			m->m_pkthdr.pf.flags |= PF_TAG_DIVERTED;
-			divert->port = r->divert.port;
-			divert->rdomain = pd.rdomain;
-			divert->addr.ipv4 = r->divert.addr.v4;
-		}
-	}
-
-	if (action == PF_PASS && r->divert_packet.port) {
-		struct pf_divert *divert;
-
-		if ((divert = pf_get_divert(m)))
-			divert->port = r->divert_packet.port;
-
-		action = PF_DIVERT;
-	}
-
-	if (pd.pflog) {
-		struct pf_rule_item	*ri;
-
-		if (pd.pflog & PF_LOG_FORCE || r->log & PF_LOG_ALL)
-			PFLOG_PACKET(kif, m, dir, reason, r, a, ruleset, &pd);
-		if (s) {
-			SLIST_FOREACH(ri, &s->match_rules, entry)
-				if (ri->r->log & PF_LOG_ALL)
-					PFLOG_PACKET(kif, m, dir, reason,
-					    ri->r, a, ruleset, &pd);
-		}
-	}
-
-	pf_counters_inc(dir, action, &pd, kif, s, r, a);
-
-	switch (action) {
-	case PF_SYNPROXY_DROP:
-		m_freem(*m0);
-	case PF_DEFER:
-		*m0 = NULL;
-		action = PF_PASS;
-		break;
-	case PF_DIVERT:
-		divert_packet(m, dir);
-		*m0 = NULL;
-		action = PF_PASS;
-		break;
-	default:
-		/* pf_route can free the mbuf causing *m0 to become NULL */
-		if (r->rt)
-			pf_route(m0, r, dir, kif->pfik_ifp, s);
-		break;
-	}
-
-	return (action);
-}
-#endif /* INET */
-
-#ifdef INET6
-int
-pf_test6(int fwdir, struct ifnet *ifp, struct mbuf **m0,
-    struct ether_header *eh)
-{
-	struct pfi_kif		*kif;
-	u_short			 action, reason = 0;
-	struct mbuf		*m = *m0;
-	struct m_tag		*mtag;
-	struct pf_rule		*a = NULL, *r = &pf_default_rule;
-	struct pf_state		*s = NULL;
-	struct pf_ruleset	*ruleset = NULL;
-	struct pf_pdesc		 pd;
-	union pf_headers	 hdrs;
-	int			 off, hdrlen;
-	int			 dir = (fwdir == PF_FWD) ? PF_OUT : fwdir;
-	u_int32_t		 qid, pqid = 0;
-
-	if (!pf_status.running)
-		return (PF_PASS);
-
-	memset(&pd, 0, sizeof(pd));
-	pd.hdr.any = &hdrs;
-	if (ifp->if_type == IFT_CARP && ifp->if_carpdev)
-		kif = (struct pfi_kif *)ifp->if_carpdev->if_pf_kif;
-	else
-		kif = (struct pfi_kif *)ifp->if_pf_kif;
-
-	if (kif == NULL) {
-		DPFPRINTF(LOG_ERR,
-		    "pf_test6: kif == NULL, if_xname %s", ifp->if_xname);
-		return (PF_DROP);
-	}
-	if (kif->pfik_flags & PFI_IFLAG_SKIP)
-		return (PF_PASS);
-
-#ifdef DIAGNOSTIC
-	if ((m->m_flags & M_PKTHDR) == 0)
-		panic("non-M_PKTHDR is passed to pf_test6");
-#endif /* DIAGNOSTIC */
-
-	if (m->m_pkthdr.pf.flags & PF_TAG_GENERATED)
-		return (PF_PASS);
-
-	if (m->m_pkthdr.pf.flags & PF_TAG_DIVERTED_PACKET)
-		return (PF_PASS);
-
-	if (m->m_pkthdr.pf.flags & PF_TAG_REFRAGMENTED) {
-		m->m_pkthdr.pf.flags &= ~PF_TAG_REFRAGMENTED;
-		return (PF_PASS);
-	}
-
-	if (pf_setup_pdesc(AF_INET6, dir, &pd, m0, &action, &reason, kif, &a,
-	    &r, &ruleset, &off, &hdrlen) == -1) {
-		if (action == PF_PASS)
-			return (PF_PASS);
-		m = *m0;
-		pd.pflog |= PF_LOG_FORCE;
-		goto done;
-	}
-	pd.eh = eh;
-	m = *m0;	/* pf_setup_pdesc -> pf_normalize messes with m0 */
-
-	switch (pd.proto) {
-
-	case IPPROTO_TCP: {
-		if ((pd.hdr.tcp->th_flags & TH_ACK) && pd.p_len == 0)
-			pqid = 1;
-		action = pf_normalize_tcp(dir, m, off, &pd);
-		if (action == PF_DROP)
+		if (af == AF_INET) {
+			action = PF_DROP;
+			DPFPRINTF(LOG_NOTICE,
+			    "dropping IPv4 packet with ICMPv6 payload");
 			goto done;
-		action = pf_test_state_tcp(&s, dir, kif, m, off, &pd,
-		    &reason);
-		if (action == PF_PASS) {
-#if NPFSYNC > 0
-			pfsync_update_state(s);
-#endif /* NPFSYNC */
-			r = s->rule.ptr;
-			a = s->anchor.ptr;
-			pd.pflog |= s->log;
-		} else if (s == NULL)
-			action = pf_test_rule(&r, &s, dir, kif,
-			    m, off, &pd, &a, &ruleset, hdrlen);
-
-		if (s) {
-			if (s->max_mss)
-				pf_normalize_mss(m, off, &pd, s->max_mss);
-		} else if (r->max_mss)
-			pf_normalize_mss(m, off, &pd, r->max_mss);
-
-		break;
-	}
-
-	case IPPROTO_UDP: {
-		action = pf_test_state_udp(&s, dir, kif, m, off, &pd);
-		if (action == PF_PASS) {
-#if NPFSYNC > 0
-			pfsync_update_state(s);
-#endif /* NPFSYNC */
-			r = s->rule.ptr;
-			a = s->anchor.ptr;
-			pd.pflog |= s->log;
-		} else if (s == NULL)
-			action = pf_test_rule(&r, &s, dir, kif,
-			    m, off, &pd, &a, &ruleset, hdrlen);
-		break;
-	}
-
-	case IPPROTO_ICMP: {
-		action = PF_DROP;
-		DPFPRINTF(LOG_NOTICE,
-		    "dropping IPv6 packet with ICMPv4 payload");
-		goto done;
-	}
-
-	case IPPROTO_ICMPV6: {
+		}
 		action = pf_test_state_icmp(&s, dir, kif, m, off, &pd,
 		    &reason);
 		if (action == PF_PASS) {
@@ -6200,14 +5966,14 @@ pf_test6(int fwdir, struct ifnet *ifp, struct mbuf **m0,
 done:
 	if (action != PF_DROP) {
 		if (s) {
-			/* handle dangerous IPv6 extension headers. */
+			/* The non-state case is handled in pf_test_rule() */
 			if (action == PF_PASS && pd.rh_cnt &&
 			    !(s->state_flags & PFSTATE_ALLOWOPTS)) {
 				action = PF_DROP;
 				REASON_SET(&reason, PFRES_IPOPTIONS);
 				pd.pflog |= PF_LOG_FORCE;
 				DPFPRINTF(LOG_NOTICE, "dropping packet with "
-				    "dangerous v6 headers");
+				    "ip/ipv6 options in pf_test()");
 			}
 
 			pf_scrub(m, s->state_flags, pd.af, s->min_ttl,
@@ -6233,13 +5999,20 @@ done:
 #ifdef ALTQ
 	if (action == PF_PASS && qid) {
 		m->m_pkthdr.pf.qid = qid;
-		m->m_pkthdr.pf.hdr = mtod(m, caddr_t); /* add hints for ecn */
+		m->m_pkthdr.pf.hdr = mtod(m, caddr_t);	/* hints for ecn */
 	}
 #endif /* ALTQ */
 
-	if (pd.destchg &&
-	    IN6_IS_ADDR_LOOPBACK(&pd.dst->v6))
-		m->m_pkthdr.pf.flags |= PF_TAG_TRANSLATE_LOCALHOST;
+	/*
+	 * connections redirected to loopback should not match sockets
+	 * bound specifically to loopback due to security implications,
+	 * see tcp_input() and in_pcblookup_listen().
+	 */
+	if (pd.destchg)
+		if ((af == AF_INET && (ntohl(pd.dst->v4.s_addr) >>
+		    IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) || (af == AF_INET6 &&
+		    IN6_IS_ADDR_LOOPBACK(&pd.dst->v6)))
+			m->m_pkthdr.pf.flags |= PF_TAG_TRANSLATE_LOCALHOST;
 	/* We need to redo the route lookup on outgoing routes. */
 	if (pd.destchg && dir == PF_OUT)
 		m->m_pkthdr.pf.flags |= PF_TAG_REROUTE;
@@ -6251,7 +6024,7 @@ done:
 			m->m_pkthdr.pf.flags |= PF_TAG_DIVERTED;
 			divert->port = r->divert.port;
 			divert->rdomain = pd.rdomain;
-			divert->addr.ipv6 = r->divert.addr.v6;
+			divert->addr = r->divert.addr;
 		}
 	}
 
@@ -6287,25 +6060,33 @@ done:
 		action = PF_PASS;
 		break;
 	case PF_DIVERT:
-		divert6_packet(m, dir);
+		if (af == AF_INET)
+			divert_packet(m, dir);
+		if (af == AF_INET6)
+			divert6_packet(m, dir);
 		*m0 = NULL;
 		action = PF_PASS;
 		break;
 	default:
-		/* pf_route6 can free the mbuf causing *m0 to become NULL */
-		if (r->rt)
-			pf_route6(m0, r, dir, kif->pfik_ifp, s);
+		/* pf_route can free the mbuf causing *m0 to become NULL */
+		if (r->rt) {
+			if (af == AF_INET)
+				pf_route(m0, r, dir, kif->pfik_ifp, s);
+			if (af == AF_INET6)
+				pf_route6(m0, r, dir, kif->pfik_ifp, s);
+		}
 		break;
 	}
 
 	/* if reassembled packet passed, create new fragments */
-	if (pf_status.reass && action == PF_PASS && *m0 && fwdir == PF_FWD &&
-	    (mtag = m_tag_find(m, PACKET_TAG_PF_REASSEMBLED, NULL)) != NULL)
-		action = pf_refragment6(m0, mtag, fwdir);
+	if (pf_status.reass && action == PF_PASS && *m0 && fwdir == PF_FWD) {
+		struct m_tag	*mtag;
+		if ((mtag = m_tag_find(m, PACKET_TAG_PF_REASSEMBLED, NULL)))
+			action = pf_refragment6(m0, mtag, fwdir);
+	}
 
 	return (action);
 }
-#endif /* INET6 */
 
 int
 pf_check_congestion(struct ifqueue *ifq)
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 3180d57772d..2a6e50ccefc 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar.h,v 1.335 2011/07/03 23:37:55 zinke Exp $ */
+/*	$OpenBSD: pfvar.h,v 1.336 2011/07/04 06:54:49 claudio Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1451,10 +1451,7 @@ struct pf_tagname {
 };
 
 struct pf_divert {
-	union {
-		struct in_addr	ipv4;
-		struct in6_addr	ipv6;
-	}		addr;
+	struct pf_addr	addr;
 	u_int16_t	port;
 	u_int16_t	rdomain;
 };
@@ -1762,12 +1759,10 @@ int				 pf_setup_pdesc(sa_family_t, int,
 				    struct pf_rule **, struct pf_rule **,
 				    struct pf_ruleset **, int *, int *);
 
-#ifdef INET
-int	pf_test(int, struct ifnet *, struct mbuf **, struct ether_header *);
-#endif /* INET */
+int	pf_test(sa_family_t, int, struct ifnet *, struct mbuf **,
+	    struct ether_header *);
 
 #ifdef INET6
-int	pf_test6(int, struct ifnet *, struct mbuf **, struct ether_header *);
 void	pf_poolmask(struct pf_addr *, struct pf_addr*,
 	    struct pf_addr *, struct pf_addr *, u_int8_t);
 void	pf_addr_inc(struct pf_addr *, sa_family_t);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 1b90198ee00..46c7db3d609 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.121 2011/05/29 13:22:53 claudio Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.122 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -1025,10 +1025,10 @@ in_pcblookup_listen(struct inpcbtable *table, struct in_addr laddr,
 #if NPF > 0
 	if (m && m->m_pkthdr.pf.flags & PF_TAG_DIVERTED) {
 		struct pf_divert *divert;
-		/* XXX rdomain */
+
 		if ((divert = pf_find_divert(m)) == NULL)
 			return (NULL);
-		key1 = key2 = &divert->addr.ipv4;
+		key1 = key2 = &divert->addr.v4;
 		lport = divert->port;
 	} else
 #endif
@@ -1100,7 +1100,7 @@ in6_pcblookup_listen(struct inpcbtable *table, struct in6_addr *laddr,
 
 		if ((divert = pf_find_divert(m)) == NULL)
 			return (NULL);
-		key1 = key2 = &divert->addr.ipv6;
+		key1 = key2 = &divert->addr.v6;
 		lport = divert->port;
 	} else
 #endif
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 812d650c449..f3c6555b9cb 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.192 2011/06/15 09:11:01 mikeb Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.193 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -367,7 +367,7 @@ ipv4_input(m)
 	 * Packet filter
 	 */
 	pfrdr = ip->ip_dst.s_addr;
-	if (pf_test(PF_IN, m->m_pkthdr.rcvif, &m, NULL) != PF_PASS)
+	if (pf_test(AF_INET, PF_IN, m->m_pkthdr.rcvif, &m, NULL) != PF_PASS)
 		goto bad;
 	if (m == NULL)
 		return;
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index d8bdd6ee422..cb47dd61add 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_output.c,v 1.222 2011/06/15 09:11:01 mikeb Exp $	*/
+/*	$OpenBSD: ip_output.c,v 1.223 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $	*/
 
 /*
@@ -605,7 +605,7 @@ sendit:
 #if NPF > 0
 		if ((encif = enc_getif(tdb->tdb_rdomain,
 		    tdb->tdb_tap)) == NULL ||
-		    pf_test(PF_OUT, encif, &m, NULL) != PF_PASS) {
+		    pf_test(AF_INET, PF_OUT, encif, &m, NULL) != PF_PASS) {
 			error = EACCES;
 			splx(s);
 			m_freem(m);
@@ -704,7 +704,7 @@ sendit:
 	 * Packet filter
 	 */
 #if NPF > 0
-	if (pf_test(PF_OUT, ifp, &m, NULL) != PF_PASS) {
+	if (pf_test(AF_INET, PF_OUT, ifp, &m, NULL) != PF_PASS) {
 		error = EHOSTUNREACH;
 		m_freem(m);
 		goto done;
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 9e2797aac3e..56d251a0bca 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip.c,v 1.58 2011/05/13 14:31:16 oga Exp $	*/
+/*	$OpenBSD: raw_ip.c,v 1.59 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $	*/
 
 /*
@@ -147,7 +147,7 @@ rip_input(struct mbuf *m, ...)
 			/* XXX rdomain support */
 			if ((divert = pf_find_divert(m)) == NULL)
 				continue;
-			if (inp->inp_laddr.s_addr != divert->addr.ipv4.s_addr)
+			if (inp->inp_laddr.s_addr != divert->addr.v4.s_addr)
 				continue;
 		} else
 #endif
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 5861782b5b9..4045cc1d6a1 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_forward.c,v 1.52 2011/03/24 20:09:45 bluhm Exp $	*/
+/*	$OpenBSD: ip6_forward.c,v 1.53 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $	*/
 
 /*
@@ -351,7 +351,7 @@ reroute:
 #if NPF > 0
 		if ((encif = enc_getif(tdb->tdb_rdomain,
 		    tdb->tdb_tap)) == NULL ||
-		    pf_test6(PF_FWD, encif, &m, NULL) != PF_PASS) {
+		    pf_test(AF_INET6, PF_FWD, encif, &m, NULL) != PF_PASS) {
 			splx(s);
 			error = EHOSTUNREACH;
 			m_freem(m);
@@ -464,7 +464,7 @@ reroute:
 		ip6->ip6_dst.s6_addr16[1] = 0;
 
 #if NPF > 0 
-	if (pf_test6(PF_FWD, rt->rt_ifp, &m, NULL) != PF_PASS) {
+	if (pf_test(AF_INET6, PF_FWD, rt->rt_ifp, &m, NULL) != PF_PASS) {
 		m_freem(m);
 		goto senderr;
 	}
@@ -484,7 +484,7 @@ reroute:
 	}
 #endif 
 
-	/* Check the size after pf_test6 to give pf a chance to refragment. */
+	/* Check the size after pf_test to give pf a chance to refragment. */
 	if (m->m_pkthdr.len > IN6_LINKMTU(rt->rt_ifp)) {
 		in6_ifstat_inc(rt->rt_ifp, ifs6_in_toobig);
 		if (mcopy) {
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 58655c2c51c..f7ea8494b10 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.99 2011/04/03 13:56:05 stsp Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.100 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -332,7 +332,7 @@ ip6_input(struct mbuf *m)
          * Packet filter
          */
 	odst = ip6->ip6_dst;
-	if (pf_test6(PF_IN, m->m_pkthdr.rcvif, &m, NULL) != PF_PASS)
+	if (pf_test(AF_INET6, PF_IN, m->m_pkthdr.rcvif, &m, NULL) != PF_PASS)
 		goto bad;
 	if (m == NULL)
 		return;
@@ -729,7 +729,7 @@ ip6_input(struct mbuf *m)
 	m_freem(m);
 }
 
-/* scan packet for RH0 routing header. Mostly stolen from pf.c:pf_test6() */
+/* scan packet for RH0 routing header. Mostly stolen from pf.c:pf_test() */
 int
 ip6_check_rh0hdr(struct mbuf *m)
 {
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 03ff8f21290..b4f7ff7a35f 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.121 2011/05/02 22:17:28 chl Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.122 2011/07/04 06:54:49 claudio Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -522,7 +522,7 @@ reroute:
 #if NPF > 0
 		if ((encif = enc_getif(tdb->tdb_rdomain,
 		    tdb->tdb_tap)) == NULL ||
-		    pf_test6(PF_OUT, encif, &m, NULL) != PF_PASS) {
+		    pf_test(AF_INET6, PF_OUT, encif, &m, NULL) != PF_PASS) {
 			splx(s);
 			error = EHOSTUNREACH;
 			m_freem(m);
@@ -796,7 +796,7 @@ reroute:
 	}
 
 #if NPF > 0
-	if (pf_test6(PF_OUT, ifp, &m, NULL) != PF_PASS) {
+	if (pf_test(AF_INET6, PF_OUT, ifp, &m, NULL) != PF_PASS) {
 		error = EHOSTUNREACH;
 		m_freem(m);
 		goto done;