buildworld error (CVS july 4)

[David Wolfskill]

>Date: Sun, 4 Jul 2004 20:18:43 -0400 (EDT)
>From: jl at burghcom.com
>To: freebsd-stable at freebsd.org
>Subject: Re: buildworld error (CVS july 4)

>I cleaned my src tree and checked out a fresh src, same results. Buildworld goes
>fine. Buildkernel fails in contrib/ipfilter/netinet/ip_fil.c

Right.  In addition to Darren's commit at
http://docs.freebsd.org/cgi/getmsg.cgi?fetch=178440+0+current/cvs-src, I
found the following changes permitted my kernel to build & boot OK:

---------- %< snip!   ---------------------------------
Index: sys/contrib/ipfilter/netinet/fil.c
===================================================================
RCS file: /cvs/freebsd/src/sys/contrib/ipfilter/netinet/fil.c,v
retrieving revision 1.23.2.7
diff -u -r1.23.2.7 fil.c
--- sys/contrib/ipfilter/netinet/fil.c	4 Jul 2004 09:24:38 -0000	1.23.2.7
+++ sys/contrib/ipfilter/netinet/fil.c	5 Jul 2004 02:56:17 -0000
@@ -198,7 +198,7 @@
  * compact the IP header into a structure which contains just the info.
  * which is useful for comparing IP headers with.
  */
-int	fr_makefrip(hlen, ip, fin)
+void	fr_makefrip(hlen, ip, fin)
 int hlen;
 ip_t *ip;
 fr_info_t *fin;
@@ -1054,8 +1054,7 @@
 	changed = 0;
 	fin->fin_v = v;
 	fin->fin_ifp = ifp;
-	if (fr_makefrip(hlen, ip, fin) == -1)
-		return -1;
+	fr_makefrip(hlen, ip, fin);
 
 #ifdef _KERNEL
 # ifdef	USE_INET6
Index: sys/contrib/ipfilter/netinet/ip_fil.c
===================================================================
RCS file: /cvs/freebsd/src/sys/contrib/ipfilter/netinet/ip_fil.c,v
retrieving revision 1.25.2.7
diff -u -r1.25.2.7 ip_fil.c
--- sys/contrib/ipfilter/netinet/ip_fil.c	4 Jul 2004 09:24:38 -0000	1.25.2.7
+++ sys/contrib/ipfilter/netinet/ip_fil.c	5 Jul 2004 02:39:08 -0000
@@ -1322,10 +1322,9 @@
 	m->m_pkthdr.rcvif = NULL;
 # endif
 
-	if (fr_makefrip(hlen, ip, &frn) == 0)
-		error = ipfr_fastroute(m, mp, &frn, NULL);
-	else
-		error = EINVAL;
+	fr_makefrip(hlen, ip, &frn);
+
+	error = ipfr_fastroute(m, mp, &frn, NULL);
 	return error;
 }
 
---------- %< snip!   ---------------------------------

Caveat:  I do not actually use the code in question, so there could
still be a problem.  However, I followed the pattern from the rest of
the code that uses the fr_makefrip() function, so I believe it should be
correct.

Ref:

freebeast(4.10-S)[1] uname -a
FreeBSD freebeast.catwhisker.org 4.10-STABLE FreeBSD 4.10-STABLE #942: Sun Jul  4 19:59:40 PDT 2004     root at freebeast.catwhisker.org:/common/S1/obj/usr/src/sys/FREEBEAST  i386
freebeast(4.10-S)[2] 

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
I do not "unsubscribe" from email "services" to which I have not explicitly
subscribed.  Rather, I block spammers' access to SMTP servers I control,
and encourage others who are in a position to do so to do likewise.