Date: Sat, 24 Nov 2007 22:39:46 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 129473 for review Message-ID: <200711242239.lAOMdkaZ084837@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=129473 Change 129473 by jb@jb_freebsd1 on 2007/11/24 22:39:35 IF6 Affected files ... .. //depot/projects/dtrace6/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/BSD/ipfadm-rcd#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/BugReport#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/files.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/kinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/minstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/unkinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-2.2/unminstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-3/kinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-3/unkinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-4.0/kinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD-4.0/unkinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/conf.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/files.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/files.newconf.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/files.oldconf.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/filez.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/in_proto.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/ip_input.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/ip_output.c.diffs#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/kinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/minstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/unkinstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/FreeBSD/unminstall#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/INST.FreeBSD-2.2#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/INSTALL.FreeBSD#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/INSTALL.xBSD#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/IPF.KANJI#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/44arp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/arp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/ip.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/sdlpi.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/alist_free.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/alist_new.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/bcopywrap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/extras.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/genmask.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/gethost.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getifname.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getline.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getportproto.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/getsumd.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/hexdump.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/hostmask.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/hostname.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/hostnum.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipf_dotuning.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/kmemcpywrap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/kvatoname.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_file.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_http.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/load_url.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/loglevel.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/mutex_emul.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/nametokva.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/natparse.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ntomask.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/parse.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/portnum.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ports.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printhash.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printhash_live.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printhashdata.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printhashnode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printpacket6.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printpool.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printpool_live.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printpooldata.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printpoolnode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printproto.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printsbuf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printtqtable.c#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/printtunable.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ratoi.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/ratoui.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/resetlexer.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/rwlock_emul.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/tcpoptnames.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/to_interface.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/var.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/man/ipfstat.8#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/mlf_ipl.c#2 delete .. //depot/projects/dtrace6/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/f12#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/i12#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/i4#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ip2#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ipv6.1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ipv6.5#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n10#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n12#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n4#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n6#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n8#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/n9#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni10#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni11#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni12#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni13#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni14#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni15#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni16#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni2#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni23#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni3#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni4#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni5#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni6#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni7#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni8#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/ni9#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/p2#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/expected/p5#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/f13#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ip2.data#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ipv6.1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ipv6.5#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni13#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni14#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni16#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni2#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni23#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni3#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni4#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/ni5#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/input/p5#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/natipftest#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/ip2#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/ipv6.5#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/ni1.nat#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/ni23.ipf#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/ni23.nat#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/p5.ipf#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/regress/p5.pool#1 branch .. //depot/projects/dtrace6/src/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/test/vfycksum.pl#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipmon_y.y#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ippool.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ippool_y.y#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipscan_y.y#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/lex_var.h#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/dtrace6/src/contrib/ipfilter/tools/lexer.h#2 integrate .. //depot/projects/dtrace6/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/dtrace6/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/dtrace6/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/dtrace6/src/include/_ctype.h#3 integrate .. //depot/projects/dtrace6/src/include/ctype.h#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/big5.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/euc.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/gb18030.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/gb2312.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/gbk.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/mskanji.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/none.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/dtrace6/src/lib/libc/locale/utf8.c#3 integrate .. //depot/projects/dtrace6/src/lib/libsdp/search.c#2 integrate .. //depot/projects/dtrace6/src/sbin/ipf/ipf/Makefile#2 integrate .. //depot/projects/dtrace6/src/sbin/ipf/ipftest/Makefile#2 integrate .. //depot/projects/dtrace6/src/sbin/ipf/ipmon/Makefile#2 integrate .. //depot/projects/dtrace6/src/sbin/ipf/ipnat/Makefile#2 integrate .. //depot/projects/dtrace6/src/sbin/ipf/ippool/Makefile#2 integrate .. //depot/projects/dtrace6/src/sbin/ipf/libipf/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/dtrace6/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/dtrace6/src/sys/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/dtrace6/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/dtrace6/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/dtrace6/src/sys/sys/param.h#4 integrate .. //depot/projects/dtrace6/src/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate .. //depot/projects/dtrace6/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate Differences ... ==== //depot/projects/dtrace6/src/contrib/ipfilter/BSD/Makefile#2 (text+ko) ==== @@ -84,6 +84,11 @@ -ln -s ../tools . -ln -s ../tools .. +bpf.h: + echo '#define DEV_BPF 1' > bpf.h + +$(TOP)/ip_compat.h: bpf.h + machine: Makefile.kmod if [ -f Makefile.kmod ] ; then \ make -f Makefile.kmod depend MKUPDATE=no; \ @@ -137,7 +142,7 @@ fil_u.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_compat.h \ $(TOP)/opts.h $(TOP)/ip_rules.h - $(CC) $(CCARGS) $(EXTRA) $(IPFBPF) -D_RADIX_H_ -c $(TOP)/fil.c -o $@ + $(CC) $(CCARGS) $(EXTRA) $(IPFBPF) -c $(TOP)/fil.c -o $@ fil.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ipl.h \ $(TOP)/ip_rules.h @@ -447,14 +452,14 @@ ${RM} -f ../ipf ../ipnat ../ipmon ../ippool ../ipftest ${RM} -f ../ipscan ../ipsyncm ../ipsyncs ${RM} -f *.core *.o *.a ipt ipfstat ipf ipfstat ipftest ipmon - ${RM} -f if_ipl ipnat ipfrule.ko* ipf.kld* + ${RM} -f if_ipl ipnat ipfrule.ko* ipf.kld* ipfrule.kld* ${RM} -f vnode_if.h $(LKM) ioconf.h *.ko setdef1.c setdef0.c setdefs.h ${RM} -f ip_fil.c ipf_l.c ipf_y.c ipf_y.h ipf_l.h ${RM} -f ipscan ipscan_y.c ipscan_y.h ipscan_l.c ipscan_l.h ${RM} -f ippool ippool_y.c ippool_y.h ippool_l.c ippool_l.h ${RM} -f ipnat_y.c ipnat_y.h ipnat_l.c ipnat_l.h ${RM} -f ipmon_y.c ipmon_y.h ipmon_l.c ipmon_l.h - ${RM} -f ipsyncm ipsyncs ipfs ip_rules.c ip_rules.h + ${RM} -f ipsyncm ipsyncs ipfs ip_rules.c ip_rules.h bpf.h ${RM} -f *.da *.gcov *.bb *.bbg tools ${MAKE} -f Makefile.ipsend ${MFLAGS} clean @@ -480,13 +485,21 @@ cp if_ipl.o /lkm; \ fi -if [ -d /modules -a -f ipf.ko ] ; then \ - cp ipf.ko /modules; \ + if [ -f /modules/ipl.ko ] ; then \ + cp ipf.ko /modules/ipl.ko; \ + else \ + cp ipf.ko /modules; \ + fi \ fi -if [ -d /modules -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /modules; \ fi -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ - cp ipf.ko /boot/kernel; \ + if [ -f /boot/kernel/ipl.ko ] ; then \ + cp ipf.ko /boot/kernel/ipl.ko; \ + else \ + cp ipf.ko /boot/kernel; \ + fi \ fi -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /boot/kernel; \ @@ -514,6 +527,9 @@ $(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \ fi \ done + if [ -d /etc/rc.d ] ; then \ + $(INSTALL) -c -g wheel -m 755 -o root ../ipfadm-rcd $(SBINDEST)/ipfadm; \ + fi (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: ==== //depot/projects/dtrace6/src/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ==== @@ -32,11 +32,15 @@ fi if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then - echo "Please do a build of ipfilter and then run the following" - echo "command to build extra files:" - echo - echo "make ip_rules.c" - exit 1 + echo "Trying to build ip_rules.c and ip_rules.h" + make ip_rules.c + if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then + echo "Please do a build of ipfilter and then run the following" + echo "command to build extra files:" + echo + echo "make ip_rules.c" + exit 1 + fi fi echo -n "Installing " ==== //depot/projects/dtrace6/src/contrib/ipfilter/BugReport#2 (text+ko) ==== @@ -1,10 +1,12 @@ -IP Filter bug report form. --------------------------- -IP Filter Version: -Operating System Version: -Configuration: <LKM or compiled-into-kernel> +Please submit this information at SourceForge using this URL: +http://sourceforge.net/tracker/?func=add&group_id=169098&atid=849053 -Description of problem: +Please also send an email to darrenr@reed.wattle.id.au. -How to repeat: - +Some information that I generally find important: +-------------------------- +* IP Filter Version +* Operating System and its Version +* Configuration: (LKM or compiled-into-kernel) +* Description of problem +* How to repeat ==== //depot/projects/dtrace6/src/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -10,6 +10,266 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.28 - Release 16 October 2007 + +backout changes (B1) & (B2) as they've caused NAT entries to persist for +too long and possibly other side effects. + +Still need to compile in our own radix.c for Solaris as the one in S10U4 +has a different alignment of structure members (causes panic) + +keep state doesn't work with multicast/broadcast packets (makes UPnP easier) + +ippool -l may only lists every 2nd pool's contents + +4.1.27 - Released 29 September 2007 + +SunOS5/replace script does not deal with i386 systems that have the +i86/amd64 directory pair. + +make BSD/kupgrade try to build ip_rules.[ch] before complaining + +Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko + +Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs +to drive 32bit cc builds differently for sparc/i386 now. + +Update instructions for rebuilding FreeBSD kernels + +Make the target "freebsd" work for building ipfilter + +destroying NAT entries for blocked packets can lead to NAT table entry leak, +provide a counter of orphan'd NAT entries to track this problem. + +4.1.26 - Released 24 September 2007 + +Fix build problem for Solaris prior to S10U4 + +4.1.25 - Released 20 September 2007 + +stepping through structures with ioctls can lead to the wrong things +being free'd and panics + +if a NAT entry (such as an rdr) is created but the packet ends up being +blocked, tear down the NAT entry. + +fix fragment cache preventing keep state from functioning + +fix handling of \ to indicate a continued line in .conf files + +include port ranges in the allowed input for ipf when using "port = ()" + +only advance TCP state for packets on the leading edge of the window. (B1) + +using ipnat -l can lead to memory corruption in high stress situations + +track TCP sequence numbers with NAT so that it can do timeout advances +correctly inline with state + +ICMP checksums for some redirect'd packets are not adjusted correctly. + +IPv6 address components need to be explicitly cast to a 32bit pointer +boundary so that compilers don't try to access them as two 64bit +pieces (no guarantee is made that an Ipv6 address is on a 64bit +aligned address) + +filling up the ipauth packet queue can lead to no more packets being +processed. + +locking used to deref a nat entry causes a significant performance hit + +m_pulldown isn't properly handled, leading to possible panics with ICMPv6 +packets + +IPv6 fragment handling doesn't allow for "keep frag" to work + +build on Solaris10 Update4 with pfhooks in the kernel + +logging of Ipv6 packets with extension headers fix - Miroslaw Luc + +4.1.24 - Released 8 July 2007 + +patch from Stuart Remphrey to address recursive mutex lock with TCP state + +add hash table bucket stats display to ipnat -s + +give ASSERT some teeth for user compiles + +initialising ipf_global, ipf_frcache, ipf_mutex should all be done very +early on + +do some caddr_t cleanup, where possible + +fr_ref no longer tracks the number of children rules in a group for head rules + +make sure all BCOPY* have a value assigned to something + +fix possible use of icmp pointer after pullup makes it invalid + +resolve compile problems related to FreeBSD tree + +4.1.23 - Released 31 May 2007 + +NAT was not always correctly fixing ICMP headers for errors + +some TCP state steps when closing do not update timeouts, leading to +them being removed prematurely. (B2) + +fix compilation problems for netbsd 4.99 + +protect enumeration of lists in the kernel from callout interrupts on +BSD without locking + +fix various problems with IPv6 header checks: TCP/UDP checksum validation +was not being done, fragmentation header parsed dangerously and routing +header prevented others from being seen + +fix gcc 4.2 compiler warnings + +fix TCP/UDP checksum calculation for IPv6 + +fix reference after free'ing ipftoken memory + +4.1.22 - Released 13 May 2007 + +fix endless loop when flushing state/NAT by idle time + +4.1.21 - Released 12 May 2007 + +show the number of states created against a rule with "-v" for ipfstat + +fix build problems with FreeBSD + +make it possible to flush the state table by idle time and TCP state + +fix flushing out idle connections when state/NAT tables fill + +print out the TCP state population with ipfstat/ipnat + +stop creation of state table orphans via return-*/fastroute + +fix printing out of rule groups - they now only appear once + +4.1.20 - Released 30 April 2007 + +adjust TCP state numbers, making 11 closed (was 0) to better facilitate +detecting closing connections that we can wipe out when a SYN arrives +that matches the old + +make it compile on Solaris10 Update3 + +structures used for ipf command ioctls weren't being freed in timeout +fashion on solairs + +use NL_EXPIRE, not ISL_EXPIRE, for expiring NAT sessions + +adjust TCP timeout values and introduce a time-wait specifc timeout +to get a better TCP FSM emulation and one that can hopefully do a better +job of cleaning up in a speedy fashion than previous + +refactor the automatic flushing of TCP state entries when we fill up, +but use the same algorithm as before but now it hopefully works + +only 2 out of 4 interface names were being changed by ipfs when +interface renaming was being used for state entries + +add ipf_proxy_debug to ipf-T + +matching of last fragments that had a number of bytes that wasn't a +multiple of 8 failed + +some combinations of TCP flags are considered bad aren't picked up as such, +but these may be possible with T/TCP + +4.1.19 - Released 22 February 2007 + +Fix up compilation problems with NetBSD and Solaris. + +4.1.18 - Released 18 February 2007 + +fix compiling on Tru64 + +fix listing out filter rules with ipfstat (delete token at end of +the list and detect zero rule being returned.) + +fix extended flushing of NAT tables (was clearing out state tables) + +fix null-pointer deref in hash table lookup + +fix NAT and stateful filtering with to/reply-to on destination interface + +4.1.17 - Released 20 January 2007 + +make flushing pools that are still in use mark them for deletion and +have attempting to recreate them clear the delete flag + +walking through the NAT tables with ioctls caused lock recursion + +fix tracking TCP window scaling in the state code + +4.1.16 - Released 20 December 2006 + +allow rdr rules to only differ on the new port number + +when creating state entry orphans, leave them on the linked list but not +attached to the hash table and mark them visible as orphans in "ipfstat -sl" + +log state removed when unloading differently to allow visible cues + +return ipf ticks via SIOCGETGS for /dev/ipnat so "ipnat -l" can display ttl + +abort logging a packet if the mbuf pointer is null when ipflog is called + +Some NetBSD's have a selinfo.h instead of select.h + +SIOCIPFFL was using copyoutptr and should have been using bcopy for /dev/ipauth + +listing accounting rules using ioctl interface wasn't possible + +fix leakage of state entries due to packets not matching up with NAT + +improve ICMP error packet matching with state/NAT + +fix problems with parsing and printing "-" as an interface name in ipnat.conf + +4.1.15 - Released 03 November 2006 + +Add in automatic flushing of NAT, like state, table if it fills up too much + +Update comments in the code for NAT checksum adjustments + +Fix compiling on FreeBSD 5.4 and 6.0 + +prevent panics from read/write IOs trying to use uninitialised structures + +Newer NetBSD should use malloc() instead of MALLOC() in the kernel where +the size is not staticly defined + +Some gcc warning message cleanup from NetBSD + +Missing include for <sys/filio.h> on Solaris for poll work + +NetBSD now uses opt_ipfilter.h, not opt_ipfilter_log.h + +4.1.14 - Released 04 October 2006 + +rewrite checksum alteration for ICMP packets being NAT'd to use a sane +algorithm that can be understood...now it needs better comments + +fix 1 byte error in checksum validation perl script + +remove unused files in lib directory + +ipftest will say "bad-packet" if it has been freed rather than just "blocked" + +make it possible to load IP address pools from external files in ippool.conf + +update copyright messages in tools directory + +consolidate ioctl hanlding source code into fil.c + +make ipfstat, ippool, ipnat retrieve information via ioctls rather than /dev/kmem + 4.1.13 - Released 4 April 2006 fix bug where null pointers introduced by proxies could cause a crash @@ -39,6 +299,7 @@ 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 ==== //depot/projects/dtrace6/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.4.2.1 2006/08/24 07:37:02 guido Exp $ -# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.4.2.2 2007/11/18 11:03:17 darrenr Exp $ +# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -132,10 +132,7 @@ @echo "openbsd - compile for OpenBSD" @echo "freebsd20 - compile for FreeBSD 2.0, 2.1 or earlier" @echo "freebsd22 - compile for FreeBSD-2.2 or greater" - @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 "freebsd - compile for all other versions of FreeBSD" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -152,6 +149,7 @@ else echo test directory not present, sorry; fi include: + -mkdir -p net netinet if [ ! -f netinet/done ] ; then \ (cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \ (cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \ @@ -167,6 +165,9 @@ MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \ CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos +freebsd: + make freebsd`uname -r|cut -c1` + freebsd22: include make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)" -rm -f BSD/$(CPUDIR)/ioconf.h @@ -188,7 +189,7 @@ fi make freebsd20 -freebsd5 freebsd6: include +freebsd5 freebsd6 freebsd7: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ @@ -230,6 +231,15 @@ netbsd: include make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)" + @if [ ! -d /sys -o ! -d /sys/arch ] ; then \ + echo "*****************************************************"; \ + echo "* *"; \ + echo "* Please extract source code to create /sys and *";\ + echo "* /sys/arch and run 'config GENERIC' *"; \ + echo "* *"; \ + echo "*****************************************************"; \ + exit 1; \ + fi (cd BSD/$(CPUDIR); make build TOP=../.. $(MFLAGS) 'DLKM=-D_LKM' "ML=mln_ipl.c" LKMR= "MLR=mln_rule.o"; cd ..) (cd BSD/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. $(MFLAGS); cd ..) @@ -342,13 +352,9 @@ (cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..) sunos5 solaris2: null - (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..) + (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..) (cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..) -sunos5x86 solaris2x86: null - (cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..) - (cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..) - linux: include (cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..) (cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..) @@ -365,7 +371,7 @@ (cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install) install-sunos5: solaris null - (cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install) + (cd SunOS5; $(MAKE) TOP=.. install) install-aix: (cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..) ==== //depot/projects/dtrace6/src/contrib/ipfilter/bpf_filter.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.3.2.1 2006/08/24 07:37:02 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.3.2.2 2007/11/18 11:03:17 darrenr 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.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.3 2006/10/03 11:25:56 darrenr Exp $ (LBL)"; #endif #include <sys/param.h> @@ -195,7 +195,8 @@ register int k; int32 mem[BPF_MEMWORDS]; mb_t *m, *n; - int merr, len; + int merr = 0; /* XXX: GCC */ + int len; if (buflen == 0) { m = (mb_t *)p; ==== //depot/projects/dtrace6/src/contrib/ipfilter/ip_fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.3.2.1 2006/08/24 07:37:02 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.3.2.2 2007/11/18 11:03:17 darrenr 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.11 2006/03/25 11:15:30 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $"; #endif #ifndef SOLARIS @@ -64,7 +64,6 @@ #include <stdlib.h> #include <ctype.h> #include <fcntl.h> -#include <arpa/inet.h> #ifdef __hpux # define _NET_ROUTE_INCLUDED @@ -82,10 +81,12 @@ #include <sys/hashing.h> # endif #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(SOLARIS2) # include "radix_ipf.h" #endif -#include <net/route.h> +#ifndef __osf__ +# include <net/route.h> +#endif #include <netinet/in.h> #if !(defined(__sgi) && !defined(IFF_DRVRLOCK)) /* IRIX < 6 */ && \ !defined(__hpux) && !defined(linux) @@ -109,6 +110,7 @@ #include <netinet/ip_icmp.h> #include <unistd.h> #include <syslog.h> +#include <arpa/inet.h> #ifdef __hpux # undef _NET_ROUTE_INCLUDED #endif @@ -146,7 +148,6 @@ static struct ifnet **ifneta = NULL; static int nifs = 0; -static int frzerostats __P((caddr_t)); static void fr_setifpaddr __P((struct ifnet *, char *)); void init_ifp __P((void)); #if defined(__sgi) && (IRIX < 60500) @@ -169,37 +170,20 @@ #endif -int iplattach() +int ipfattach() { fr_running = 1; return 0; } -int ipldetach() +int ipfdetach() { fr_running = -1; return 0; } -static int frzerostats(data) -caddr_t data; -{ - friostat_t fio; - int error; - - fr_getstat(&fio); - error = copyoutptr(&fio, data, sizeof(fio)); - if (error) - return EFAULT; - - bzero((char *)frstats, sizeof(*frstats) * 2); - - return 0; -} - - /* * Filter ioctl interface. */ @@ -209,210 +193,20 @@ caddr_t data; int mode; { - int error = 0, unit = 0, tmp; - friostat_t fio; + int error = 0, unit = 0, uid; + SPL_INT(s); + uid = getuid(); unit = dev; SPL_NET(s); - if (unit == IPL_LOGNAT) { - if (fr_running > 0) - error = fr_nat_ioctl(data, cmd, mode); - else - error = EIO; + error = fr_ioctlswitch(unit, data, cmd, mode, uid, NULL); + if (error != -1) { SPL_X(s); return error; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711242239.lAOMdkaZ084837>