1c1
< /* $FreeBSD: head/sys/netinet6/ip6_input.c 126489 2004-03-02 16:01:27Z ume $ */
---
> /* $FreeBSD: head/sys/netinet6/ip6_input.c 126508 2004-03-02 20:29:55Z mlaier $ */
346,362d345
< #ifdef PFIL_HOOKS
< /*
< * Run through list of hooks for input packets.
< *
< * NB: Beware of the destination address changing
< * (e.g. by NAT rewriting). When this happens,
< * tell ip6_forward to do the right thing.
< */
< odst = ip6->ip6_dst;
< if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif, PFIL_IN))
< return;
< if (m == NULL) /* consumed by filter */
< return;
< ip6 = mtod(m, struct ip6_hdr *);
< srcrt = !IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst);
< #endif /* PFIL_HOOKS */
<
366,380d348
< * Check with the firewall...
< */
< if (ip6_fw_enable && ip6_fw_chk_ptr) {
< u_short port = 0;
< /* If ipfw says divert, we have to just drop packet */
< /* use port as a dummy argument */
< if ((*ip6_fw_chk_ptr)(&ip6, NULL, &port, &m)) {
< m_freem(m);
< m = NULL;
< }
< if (!m)
< return;
< }
<
< /*
458a427
> #ifdef PFIL_HOOKS
459a429,459
> * Run through list of hooks for input packets.
> *
> * NB: Beware of the destination address changing
> * (e.g. by NAT rewriting). When this happens,
> * tell ip6_forward to do the right thing.
> */
> odst = ip6->ip6_dst;
> if (pfil_run_hooks(&inet6_pfil_hook, &m, m->m_pkthdr.rcvif, PFIL_IN))
> return;
> if (m == NULL) /* consumed by filter */
> return;
> ip6 = mtod(m, struct ip6_hdr *);
> srcrt = !IN6_ARE_ADDR_EQUAL(&odst, &ip6->ip6_dst);
> #endif /* PFIL_HOOKS */
>
> /*
> * Check with the firewall...
> */
> if (ip6_fw_enable && ip6_fw_chk_ptr) {
> u_short port = 0;
> /* If ipfw says divert, we have to just drop packet */
> /* use port as a dummy argument */
> if ((*ip6_fw_chk_ptr)(&ip6, NULL, &port, &m)) {
> m_freem(m);
> m = NULL;
> }
> if (!m)
> return;
> }
>
> /*