Only in ip_fil3.2.5/BSDOS3: OBJS diff -cr ip_fil3.2.4/HISTORY ip_fil3.2.5/HISTORY *** ip_fil3.2.4/HISTORY Thu Apr 9 00:31:24 1998 --- ip_fil3.2.5/HISTORY Sat May 9 01:14:29 1998 *************** *** 5,13 **** --- 5,30 ---- # Thanks to Craig Bishop of connect.com.au and Sun Microsystems for the # loan of a machine to work on a Solaris 2.x port of this software. # + # Thanks to BSDI for providing object files for BSD/OS 3.1 and the means + # to further support development of IP Filter under BSDI. + # # Thanks also to all those who have contributed patches and other code, # and especially those who have found the time to port IP Filter to new # platforms. + + 3.2.5 09/05/98 - Released + + BSD/OS 3.1 .o files added for the kernel. + + fix sequence # skew vs window size check. + + fix minimum ICMP header size check. + + remove references to Cybersource. + + fix my email address. + + remove ntohl in ipnat - Thomas Tornblom 3.2.4 09/04/98 - Released diff -cr ip_fil3.2.4/IMPORTANT ip_fil3.2.5/IMPORTANT *** ip_fil3.2.4/IMPORTANT Wed Dec 10 20:10:08 1997 --- ip_fil3.2.5/IMPORTANT Sat Apr 11 12:59:23 1998 *************** *** 42,46 **** DO NOT use the GNU make to build this package. Darren ! darrenr@cyber.com.au **************************************** --- 42,46 ---- DO NOT use the GNU make to build this package. Darren ! darrenr@pobox.com **************************************** diff -cr ip_fil3.2.4/INST.FreeBSD-2.2 ip_fil3.2.5/INST.FreeBSD-2.2 *** ip_fil3.2.4/INST.FreeBSD-2.2 Sat Feb 28 13:31:19 1998 --- ip_fil3.2.5/INST.FreeBSD-2.2 Sat Apr 11 12:59:23 1998 *************** *** 57,60 **** 6. install and reboot with the new kernel Darren Reed ! darrenr@cyber.com.au --- 57,60 ---- 6. install and reboot with the new kernel Darren Reed ! darrenr@pobox.com diff -cr ip_fil3.2.4/INSTALL.FreeBSD ip_fil3.2.5/INSTALL.FreeBSD *** ip_fil3.2.4/INSTALL.FreeBSD Sat Feb 28 13:31:19 1998 --- ip_fil3.2.5/INSTALL.FreeBSD Sat Apr 11 12:59:24 1998 *************** *** 46,49 **** 6. install and reboot with the new kernel Darren Reed ! darrenr@cyber.com.au --- 46,49 ---- 6. install and reboot with the new kernel Darren Reed ! darrenr@pobox.com diff -cr ip_fil3.2.4/INSTALL.NetBSD ip_fil3.2.5/INSTALL.NetBSD *** ip_fil3.2.4/INSTALL.NetBSD Sat Feb 28 13:31:33 1998 --- ip_fil3.2.5/INSTALL.NetBSD Sat Apr 11 12:59:25 1998 *************** *** 56,59 **** 6. install and reboot with the new kernel Darren Reed ! darrenr@cyber.com.au --- 56,59 ---- 6. install and reboot with the new kernel Darren Reed ! darrenr@pobox.com diff -cr ip_fil3.2.4/INSTALL.Sol2 ip_fil3.2.5/INSTALL.Sol2 *** ip_fil3.2.4/INSTALL.Sol2 Thu Nov 20 23:44:52 1997 --- ip_fil3.2.5/INSTALL.Sol2 Sat Apr 11 12:59:27 1998 *************** *** 24,27 **** for the configuration file here, using the installed binaries in /sbin. Darren Reed ! darrenr@cyber.com.au --- 24,27 ---- for the configuration file here, using the installed binaries in /sbin. Darren Reed ! darrenr@pobox.com diff -cr ip_fil3.2.4/INSTALL.SunOS ip_fil3.2.5/INSTALL.SunOS *** ip_fil3.2.4/INSTALL.SunOS Sat Feb 28 13:31:57 1998 --- ip_fil3.2.5/INSTALL.SunOS Sat Apr 11 12:59:28 1998 *************** *** 37,40 **** 4. Reboot using the new kernel Darren Reed ! darrenr@cyber.com.au --- 37,40 ---- 4. Reboot using the new kernel Darren Reed ! darrenr@pobox.com diff -cr ip_fil3.2.4/INSTALL.xBSD ip_fil3.2.5/INSTALL.xBSD *** ip_fil3.2.4/INSTALL.xBSD Sat Feb 28 13:31:58 1998 --- ip_fil3.2.5/INSTALL.xBSD Sat Apr 11 12:59:30 1998 *************** *** 41,44 **** 6. install and reboot with the new kernel Darren ! darrenr@cyber.com.au --- 41,44 ---- 6. install and reboot with the new kernel Darren ! darrenr@pobox.com diff -cr ip_fil3.2.4/README ip_fil3.2.5/README *** ip_fil3.2.4/README Sun Sep 21 17:59:39 1997 --- ip_fil3.2.5/README Sat Apr 11 12:59:31 1998 *************** *** 46,52 **** ------------- If you have a problem with IP Filter on your operating system, please email a copy of the file "BugReport" with the details of your setup as required ! and email to darrenr@cyber.com.au. Some general notes. ------------------- --- 46,52 ---- ------------- If you have a problem with IP Filter on your operating system, please email a copy of the file "BugReport" with the details of your setup as required ! and email to darrenr@pobox.com. Some general notes. ------------------- *************** *** 95,98 **** - BNF rule set for the filter rules Darren Reed ! darrenr@cyber.com.au --- 95,98 ---- - BNF rule set for the filter rules Darren Reed ! darrenr@pobox.com diff -cr ip_fil3.2.4/SunOS5/Makefile ip_fil3.2.5/SunOS5/Makefile *** ip_fil3.2.4/SunOS5/Makefile Thu Apr 9 00:08:54 1998 --- ip_fil3.2.5/SunOS5/Makefile Sat Apr 11 12:58:48 1998 *************** *** 13,19 **** # # For SunOS 5.x # ! PKGDIR=$(ROOT)/opt/CYBSipf PKGMAN=$(PKGDIR)/man PKGBIN=$(PKGDIR)/bin # --- 13,19 ---- # # For SunOS 5.x # ! PKGDIR=$(ROOT)/opt/ipf PKGMAN=$(PKGDIR)/man PKGBIN=$(PKGDIR)/bin # diff -cr ip_fil3.2.4/SunOS5/ipfboot ip_fil3.2.5/SunOS5/ipfboot *** ip_fil3.2.4/SunOS5/ipfboot Mon Oct 20 01:49:04 1997 --- ip_fil3.2.5/SunOS5/ipfboot Sat Apr 11 12:58:50 1998 *************** *** 1,9 **** #!/bin/sh id=`/usr/sbin/modinfo | grep ipf | awk ' { print $1 } ' -` pid=`ps -e | grep ipmon | awk ' { print $1 } ' -` ! PATH=${PATH}:/sbin:/opt/CYBSipf/bin ! IPFILCONF=/etc/opt/CYBSipf/ipf.conf ! IPNATCONF=/etc/opt/CYBSipf/ipnat.conf case "$1" in start) --- 1,9 ---- #!/bin/sh id=`/usr/sbin/modinfo | grep ipf | awk ' { print $1 } ' -` pid=`ps -e | grep ipmon | awk ' { print $1 } ' -` ! PATH=${PATH}:/sbin:/opt/ipf/bin ! IPFILCONF=/etc/opt/ipf/ipf.conf ! IPNATCONF=/etc/opt/ipf/ipnat.conf case "$1" in start) diff -cr ip_fil3.2.4/SunOS5/pkginfo ip_fil3.2.5/SunOS5/pkginfo *** ip_fil3.2.4/SunOS5/pkginfo Wed Dec 10 20:56:38 1997 --- ip_fil3.2.5/SunOS5/pkginfo Sat May 9 01:09:42 1998 *************** *** 2,18 **** BASEDIR=/ TZ=EST PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin ! PKG=CYBSipf NAME=IP Filter ARCH=sparc,i386 ! VERSION=3.2,REV=3 CATEGORY=system DESC=This package contains tools for building a firewall ! VENDOR=Cybersource ! HOTLINE=+61-3-9642-5997 ! EMAIL=darrenr@cyber.com.au VSTOCK= PSTAMP= ! PKGINST=CYBSipf ! PKGSAV=/var/sadm/pkg/CYBSipf/save INSTDATE= --- 2,18 ---- BASEDIR=/ TZ=EST PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin ! PKG=ipf NAME=IP Filter ARCH=sparc,i386 ! VERSION=3.2,REV=5 CATEGORY=system DESC=This package contains tools for building a firewall ! VENDOR=Darren Reed ! HOTLINE= ! EMAIL=darrenr@pobox.com VSTOCK= PSTAMP= ! PKGINST=ipf ! PKGSAV=/var/sadm/pkg/ipf/save INSTDATE= diff -cr ip_fil3.2.4/SunOS5/postinstall ip_fil3.2.5/SunOS5/postinstall *** ip_fil3.2.4/SunOS5/postinstall Sun Dec 28 12:30:31 1997 --- ip_fil3.2.5/SunOS5/postinstall Sat Apr 11 12:58:52 1998 *************** *** 17,23 **** fi /usr/sbin/devlinks /usr/ucb/ucblinks ! if [ ! -f /etc/opt/CYBSipf/ipf.conf ] ; then ! touch /etc/opt/CYBSipf/ipf.conf fi exit 0 --- 17,23 ---- fi /usr/sbin/devlinks /usr/ucb/ucblinks ! if [ ! -f /etc/opt/ipf/ipf.conf ] ; then ! touch /etc/opt/ipf/ipf.conf fi exit 0 diff -cr ip_fil3.2.4/SunOS5/prototype ip_fil3.2.5/SunOS5/prototype *** ip_fil3.2.4/SunOS5/prototype Thu Oct 16 00:49:10 1997 --- ip_fil3.2.5/SunOS5/prototype Sat Apr 11 12:58:54 1998 *************** *** 3,22 **** !default 0755 root root i postinstall d none /opt 775 root sys ! d none /opt/CYBSipf ! d none /opt/CYBSipf/man ! d none /opt/CYBSipf/man/man1 ! d none /opt/CYBSipf/man/man1m ! d none /opt/CYBSipf/man/man4 ! d none /opt/CYBSipf/man/man5 ! d none /opt/CYBSipf/man/man8 ! d none /opt/CYBSipf/bin ! f none /opt/CYBSipf/bin/ipftest=root/opt/CYBSipf/bin/ipftest ! f none /opt/CYBSipf/bin/ipmon=root/opt/CYBSipf/bin/ipmon ! f none /opt/CYBSipf/bin/ipsend=root/opt/CYBSipf/bin/ipsend ! f none /opt/CYBSipf/bin/ipresend=root/opt/CYBSipf/bin/ipresend ! f none /opt/CYBSipf/bin/mkfilters=root/opt/CYBSipf/bin/mkfilters ! d none /opt/CYBSipf/examples d none /usr 775 root sys d none /usr/include 775 root bin d none /usr/include/netinet 755 bin bin --- 3,22 ---- !default 0755 root root i postinstall d none /opt 775 root sys ! d none /opt/ipf ! d none /opt/ipf/man ! d none /opt/ipf/man/man1 ! d none /opt/ipf/man/man1m ! d none /opt/ipf/man/man4 ! d none /opt/ipf/man/man5 ! d none /opt/ipf/man/man8 ! d none /opt/ipf/bin ! f none /opt/ipf/bin/ipftest=root/opt/ipf/bin/ipftest ! f none /opt/ipf/bin/ipmon=root/opt/ipf/bin/ipmon ! f none /opt/ipf/bin/ipsend=root/opt/ipf/bin/ipsend ! f none /opt/ipf/bin/ipresend=root/opt/ipf/bin/ipresend ! f none /opt/ipf/bin/mkfilters=root/opt/ipf/bin/mkfilters ! d none /opt/ipf/examples d none /usr 775 root sys d none /usr/include 775 root bin d none /usr/include/netinet 755 bin bin *************** *** 33,51 **** d none /etc/rc2.d 775 root sys l none /etc/rc2.d/S65ipfboot=/etc/init.d/ipfboot d none /etc/opt 775 root sys ! d none /etc/opt/CYBSipf 755 root sys !default 0444 root root ! f none /opt/CYBSipf/man/man8/ipfstat.8=root/opt/CYBSipf/man/man8/ipfstat.8 ! f none /opt/CYBSipf/man/man8/ipmon.8=root/opt/CYBSipf/man/man8/ipmon.8 ! f none /opt/CYBSipf/man/man8/ipf.8=root/opt/CYBSipf/man/man8/ipf.8 ! f none /opt/CYBSipf/man/man1/ipnat.1=root/opt/CYBSipf/man/man1/ipnat.1 ! f none /opt/CYBSipf/man/man1/ipftest.1=root/opt/CYBSipf/man/man1/ipftest.1 ! f none /opt/CYBSipf/man/man1/mkfilters.1=root/opt/CYBSipf/man/man1/mkfilters.1 ! f none /opt/CYBSipf/man/man4/ipf.4=root/opt/CYBSipf/man/man4/ipf.4 ! f none /opt/CYBSipf/man/man4/ipl.4=root/opt/CYBSipf/man/man4/ipl.4 ! f none /opt/CYBSipf/man/man4/ipnat.4=root/opt/CYBSipf/man/man4/ipnat.4 ! f none /opt/CYBSipf/man/man5/ipf.5=root/opt/CYBSipf/man/man5/ipf.5 ! f none /opt/CYBSipf/man/man5/ipnat.5=root/opt/CYBSipf/man/man5/ipnat.5 f none /usr/kernel/drv/ipf.conf=root/usr/kernel/drv/ipf.conf f none /usr/include/netinet/ip_fil.h=root/usr/include/netinet/ip_fil.h f none /usr/include/netinet/ip_auth.h=root/usr/include/netinet/ip_auth.h --- 33,51 ---- d none /etc/rc2.d 775 root sys l none /etc/rc2.d/S65ipfboot=/etc/init.d/ipfboot d none /etc/opt 775 root sys ! d none /etc/opt/ipf 755 root sys !default 0444 root root ! f none /opt/ipf/man/man8/ipfstat.8=root/opt/ipf/man/man8/ipfstat.8 ! f none /opt/ipf/man/man8/ipmon.8=root/opt/ipf/man/man8/ipmon.8 ! f none /opt/ipf/man/man8/ipf.8=root/opt/ipf/man/man8/ipf.8 ! f none /opt/ipf/man/man1/ipnat.1=root/opt/ipf/man/man1/ipnat.1 ! f none /opt/ipf/man/man1/ipftest.1=root/opt/ipf/man/man1/ipftest.1 ! f none /opt/ipf/man/man1/mkfilters.1=root/opt/ipf/man/man1/mkfilters.1 ! f none /opt/ipf/man/man4/ipf.4=root/opt/ipf/man/man4/ipf.4 ! f none /opt/ipf/man/man4/ipl.4=root/opt/ipf/man/man4/ipl.4 ! f none /opt/ipf/man/man4/ipnat.4=root/opt/ipf/man/man4/ipnat.4 ! f none /opt/ipf/man/man5/ipf.5=root/opt/ipf/man/man5/ipf.5 ! f none /opt/ipf/man/man5/ipnat.5=root/opt/ipf/man/man5/ipnat.5 f none /usr/kernel/drv/ipf.conf=root/usr/kernel/drv/ipf.conf f none /usr/include/netinet/ip_fil.h=root/usr/include/netinet/ip_fil.h f none /usr/include/netinet/ip_auth.h=root/usr/include/netinet/ip_auth.h *************** *** 54,80 **** f none /usr/include/netinet/ip_nat.h=root/usr/include/netinet/ip_nat.h f none /usr/include/netinet/ip_proxy.h=root/usr/include/netinet/ip_proxy.h f none /usr/include/netinet/ip_state.h=root/usr/include/netinet/ip_state.h ! f none /opt/CYBSipf/examples/example.1=root/opt/CYBSipf/examples/example.1 ! f none /opt/CYBSipf/examples/example.2=root/opt/CYBSipf/examples/example.2 ! f none /opt/CYBSipf/examples/example.3=root/opt/CYBSipf/examples/example.3 ! f none /opt/CYBSipf/examples/example.4=root/opt/CYBSipf/examples/example.4 ! f none /opt/CYBSipf/examples/example.5=root/opt/CYBSipf/examples/example.5 ! f none /opt/CYBSipf/examples/example.6=root/opt/CYBSipf/examples/example.6 ! f none /opt/CYBSipf/examples/example.7=root/opt/CYBSipf/examples/example.7 ! f none /opt/CYBSipf/examples/example.8=root/opt/CYBSipf/examples/example.8 ! f none /opt/CYBSipf/examples/example.9=root/opt/CYBSipf/examples/example.9 ! f none /opt/CYBSipf/examples/example.10=root/opt/CYBSipf/examples/example.10 ! f none /opt/CYBSipf/examples/example.11=root/opt/CYBSipf/examples/example.11 ! f none /opt/CYBSipf/examples/example.12=root/opt/CYBSipf/examples/example.12 ! f none /opt/CYBSipf/examples/example.13=root/opt/CYBSipf/examples/example.13 ! f none /opt/CYBSipf/examples/example.sr=root/opt/CYBSipf/examples/example.sr ! f none /opt/CYBSipf/examples/nat.eg=root/opt/CYBSipf/examples/nat.eg ! f none /opt/CYBSipf/examples/server=root/opt/CYBSipf/examples/server ! f none /opt/CYBSipf/examples/tcpstate=root/opt/CYBSipf/examples/tcpstate ! f none /opt/CYBSipf/examples/BASIC.NAT=root/opt/CYBSipf/examples/BASIC.NAT ! f none /opt/CYBSipf/examples/BASIC_1.FW=root/opt/CYBSipf/examples/BASIC_1.FW ! f none /opt/CYBSipf/examples/BASIC_2.FW=root/opt/CYBSipf/examples/BASIC_2.FW ! f none /opt/CYBSipf/examples/firewall=root/opt/CYBSipf/examples/firewall ! f none /opt/CYBSipf/examples/ftp-proxy=root/opt/CYBSipf/examples/ftp-proxy ! f none /opt/CYBSipf/examples/ftppxy=root/opt/CYBSipf/examples/ftppxy ! f none /opt/CYBSipf/examples/nat-setup=root/opt/CYBSipf/examples/nat-setup --- 54,80 ---- f none /usr/include/netinet/ip_nat.h=root/usr/include/netinet/ip_nat.h f none /usr/include/netinet/ip_proxy.h=root/usr/include/netinet/ip_proxy.h f none /usr/include/netinet/ip_state.h=root/usr/include/netinet/ip_state.h ! f none /opt/ipf/examples/example.1=root/opt/ipf/examples/example.1 ! f none /opt/ipf/examples/example.2=root/opt/ipf/examples/example.2 ! f none /opt/ipf/examples/example.3=root/opt/ipf/examples/example.3 ! f none /opt/ipf/examples/example.4=root/opt/ipf/examples/example.4 ! f none /opt/ipf/examples/example.5=root/opt/ipf/examples/example.5 ! f none /opt/ipf/examples/example.6=root/opt/ipf/examples/example.6 ! f none /opt/ipf/examples/example.7=root/opt/ipf/examples/example.7 ! f none /opt/ipf/examples/example.8=root/opt/ipf/examples/example.8 ! f none /opt/ipf/examples/example.9=root/opt/ipf/examples/example.9 ! f none /opt/ipf/examples/example.10=root/opt/ipf/examples/example.10 ! f none /opt/ipf/examples/example.11=root/opt/ipf/examples/example.11 ! f none /opt/ipf/examples/example.12=root/opt/ipf/examples/example.12 ! f none /opt/ipf/examples/example.13=root/opt/ipf/examples/example.13 ! f none /opt/ipf/examples/example.sr=root/opt/ipf/examples/example.sr ! f none /opt/ipf/examples/nat.eg=root/opt/ipf/examples/nat.eg ! f none /opt/ipf/examples/server=root/opt/ipf/examples/server ! f none /opt/ipf/examples/tcpstate=root/opt/ipf/examples/tcpstate ! f none /opt/ipf/examples/BASIC.NAT=root/opt/ipf/examples/BASIC.NAT ! f none /opt/ipf/examples/BASIC_1.FW=root/opt/ipf/examples/BASIC_1.FW ! f none /opt/ipf/examples/BASIC_2.FW=root/opt/ipf/examples/BASIC_2.FW ! f none /opt/ipf/examples/firewall=root/opt/ipf/examples/firewall ! f none /opt/ipf/examples/ftp-proxy=root/opt/ipf/examples/ftp-proxy ! f none /opt/ipf/examples/ftppxy=root/opt/ipf/examples/ftppxy ! f none /opt/ipf/examples/nat-setup=root/opt/ipf/examples/nat-setup Only in ip_fil3.2.5: Y2K diff -cr ip_fil3.2.4/fil.c ip_fil3.2.5/fil.c *** ip_fil3.2.4/fil.c Wed Apr 8 23:43:12 1998 --- ip_fil3.2.5/fil.c Sun Apr 26 01:46:36 1998 *************** *** 7,13 **** */ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-1996 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: fil.c,v 2.0.2.41.2.11 1998/04/08 13:43:12 darrenr Exp $"; #endif #include --- 7,13 ---- */ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-1996 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: fil.c,v 2.0.2.41.2.12 1998/04/25 15:46:36 darrenr Exp $"; #endif #include *************** *** 235,241 **** (icmp->icmp_type == ICMP_ECHOREPLY || icmp->icmp_type == ICMP_UNREACH)) minicmpsz = ICMP_MINLEN; ! if (((ip->ip_len >= hlen + minicmpsz) && !off) || (off && off < sizeof(struct icmp))) fi->fi_fl |= FI_SHORT; if (fin->fin_dlen > 1) --- 235,241 ---- (icmp->icmp_type == ICMP_ECHOREPLY || icmp->icmp_type == ICMP_UNREACH)) minicmpsz = ICMP_MINLEN; ! if ((!(ip->ip_len >= hlen + minicmpsz) && !off) || (off && off < sizeof(struct icmp))) fi->fi_fl |= FI_SHORT; if (fin->fin_dlen > 1) *************** *** 1081,1087 **** * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 ! * $Id: fil.c,v 2.0.2.41.2.11 1998/04/08 13:43:12 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, --- 1081,1087 ---- * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 ! * $Id: fil.c,v 2.0.2.41.2.12 1998/04/25 15:46:36 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, diff -cr ip_fil3.2.4/ip_compat.h ip_fil3.2.5/ip_compat.h *** ip_fil3.2.4/ip_compat.h Sat Feb 28 13:34:32 1998 --- ip_fil3.2.5/ip_compat.h Sat May 9 01:09:15 1998 *************** *** 6,12 **** * to the original author and the contributors. * * @(#)ip_compat.h 1.8 1/14/96 ! * $Id: ip_compat.h,v 2.0.2.31.2.9 1998/02/28 02:34:32 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ --- 6,12 ---- * to the original author and the contributors. * * @(#)ip_compat.h 1.8 1/14/96 ! * $Id: ip_compat.h,v 2.0.2.31.2.10 1998/05/08 15:09:15 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ *************** *** 369,374 **** --- 369,377 ---- * not be in other places or maybe one day linux will grow up and some * of these will turn up there too. */ + #ifndef ICMP_MINLEN + # define ICMP_MINLEN 8 + #endif #ifndef ICMP_UNREACH # define ICMP_UNREACH ICMP_DEST_UNREACH #endif *************** *** 680,685 **** --- 683,694 ---- # undef UINT_MAX # undef LONG_MAX # undef ULONG_MAX + # define s8 __s8 + # define u8 __u8 + # define s16 __s16 + # define u16 __u16 + # define s32 __s32 + # define u32 __u32 # include # undef __KERNEL__ # endif diff -cr ip_fil3.2.4/ip_fil.c ip_fil3.2.5/ip_fil.c *** ip_fil3.2.4/ip_fil.c Sat Feb 28 13:34:48 1998 --- ip_fil3.2.5/ip_fil.c Sun May 3 20:55:49 1998 *************** *** 7,13 **** */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.0.2.44.2.6 1998/02/28 02:34:48 darrenr Exp $"; #endif #ifndef SOLARIS --- 7,13 ---- */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.0.2.44.2.7 1998/05/03 10:55:49 darrenr Exp $"; #endif #ifndef SOLARIS *************** *** 933,939 **** if (ro->ro_rt->rt_flags & RTF_GATEWAY) dst = (struct sockaddr_in *)&ro->ro_rt->rt_gateway; } ! ro->ro_rt->rt_use++; /* * For input packets which are being "fastrouted", they won't --- 933,940 ---- if (ro->ro_rt->rt_flags & RTF_GATEWAY) dst = (struct sockaddr_in *)&ro->ro_rt->rt_gateway; } ! if (ro->ro_rt) ! ro->ro_rt->rt_use++; /* * For input packets which are being "fastrouted", they won't diff -cr ip_fil3.2.4/ip_nat.c ip_fil3.2.5/ip_nat.c *** ip_fil3.2.4/ip_nat.c Wed Dec 3 00:54:27 1997 --- ip_fil3.2.5/ip_nat.c Sat May 9 01:10:17 1998 *************** *** 9,15 **** */ #if !defined(lint) static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.0.2.44.2.7 1997/12/02 13:54:27 darrenr Exp $"; #endif #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL) --- 9,15 ---- */ #if !defined(lint) static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.0.2.44.2.8 1998/05/08 15:10:17 darrenr Exp $"; #endif #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL) *************** *** 456,462 **** struct in_addr in; #if SOLARIS ! in.s_addr = ill->ill_ipif->ipif_local_addr; #else /* SOLARIS */ # if linux ; --- 456,462 ---- struct in_addr in; #if SOLARIS ! in.s_addr = ntohl(ill->ill_ipif->ipif_local_addr); #else /* SOLARIS */ # if linux ; diff -cr ip_fil3.2.4/ip_state.c ip_fil3.2.5/ip_state.c *** ip_fil3.2.4/ip_state.c Wed Apr 8 23:44:02 1998 --- ip_fil3.2.5/ip_state.c Sun Apr 26 01:49:18 1998 *************** *** 7,13 **** */ #if !defined(lint) static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.0.2.24.2.5 1998/04/08 13:44:02 darrenr Exp $"; #endif #if !defined(_KERNEL) && !defined(KERNEL) && !defined(__KERNEL__) --- 7,13 ---- */ #if !defined(lint) static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.0.2.24.2.6 1998/04/25 15:49:18 darrenr Exp $"; #endif #if !defined(_KERNEL) && !defined(KERNEL) && !defined(__KERNEL__) *************** *** 385,391 **** swin = is->is_dwin; } ! if ((seqskew <= swin) && (ackskew <= dwin)) { if (source) { is->is_seq = seq; is->is_ack = ack; --- 385,391 ---- swin = is->is_dwin; } ! if ((seqskew <= dwin) && (ackskew <= swin)) { if (source) { is->is_seq = seq; is->is_ack = ack; diff -cr ip_fil3.2.4/ipl.h ip_fil3.2.5/ipl.h *** ip_fil3.2.4/ipl.h Wed Dec 10 20:56:34 1997 --- ip_fil3.2.5/ipl.h Sat May 9 01:09:27 1998 *************** *** 11,16 **** #ifndef __IPL_H__ #define __IPL_H__ ! #define IPL_VERSION "IP Filter v3.2.3" #endif --- 11,16 ---- #ifndef __IPL_H__ #define __IPL_H__ ! #define IPL_VERSION "IP Filter v3.2.5" #endif diff -cr ip_fil3.2.4/ipmon.c ip_fil3.2.5/ipmon.c *** ip_fil3.2.4/ipmon.c Wed Apr 8 23:39:26 1998 --- ip_fil3.2.5/ipmon.c Fri May 1 23:18:49 1998 *************** *** 7,13 **** */ #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-1997 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.0.2.29.2.5 1998/04/08 13:39:26 darrenr Exp $"; #endif #include --- 7,13 ---- */ #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-1997 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.0.2.29.2.6 1998/05/01 13:18:49 darrenr Exp $"; #endif #include *************** *** 550,558 **** ic = (struct icmp *)((char *)ip + hl); (void) sprintf(t, "%s -> ", hostname(res, ip->ip_src)); t += strlen(t); ! (void) sprintf(t, "%s PR icmp len %hu (%hu) icmp %d/%d", ! hostname(res, ip->ip_dst), hl, ! ntohs(ip->ip_len), ic->icmp_type, ic->icmp_code); if (ic->icmp_type == ICMP_UNREACH || ic->icmp_type == ICMP_SOURCEQUENCH || ic->icmp_type == ICMP_PARAMPROB || --- 550,558 ---- ic = (struct icmp *)((char *)ip + hl); (void) sprintf(t, "%s -> ", hostname(res, ip->ip_src)); t += strlen(t); ! (void) sprintf(t, "%s PR icmp len %hu %hu icmp %d/%d", ! hostname(res, ip->ip_dst), hl, ip->ip_len, ! ic->icmp_type, ic->icmp_code); if (ic->icmp_type == ICMP_UNREACH || ic->icmp_type == ICMP_SOURCEQUENCH || ic->icmp_type == ICMP_PARAMPROB || diff -cr ip_fil3.2.4/ipnat.c ip_fil3.2.5/ipnat.c *** ip_fil3.2.4/ipnat.c Thu Apr 9 00:31:18 1998 --- ip_fil3.2.5/ipnat.c Tue May 5 23:35:31 1998 *************** *** 62,68 **** #if !defined(lint) static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipnat.c,v 2.0.2.21.2.4 1998/04/08 14:31:18 darrenr Exp $"; #endif --- 62,68 ---- #if !defined(lint) static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipnat.c,v 2.0.2.21.2.5 1998/05/05 13:35:31 darrenr Exp $"; #endif *************** *** 236,248 **** } else { np->in_nextip.s_addr = htonl(np->in_nextip.s_addr); printf("%s %s/", np->in_ifname, inet_ntoa(np->in_in[0])); ! bits = countbits(ntohl(np->in_in[1].s_addr)); if (bits != -1) printf("%d ", bits); else printf("%s", inet_ntoa(np->in_in[1])); printf(" -> %s/", inet_ntoa(np->in_out[0])); ! bits = countbits(ntohl(np->in_out[1].s_addr)); if (bits != -1) printf("%d ", bits); else --- 236,248 ---- } else { np->in_nextip.s_addr = htonl(np->in_nextip.s_addr); printf("%s %s/", np->in_ifname, inet_ntoa(np->in_in[0])); ! bits = countbits(np->in_in[1].s_addr); if (bits != -1) printf("%d ", bits); else printf("%s", inet_ntoa(np->in_in[1])); printf(" -> %s/", inet_ntoa(np->in_out[0])); ! bits = countbits(np->in_out[1].s_addr); if (bits != -1) printf("%d ", bits); else diff -cr ip_fil3.2.4/ipsd/README ip_fil3.2.5/ipsd/README *** ip_fil3.2.4/ipsd/README Sun Jan 12 19:47:39 1997 --- ip_fil3.2.5/ipsd/README Sat Apr 11 12:59:36 1998 *************** *** 29,32 **** done or discourage them. Darren ! darrenr@cyber.com.au --- 29,32 ---- done or discourage them. Darren ! darrenr@pobox.com diff -cr ip_fil3.2.4/ipsend/README ip_fil3.2.5/ipsend/README *** ip_fil3.2.4/ipsend/README Sun Sep 28 17:34:47 1997 --- ip_fil3.2.5/ipsend/README Sat Apr 11 12:59:39 1998 *************** *** 5,8 **** Patches, bugs, etc, please send to: ! darrenr@cyber.com.au --- 5,8 ---- Patches, bugs, etc, please send to: ! darrenr@pobox.com diff -cr ip_fil3.2.4/ipsend/ipresend.1 ip_fil3.2.5/ipsend/ipresend.1 *** ip_fil3.2.4/ipsend/ipresend.1 Tue Aug 12 23:15:58 1997 --- ip_fil3.2.5/ipsend/ipresend.1 Sat Apr 11 12:59:39 1998 *************** *** 103,107 **** .PP Not all of the input formats are sufficiently capable of introducing a wide enough variety of packets for them to be all useful in testing. ! If you find any, please send email to me at darrenr@cyber.com.au --- 103,107 ---- .PP Not all of the input formats are sufficiently capable of introducing a wide enough variety of packets for them to be all useful in testing. ! If you find any, please send email to me at darrenr@pobox.com diff -cr ip_fil3.2.4/ipsend/ipsend.1 ip_fil3.2.5/ipsend/ipsend.1 *** ip_fil3.2.4/ipsend/ipsend.1 Mon Sep 15 23:51:48 1997 --- ip_fil3.2.5/ipsend/ipsend.1 Sat Apr 11 12:59:40 1998 *************** *** 106,109 **** Needs to be run as root. .SH BUGS .PP ! If you find any, please send email to me at darrenr@cyber.com.au --- 106,109 ---- Needs to be run as root. .SH BUGS .PP ! If you find any, please send email to me at darrenr@pobox.com diff -cr ip_fil3.2.4/ipsend/iptest.1 ip_fil3.2.5/ipsend/iptest.1 *** ip_fil3.2.4/ipsend/iptest.1 Tue Aug 12 23:15:58 1997 --- ip_fil3.2.5/ipsend/iptest.1 Sat Apr 11 12:59:41 1998 *************** *** 98,101 **** Needs to be run as root. .SH BUGS .PP ! If you find any, please send email to me at darrenr@cyber.com.au --- 98,101 ---- Needs to be run as root. .SH BUGS .PP ! If you find any, please send email to me at darrenr@pobox.com diff -cr ip_fil3.2.4/man/ipf.8 ip_fil3.2.5/man/ipf.8 *** ip_fil3.2.4/man/ipf.8 Fri Nov 28 18:25:05 1997 --- ip_fil3.2.5/man/ipf.8 Sat Apr 11 12:59:44 1998 *************** *** 114,117 **** be affected inside the kernel. .SH BUGS .PP ! If you find any, please send email to me at darrenr@cyber.com.au --- 114,117 ---- be affected inside the kernel. .SH BUGS .PP ! If you find any, please send email to me at darrenr@pobox.com