Date: Wed, 19 Jul 2000 13:32:13 -0700 From: Kent Stewart <kstewart@urx.com> To: Arjan de Vet <Arjan.deVet@adv.iae.nl> Cc: cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/sys/netinet fil.c ip_auth.c ip_fil.c ip_fil.hip_frag.c ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_rcmd_pxy.cip_state.c ip_state.h ipl.h Message-ID: <3976104D.E13F9C98@urx.com> References: <200007191438.HAA34890@freefall.freebsd.org> <20000719201244.EABEC22E3@adv.iae.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
Arjan de Vet wrote:
>
> In article <3975F60D.3B7FDAE8@urx.com> you write:
>
> >Ip_state.c and ip_nat.c are killing a 4.1-rc buildworld the error
> >message is
>
> [...]
>
> Although Darren tried to merge 3.4.8 into stable there are still a lot
> of differences between current and stable w.r.t. ipfilter.
>
> I've done
>
> cd /usr/src/contrib/ipfilter
> cvs update -rRELENG_4
> cvs update -jv3_3_8 -jv3-4-8
>
> and will see how far I get in resolving conflicts and updating
> sys/netinet.
In ip_nat.c:1574, the second argument is a zero. That is the only
usage of NAT_HASH... with 3 arguments. To change that
--- ip_nat.c.orig Wed Jul 19 13:28:00 2000
+++ ip_nat.c Wed Jul 19 13:28:29 2000
@@ -1571,7 +1571,7 @@
i = 32;
maskloop:
iph = in.s_addr & htonl(msk);
- hv = NAT_HASH_FN(iph, 0, ipf_rdrrules_sz);
+ hv = NAT_HASH_FN(iph, ipf_rdrrules_sz);
for (np = rdr_rules[hv]; np; np = np->in_rnext) {
if ((np->in_ifp && (np->in_ifp != ifp)) ||
(np->in_p && (np->in_p != ip->ip_p)) ||
Kent
--
Kent Stewart
Richland, WA
mailto:kbstew99@hotmail.com
http://kstewart.urx.com/kstewart/index.html
FreeBSD News http://daily.daemonnews.org/
Bomber dropping fire retardant in front of Hanford Wild fire.
http://kstewart.urx.com/kstewart/bomber.jpg
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3976104D.E13F9C98>