Date: Wed, 16 Aug 2006 22:34:38 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 104309 for review Message-ID: <200608162234.k7GMYcBi085862@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104309 Change 104309 by imp@imp_paco-paco on 2006/08/16 22:34:02 IFC @104305 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/arm/src/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/arm/src/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/todo#1 branch .. //depot/projects/arm/src/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/contrib/mm/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/Makefile#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/arm/src/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/connect.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/arm/src/sbin/dump/dump.8#2 integrate .. //depot/projects/arm/src/sbin/dump/main.c#2 integrate .. //depot/projects/arm/src/sbin/ipf/libipf/Makefile#2 integrate .. //depot/projects/arm/src/sbin/ping/ping.c#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/arm/src/share/man/man4/ata.4#2 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/arm/src/share/man/man7/release.7#2 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/arm/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/arm/src/sys/arm/arm/mem.c#4 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/conf/files#43 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#14 integrate .. //depot/projects/arm/src/sys/conf/files.i386#17 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#11 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#12 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#23 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#9 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#10 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#9 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_proto.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_syscall.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysent.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#14 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/arm/src/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#8 integrate .. //depot/projects/arm/src/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/arm/src/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#14 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#16 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/arm/src/sys/modules/if_ef/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/if_ppp/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/sound/sound/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#16 integrate .. //depot/projects/arm/src/sys/sys/dirent.h#2 integrate .. //depot/projects/arm/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/arm/src/sys/sys/imgact.h#4 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/arm/src/sys/sys/sx.h#5 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#14 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#14 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#6 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#15 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/arm/src/usr.sbin/named/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/arm/src/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/arm/src/usr.sbin/yppush/yppush_main.c#2 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.46 2006/08/11 22:02:16 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2918,6 +2918,14 @@ OLD_FILES+=usr/libdata/msdosfs/iso72dos OLD_FILES+=usr/libdata/msdosfs/koi2dos OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade OLD_LIBS+=lib/libcrypto.so.4 ==== //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#2 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i<NF;i++){print $$i;}}' - | sort -u -CC=gcc -Wall -Wuninitialized -Wstrict-prototypes -O +CC=gcc -Wall -Wuninitialized -Wstrict-prototypes -O -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare -Wno-traditional -Werror #UFLAGS=-fprofile-arcs -ftest-coverage CFLAGS=-g -I$(TOP) # @@ -17,7 +18,7 @@ DEVFS!=/usr/bin/lsvfs 2>&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/arm/src/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/arm/src/contrib/ipfilter/Makefile#2 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/arm/src/contrib/ipfilter/bpf_filter.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include <sys/param.h> @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we + * assume that BPF_MAXINSNS is < the maximum size + * of a u_int, so that i + 1 doesn't overflow. + */ + from = i + 1; + switch (BPF_OP(p->code)) { + case BPF_JA: + if (from + p->k < from || from + p->k >= len) + return 0; + break; + case BPF_JEQ: + case BPF_JGT: + case BPF_JGE: + case BPF_JSET: + if (from + p->jt >= len || from + p->jf >= len) + return 0; + break; + default: return 0; + } + break; + case BPF_RET: + break; + case BPF_MISC: + break; + default: + return 0; } - /* - * Check that memory operations use valid addresses. - */ - if ((BPF_CLASS(p->code) == BPF_ST || - (BPF_CLASS(p->code) == BPF_LD && - (p->code & 0xe0) == BPF_MEM)) && - (p->k >= BPF_MEMWORDS || p->k < 0)) - return 0; - /* - * Check for constant division by 0. - */ - if (p->code == (BPF_ALU|BPF_DIV|BPF_K) && p->k == 0) - return 0; } return BPF_CLASS(f[len - 1].code) == BPF_RET; } ==== //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.4 2006/08/16 12:23:00 guido Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.9 2005/01/08 14:22:18 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.11 2006/03/25 11:15:30 darrenr Exp $"; #endif #ifndef SOLARIS @@ -138,7 +138,7 @@ #include "md5.h" -#if !defined(__osf__) +#if !defined(__osf__) && !defined(__linux__) extern struct protosw inetsw[]; #endif @@ -718,13 +718,45 @@ { struct ifnet *ifp = fdp->fd_ifp; ip_t *ip = fin->fin_ip; + int error = 0; + frentry_t *fr; + void *sifp; if (!ifp) return 0; /* no routing table out here */ - ip->ip_len = htons((u_short)ip->ip_len); - ip->ip_off = htons((u_short)(ip->ip_off | IP_MF)); + fr = fin->fin_fr; ip->ip_sum = 0; + + if (fin->fin_out == 0) { + sifp = fin->fin_ifp; + fin->fin_ifp = ifp; + fin->fin_out = 1; + (void) fr_acctpkt(fin, NULL); + fin->fin_fr = NULL; + if (!fr || !(fr->fr_flags & FR_RETMASK)) { + u_32_t pass; + + (void) fr_checkstate(fin, &pass); + } + + switch (fr_checknatout(fin, NULL)) + { + case 0 : + break; + case 1 : + ip->ip_sum = 0; + break; + case -1 : + error = -1; + goto done; + break; + } + + fin->fin_ifp = sifp; + fin->fin_out = 0; + } + #if defined(__sgi) && (IRIX < 60500) (*ifp->if_output)(ifp, (void *)ip, NULL); # if TRU64 >= 1885 @@ -733,7 +765,8 @@ (*ifp->if_output)(ifp, (void *)m, NULL, 0); # endif #endif - return 0; +done: + return error; } ==== //depot/projects/arm/src/contrib/ipfilter/ipf.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipf.h,v 1.3 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipf.h,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * Copyright (C) 1993-2001, 2003 by Darren Reed. @@ -6,7 +6,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ipf.h 1.12 6/5/96 - * $Id: ipf.h,v 2.71.2.7 2005/06/12 07:18:31 darrenr Exp $ + * $Id: ipf.h,v 2.71.2.8 2005/12/30 07:03:21 darrenr Exp $ */ #ifndef __IPF_H__ @@ -184,7 +184,6 @@ extern int addicmp __P((char ***, struct frentry *, int)); extern int addipopt __P((char *, struct ipopt_names *, int, char *)); extern int addkeep __P((char ***, struct frentry *, int)); -extern int bcopywrap __P((void *, void *, size_t)); extern void binprint __P((void *, size_t)); extern void initparse __P((void)); extern u_32_t buildopts __P((char *, char *, int)); ==== //depot/projects/arm/src/contrib/ipfilter/iplang/iplang_y.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.7 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.8 2006/08/16 12:23:01 guido Exp $ */ %{ /* @@ -6,8 +6,8 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * Id: iplang_y.y,v 2.9.2.2 2004/12/09 19:41:10 darrenr Exp - * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.7 2005/12/30 11:52:23 guido Exp $ + * Id: iplang_y.y,v 2.9.2.4 2006/03/17 12:11:29 darrenr Exp $ + * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.8 2006/08/16 12:23:01 guido Exp $ */ #include <stdio.h> @@ -1649,7 +1649,7 @@ for (sto = toipopts; sto->sto_st; sto++) if (sto->sto_st == state) break; - if (!sto || !sto->sto_st) { + if (!sto->sto_st) { fprintf(stderr, "No mapping for state %d to IP option\n", state); return; ==== //depot/projects/arm/src/contrib/ipfilter/ipmon.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.3 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -6,7 +6,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_fil.h 1.35 6/5/96 - * $Id: ipmon.h,v 2.8 2003/07/25 22:16:20 darrenr Exp $ + * $Id: ipmon.h,v 2.8.2.1 2006/03/21 16:13:31 darrenr Exp $ */ @@ -94,3 +94,4 @@ extern void dumphex __P((FILE *, int, char *, int)); extern int check_action __P((char *, char *, int, int)); extern char *getword __P((int)); +extern int fac_findname __P((char *)); ==== //depot/projects/arm/src/contrib/ipfilter/ipsd/sbpf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.3 2006/08/16 12:23:01 guido Exp $ */ /* * (C)opyright 1995-1998 Darren Reed. (from tcplog) @@ -11,6 +11,9 @@ #include <ctype.h> #include <signal.h> #include <errno.h> +#ifdef __NetBSD__ +# include <paths.h> +#endif #include <sys/types.h> #include <sys/param.h> #include <sys/mbuf.h> @@ -123,8 +126,18 @@ struct bpf_version bv; struct timeval to; struct ifreq ifr; +#ifdef _PATH_BPF + char *bpfname = _PATH_BPF; + int fd; + + if ((fd = open(bpfname, O_RDWR)) < 0) + { + fprintf(stderr, "no bpf devices available as /dev/bpfxx\n"); + return -1; + } +#else char bpfname[16]; - int fd, i; + int fd = -1, i; for (i = 0; i < 16; i++) { @@ -137,6 +150,7 @@ fprintf(stderr, "no bpf devices available as /dev/bpfxx\n"); return -1; } +#endif if (ioctl(fd, BIOCVERSION, (caddr_t)&bv) < 0) { ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/ipsend.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.13 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.14 2006/08/16 12:23:01 guido Exp $ */ /* * ipsend.c (C) 1995-1998 Darren Reed * @@ -6,7 +6,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipsend.c,v 2.8.2.2 2004/11/13 16:50:10 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipsend.c,v 2.8.2.3 2006/03/17 13:45:34 darrenr Exp $"; #endif #include <sys/param.h> #include <sys/types.h> @@ -155,6 +155,8 @@ int wfd; wfd = initdevice(dev, 5); + if (wfd == -1) + return -1; return send_packet(wfd, mtu, ip, gwip); } ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.11 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.12 2006/08/16 12:23:01 guido Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. @@ -8,10 +8,18 @@ */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.4 2005/06/12 07:18:39 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.7 2006/03/21 16:10:55 darrenr Exp $"; #endif #include <sys/param.h> #include <sys/types.h> +#if defined(__NetBSD__) && defined(__vax__) +/* + * XXX need to declare boolean_t for _KERNEL <sys/files.h> + * which ends up including <sys/device.h> for vax. See PR#32907 + * for further details. + */ +typedef int boolean_t; +#endif #include <sys/time.h> #if !defined(__osf__) # define _KERNEL @@ -136,7 +144,10 @@ u->uh_ulen = htons(sizeof(*u) + 4); ip->ip_len = sizeof(*ip) + ntohs(u->uh_ulen); len = ip->ip_len; + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -470,11 +481,14 @@ int nfd; u_char *s; - s = (u_char *)(ip + 1); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; IP_HL_A(ip, 6); ip->ip_len = IP_HL(ip) << 2; + s = (u_char *)(ip + 1); s[IPOPT_OPTVAL] = IPOPT_NOP; s++; if (!ptest || (ptest == 1)) { @@ -574,7 +588,10 @@ ip->ip_sum = 0; ip->ip_len = sizeof(*ip) + sizeof(*icp); icp = (struct icmp *)((char *)ip + (IP_HL(ip) << 2)); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -773,7 +790,10 @@ u->uh_sport = htons(1); u->uh_dport = htons(1); u->uh_ulen = htons(sizeof(*u) + 4); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -936,7 +956,10 @@ t->th_seq = htonl(1); t->th_ack = 0; ip->ip_len = sizeof(ip_t) + sizeof(tcphdr_t); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -1281,6 +1304,9 @@ u->uh_sum = 0; nfd = initdevice(dev, 1); + if (nfd == -1) + return; + u->uh_ulen = htons(7168); printf("6. Exhaustive mbuf test.\n"); @@ -1350,6 +1376,9 @@ u_char *s; nfd = initdevice(dev, 1); + if (nfd == -1) + return; + pip = (ip_t *)tbuf; srand(time(NULL) ^ (getpid() * getppid())); ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/lsock.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.3 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * lsock.c (C) 1995-1998 Darren Reed @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)lsock.c 1.2 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: lsock.c,v 2.3 2001/06/09 17:09:26 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: lsock.c,v 2.3.4.1 2006/03/17 13:45:34 darrenr Exp $"; #endif #include <stdio.h> #include <unistd.h> @@ -227,6 +227,8 @@ ti->ti_sport = lsin.sin_port; printf("sport %d\n", ntohs(lsin.sin_port)); nfd = initdevice(dev, 0); + if (nfd == -1) + return -1; if (!(s = find_tcp(fd, ti))) return -1; ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/resend.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.3 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * resend.c (C) 1995-1998 Darren Reed @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)resend.c 1.3 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: resend.c,v 2.8 2004/01/08 13:34:31 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: resend.c,v 2.8.2.2 2006/03/17 13:45:34 darrenr Exp $"; #endif #include <sys/param.h> #include <sys/types.h> @@ -81,6 +81,9 @@ ip_t *ip; int fd, wfd = initdevice(dev, 5), len, i; + if (wfd == -1) + return -1; + if (datain) fd = (*r->r_open)(datain); else @@ -101,6 +104,7 @@ if (gwip.s_addr && (arp((char *)&gwip, dhost) == -1)) { perror("arp"); + free(eh); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608162234.k7GMYcBi085862>