diff -cr ip_fil3.4.30/HISTORY ip_fil3.4.31/HISTORY *** ip_fil3.4.30/HISTORY Tue Nov 26 21:34:25 2002 --- ip_fil3.4.31/HISTORY Sat Dec 7 13:40:05 2002 *************** *** 22,27 **** --- 22,40 ---- # and especially those who have found the time to port IP Filter to new # platforms. # + 3.4.31 7/12/2002 - Released + + Solaris 10 compatibility + + fix linking into pfil in NetBSD + + fix IRIX 6.2 compatibility + + add code to check consistency of fr_checkp/fr_check on non-Solaris + + OpenBSD: missing patches for ip6_output.c on OpenBSD 3.2, + make LKM work for 3.2 (OpenBSD LKMs now match NetBSD) + 3.4.30 26/11/2002 - Released attempt to detect using GNU make and abort if so diff -cr ip_fil3.4.30/INSTALL.IRIX ip_fil3.4.31/INSTALL.IRIX *** ip_fil3.4.30/INSTALL.IRIX Tue May 21 23:35:14 2002 --- ip_fil3.4.31/INSTALL.IRIX Sat Dec 7 13:37:21 2002 *************** *** 3,8 **** --- 3,11 ---- Under IRIX 5.3, it has been successfully compiled and linked in the kernel, but not tested. + To compile it under IRIX 6.2, you may need to uncomment (and join the + lines) with "-D_STANDALONE" in the Makefiles in the IRIX directory. + To build a kernel with the IP filter and install it on your system, follow these steps: diff -cr ip_fil3.4.30/IRIX/Makefile ip_fil3.4.31/IRIX/Makefile *** ip_fil3.4.30/IRIX/Makefile Thu Apr 25 03:13:31 2002 --- ip_fil3.4.31/IRIX/Makefile Fri Dec 6 22:56:42 2002 *************** *** 49,54 **** --- 49,55 ---- "CPUDIR=$(CPUDIR)" # CKFLAGS=$(SGIREV) -O2 -I$(TOP) $(IPFLOG) -D_KMEMUSER + #-D_STANDALONE CCARGS=$(SGIREV) -D_KMEMUSER $(DEBUG) $(CFLAGS) $(IPFLOG) #-D_STANDALONE # *************** *** 234,240 **** $(CC) $(CCARGS) -c $(TOP)/printstate.c -o $@ clean: ! ${RM} -f *.core *.o ipt fils ipf ipfstat ipftest ipmon ipnat $(LKM) ${MAKE} -f Makefile.ipsend ${MFLAGS} clean -(for i in *; do \ if [ -d $${i} -a -f $${i}/Makefile ] ; then \ --- 235,241 ---- $(CC) $(CCARGS) -c $(TOP)/printstate.c -o $@ clean: ! ${RM} -f *.core *.o ipt fils ipf ipfs ipfstat ipftest ipmon ipnat $(LKM) ${MAKE} -f Makefile.ipsend ${MFLAGS} clean -(for i in *; do \ if [ -d $${i} -a -f $${i}/Makefile ] ; then \ diff -cr ip_fil3.4.30/IRIX/Makefile.ipsend ip_fil3.4.31/IRIX/Makefile.ipsend *** ip_fil3.4.30/IRIX/Makefile.ipsend Sun Aug 1 20:57:02 1999 --- ip_fil3.4.31/IRIX/Makefile.ipsend Fri Dec 6 22:57:21 2002 *************** *** 4,17 **** TOBJS=iptest.o iptests.o ip.o UNIXOBJS=sirix.o arp.o LIBS= CC=cc CFLAGS=-g -I$(TOP) all build irix : ipsend ipresend iptest .c.o: ! $(CC) $(DEBUG) $(CFLAGS) -c $< -o $@ y.tab.o: $(TOP)/iplang/iplang_y.y (cd $(TOP)/iplang; $(MAKE) 'DESTDIR=../IRIX/$(CPUDIR)' ) --- 4,20 ---- TOBJS=iptest.o iptests.o ip.o UNIXOBJS=sirix.o arp.o LIBS= + SGIREV=-DIRIX=$(SGI) CC=cc CFLAGS=-g -I$(TOP) + CCARGS=$(DEBUG) $(CFLAGS) $(SGIREV) + #-D_STANDALONE all build irix : ipsend ipresend iptest .c.o: ! $(CC) $(CCARGS) -c $< -o $@ y.tab.o: $(TOP)/iplang/iplang_y.y (cd $(TOP)/iplang; $(MAKE) 'DESTDIR=../IRIX/$(CPUDIR)' ) *************** *** 29,81 **** $(CC) $(DEBUG) $(TOBJS) $(UNIXOBJS) -o $@ $(LIBS) clean: ! rm -rf *.o core a.out ipsend ipresend iptest ipsend.o: $(TOP)/ipsend/ipsend.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/ipsend.c -o $@ ipsopt.o: $(TOP)/ipsend/ipsopt.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/ipsopt.c -o $@ ipresend.o: $(TOP)/ipsend/ipresend.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/ipresend.c -o $@ ip.o: $(TOP)/ipsend/ip.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/ip.c -o $@ resend.o: $(TOP)/ipsend/resend.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/resend.c -o $@ ipft_sn.o: $(TOP)/ipft_sn.c $(TOP)/ipt.h $(TOP)/ipf.h $(TOP)/ip_fil.h \ $(TOP)/snoop.h ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_sn.c -o $@ ipft_ef.o: $(TOP)/ipft_ef.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_ef.c -o $@ ipft_td.o: $(TOP)/ipft_td.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_td.c -o $@ ipft_pc.o: $(TOP)/ipft_pc.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_pc.c -o $@ ipft_tx.o: $(TOP)/ipft_tx.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_tx.c -o $@ ipft_hx.o: $(TOP)/ipft_hx.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_hx.c -o $@ iptest.o: $(TOP)/ipsend/iptest.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/iptest.c -o $@ iptests.o: $(TOP)/ipsend/iptests.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/iptests.c -o $@ sock.o: $(TOP)/ipsend/sock.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/sock.c -o $@ arp.o: $(TOP)/ipsend/arp.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/arp.c -o $@ sirix.o: $(TOP)/ipsend/sirix.c ! $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/sirix.c -o $@ --- 32,84 ---- $(CC) $(DEBUG) $(TOBJS) $(UNIXOBJS) -o $@ $(LIBS) clean: ! rm -rf *.o core a.out ipsend ipresend iptest lex.yy.c y.tab.? ipsend.o: $(TOP)/ipsend/ipsend.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/ipsend.c -o $@ ipsopt.o: $(TOP)/ipsend/ipsopt.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/ipsopt.c -o $@ ipresend.o: $(TOP)/ipsend/ipresend.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/ipresend.c -o $@ ip.o: $(TOP)/ipsend/ip.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/ip.c -o $@ resend.o: $(TOP)/ipsend/resend.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/resend.c -o $@ ipft_sn.o: $(TOP)/ipft_sn.c $(TOP)/ipt.h $(TOP)/ipf.h $(TOP)/ip_fil.h \ $(TOP)/snoop.h ! $(CC) $(CCARGS) -c $(TOP)/ipft_sn.c -o $@ ipft_ef.o: $(TOP)/ipft_ef.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(CCARGS) -c $(TOP)/ipft_ef.c -o $@ ipft_td.o: $(TOP)/ipft_td.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(CCARGS) -c $(TOP)/ipft_td.c -o $@ ipft_pc.o: $(TOP)/ipft_pc.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(CCARGS) -c $(TOP)/ipft_pc.c -o $@ ipft_tx.o: $(TOP)/ipft_tx.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(CCARGS) -c $(TOP)/ipft_tx.c -o $@ ipft_hx.o: $(TOP)/ipft_hx.c $(TOP)/ipf.h $(TOP)/ip_fil.h $(TOP)/ipt.h ! $(CC) $(CCARGS) -c $(TOP)/ipft_hx.c -o $@ iptest.o: $(TOP)/ipsend/iptest.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/iptest.c -o $@ iptests.o: $(TOP)/ipsend/iptests.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/iptests.c -o $@ sock.o: $(TOP)/ipsend/sock.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/sock.c -o $@ arp.o: $(TOP)/ipsend/arp.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/arp.c -o $@ sirix.o: $(TOP)/ipsend/sirix.c ! $(CC) $(CCARGS) -c $(TOP)/ipsend/sirix.c -o $@ diff -cr ip_fil3.4.30/IRIX/Makefile.ipsend.std ip_fil3.4.31/IRIX/Makefile.ipsend.std *** ip_fil3.4.30/IRIX/Makefile.ipsend.std Thu Apr 4 00:35:18 2002 --- ip_fil3.4.31/IRIX/Makefile.ipsend.std Fri Dec 6 23:10:42 2002 *************** *** 4,13 **** TOBJS=iptest.o iptests.o ip.o UNIXOBJS=sirix.o arp.o LIBS= CC=cc CFLAGS=-g -I$(TOP) ! CCARGS=$(DEBUG) $(CFLAGS) -D_KMEMUSER #-D_STANDALONE all build irix : ipsend ipresend iptest --- 4,14 ---- TOBJS=iptest.o iptests.o ip.o UNIXOBJS=sirix.o arp.o LIBS= + SGIREV=-DIRIX=$(SGI) CC=cc CFLAGS=-g -I$(TOP) ! CCARGS=$(DEBUG) $(CFLAGS) -D_KMEMUSER -DIRIX=$(SGI) #-D_STANDALONE all build irix : ipsend ipresend iptest *************** *** 31,37 **** $(CC) $(DEBUG) $(TOBJS) $(UNIXOBJS) -o $@ $(LIBS) clean: ! rm -rf *.o core a.out ipsend ipresend iptest ipsend.o: $(TOP)/ipsend/ipsend.c $(CC) $(CCARGS) -c $(TOP)/ipsend/ipsend.c -o $@ --- 32,38 ---- $(CC) $(DEBUG) $(TOBJS) $(UNIXOBJS) -o $@ $(LIBS) clean: ! rm -rf *.o core a.out ipsend ipresend iptest lex.yy.c y.tab.? ipsend.o: $(TOP)/ipsend/ipsend.c $(CC) $(CCARGS) -c $(TOP)/ipsend/ipsend.c -o $@ diff -cr ip_fil3.4.30/IRIX/Makefile.std ip_fil3.4.31/IRIX/Makefile.std *** ip_fil3.4.30/IRIX/Makefile.std Thu Apr 18 03:44:08 2002 --- ip_fil3.4.31/IRIX/Makefile.std Fri Dec 6 22:59:14 2002 *************** *** 42,47 **** --- 42,48 ---- "CPUDIR=$(CPUDIR)" # CKFLAGS=$(SGIREV) -O2 -I$(TOP) $(IPFLOG) -D_KMEMUSER + #-D_STANDALONE CCARGS=$(SGIREV) $(DEBUG) $(CFLAGS) $(IPFLOG) -D_KMEMUSER #-D_STANDALONE # *************** *** 71,76 **** --- 72,79 ---- ln -s `pwd`/ipftest $(TOP) ${RM} -f $(TOP)/ipmon ln -s `pwd`/ipmon $(TOP) + ${RM} -f $(TOP)/ipnat + ln -s `pwd`/ipnat $(TOP) ipfstat: $(FILS) $(CC) $(CCARGS) $(STATETOP_CFLAGS) $(STATETOP_INC) $(FILS) \ *************** *** 226,232 **** $(CC) $(CCARGS) -c $(TOP)/printstate.c -o $@ clean: ! ${RM} -f *.core *.o ipt fils ipf ipfstat ipftest ipmon ipnat $(LKM) ${MAKE} -f Makefile.ipsend ${MFLAGS} clean -(for i in *; do \ if [ -d $${i} -a -f $${i}/Makefile ] ; then \ --- 229,235 ---- $(CC) $(CCARGS) -c $(TOP)/printstate.c -o $@ clean: ! ${RM} -f *.core *.o ipt fils ipf ipfs ipfstat ipftest ipmon ipnat $(LKM) ${MAKE} -f Makefile.ipsend ${MFLAGS} clean -(for i in *; do \ if [ -d $${i} -a -f $${i}/Makefile ] ; then \ diff -cr ip_fil3.4.30/Makefile ip_fil3.4.31/Makefile *** ip_fil3.4.30/Makefile Mon Nov 25 21:59:47 2002 --- ip_fil3.4.31/Makefile Mon Dec 2 15:22:56 2002 *************** *** 3,9 **** # # See the IPFILTER.LICENCE file for details on licencing. # ! # $Id: Makefile,v 2.11.2.14 2002/11/25 10:59:47 darrenr Exp $ # BINDEST=/usr/local/bin SBINDEST=/sbin --- 3,9 ---- # # See the IPFILTER.LICENCE file for details on licencing. # ! # $Id: Makefile,v 2.11.2.15 2002/12/02 04:22:56 darrenr Exp $ # BINDEST=/usr/local/bin SBINDEST=/sbin *************** *** 91,97 **** @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" - @echo "linux - compile for Linux 2.0.31+" @echo "" tests: --- 91,96 ---- diff -cr ip_fil3.4.30/OpenBSD-3/3.2-sys-diffs ip_fil3.4.31/OpenBSD-3/3.2-sys-diffs *** ip_fil3.4.30/OpenBSD-3/3.2-sys-diffs Tue Nov 5 21:53:17 2002 --- ip_fil3.4.31/OpenBSD-3/3.2-sys-diffs Tue Dec 3 00:58:51 2002 *************** *** 859,866 **** *** /tmp/sys/netinet6/ip6_output.c Tue Sep 24 01:03:31 2002 --- sys/netinet6/ip6_output.c Sun Nov 3 08:14:44 2002 *************** ! *** 120,125 **** ! --- 120,128 ---- static int ip6_pcbopts(struct ip6_pktopts **, struct mbuf *, struct socket *); static int ip6_setmoptions(int, struct ip6_moptions **, struct mbuf *); --- 859,879 ---- *** /tmp/sys/netinet6/ip6_output.c Tue Sep 24 01:03:31 2002 --- sys/netinet6/ip6_output.c Sun Nov 3 08:14:44 2002 *************** ! *** 120,132 **** ! ! static int ip6_pcbopts(struct ip6_pktopts **, struct mbuf *, struct socket *); ! static int ip6_setmoptions(int, struct ip6_moptions **, struct mbuf *); ! static int ip6_getmoptions(int, struct ip6_moptions *, struct mbuf **); ! static int ip6_copyexthdr(struct mbuf **, caddr_t, int); ! static int ip6_insertfraghdr(struct mbuf *, struct mbuf *, int, ! struct ip6_frag **); ! static int ip6_insert_jumboopt(struct ip6_exthdrs *, u_int32_t); ! static int ip6_splithdr(struct mbuf *, struct ip6_exthdrs *); ! ! static int ip6_getpmtu(struct route_in6 *, struct route_in6 *, ! struct ifnet *, struct in6_addr *, u_long *); ! ! /* ! --- 120,135 ---- static int ip6_pcbopts(struct ip6_pktopts **, struct mbuf *, struct socket *); static int ip6_setmoptions(int, struct ip6_moptions **, struct mbuf *); *************** *** 870,882 **** static int ip6_getmoptions(int, struct ip6_moptions *, struct mbuf **); static int ip6_copyexthdr(struct mbuf **, caddr_t, int); static int ip6_insertfraghdr(struct mbuf *, struct mbuf *, int, *************** ! *** 795,800 **** ! --- 798,822 ---- ! if (m == NULL) goto done; ip6 = mtod(m, struct ip6_hdr *); ! + #endif + + #if defined(IPFILTER) || defined(IPFILTER_LKM) + /* --- 883,901 ---- static int ip6_getmoptions(int, struct ip6_moptions *, struct mbuf **); static int ip6_copyexthdr(struct mbuf **, caddr_t, int); static int ip6_insertfraghdr(struct mbuf *, struct mbuf *, int, + struct ip6_frag **); + static int ip6_insert_jumboopt(struct ip6_exthdrs *, u_int32_t); + static int ip6_splithdr(struct mbuf *, struct ip6_exthdrs *); + ! int ip6_getpmtu(struct route_in6 *, struct route_in6 *, + struct ifnet *, struct in6_addr *, u_long *); + + /* *************** ! *** 796,801 **** ! --- 799,823 ---- goto done; ip6 = mtod(m, struct ip6_hdr *); ! #endif + + #if defined(IPFILTER) || defined(IPFILTER_LKM) + /* *************** *** 895,927 **** + } + ip6 = mtod(m, struct ip6_hdr *); + } ! #endif /* diff -d -c -r /tmp/sys/sys/conf.h sys/sys/conf.h *** /tmp/sys/sys/conf.h Thu Jul 11 00:21:30 2002 --- sys/sys/conf.h Sun Nov 3 08:17:26 2002 *************** ! *** 357,363 **** ! (dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \ ! (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) nullop, \ ! 0, (dev_type_select((*))) enodev, (dev_type_mmap((*))) enodev } ! ! ! /* open, close, read, write, ioctl, select, nokqfilter */ ! #define cdev_xfs_init(c, n) { \ ! dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ ! --- 357,370 ---- ! (dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \ ! (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) nullop, \ ! 0, (dev_type_select((*))) enodev, (dev_type_mmap((*))) enodev } ! ! ! ! /* open, close, read, ioctl */ ! ! #define cdev_gen_ipf(c, n) { \ ! ! dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ ! ! (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ ! ! (dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \ ! ! (dev_type_mmap((*))) enodev } ! ! /* open, close, read, write, ioctl, select, nokqfilter */ #define cdev_xfs_init(c, n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ --- 914,956 ---- + } + ip6 = mtod(m, struct ip6_hdr *); + } ! + #endif /* + * Send the packet to the outgoing interface. + *************** + *** 1120,1126 **** + return (0); + } + + ! static int + ip6_getpmtu(ro_pmtu, ro, ifp, dst, mtup) + struct route_in6 *ro_pmtu, *ro; + struct ifnet *ifp; + --- 1142,1148 ---- + return (0); + } + + ! int + ip6_getpmtu(ro_pmtu, ro, ifp, dst, mtup) + struct route_in6 *ro_pmtu, *ro; + struct ifnet *ifp; diff -d -c -r /tmp/sys/sys/conf.h sys/sys/conf.h *** /tmp/sys/sys/conf.h Thu Jul 11 00:21:30 2002 --- sys/sys/conf.h Sun Nov 3 08:17:26 2002 *************** ! *** 358,363 **** ! --- 358,370 ---- ! (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) nullop, \ ! 0, (dev_type_select((*))) enodev, (dev_type_mmap((*))) enodev } ! ! + /* open, close, read, ioctl */ ! + #define cdev_gen_ipf(c, n) { \ ! + dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ ! + (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ ! + (dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \ ! + (dev_type_mmap((*))) enodev } ! + /* open, close, read, write, ioctl, select, nokqfilter */ #define cdev_xfs_init(c, n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ diff -cr ip_fil3.4.30/OpenBSD-3/README.3_0 ip_fil3.4.31/OpenBSD-3/README.3_0 *** ip_fil3.4.30/OpenBSD-3/README.3_0 Fri Nov 1 02:30:51 2002 --- ip_fil3.4.31/OpenBSD-3/README.3_0 Sat Dec 7 14:25:06 2002 *************** *** 29,41 **** 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.30.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.0-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.30 BSD/kupgrade 4. Build a new OpenBSD kernel --- 29,41 ---- 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.31.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.0-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.31 BSD/kupgrade 4. Build a new OpenBSD kernel *************** *** 49,55 **** 5. Build and install IPFilter ! cd ip_fil3.4.30 make openbsd make install-bsd OpenBSD-3/makedevs-3.0 --- 49,55 ---- 5. Build and install IPFilter ! cd ip_fil3.4.31 make openbsd make install-bsd OpenBSD-3/makedevs-3.0 *************** *** 57,63 **** 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.0-rc-diffs 7. Reboot --- 57,63 ---- 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.0-rc-diffs 7. Reboot diff -cr ip_fil3.4.30/OpenBSD-3/README.3_1 ip_fil3.4.31/OpenBSD-3/README.3_1 *** ip_fil3.4.30/OpenBSD-3/README.3_1 Fri Nov 1 02:30:51 2002 --- ip_fil3.4.31/OpenBSD-3/README.3_1 Sat Dec 7 14:25:06 2002 *************** *** 29,41 **** 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.30.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.1-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.30 BSD/kupgrade If you want to build a new release with IPFilter, stop here and goto --- 29,41 ---- 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.31.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.1-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.31 BSD/kupgrade If you want to build a new release with IPFilter, stop here and goto *************** *** 52,58 **** 5. Build and install IPFilter ! cd ip_fil3.4.30 make openbsd make install-bsd OpenBSD-3/makedevs-3.1 --- 52,58 ---- 5. Build and install IPFilter ! cd ip_fil3.4.31 make openbsd make install-bsd OpenBSD-3/makedevs-3.1 *************** *** 60,66 **** 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.1-rc-diffs 7. Reboot --- 60,66 ---- 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.1-rc-diffs 7. Reboot *************** *** 79,86 **** Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.1-rc-diffs ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.1-MAKEDEV-diffs ! cd ~/ip_fil3.4.30 ./OpenBSD-3/fixdist-3.0 --- 79,86 ---- Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.1-rc-diffs ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.1-MAKEDEV-diffs ! cd ~/ip_fil3.4.31 ./OpenBSD-3/fixdist-3.0 diff -cr ip_fil3.4.30/OpenBSD-3/README.3_2 ip_fil3.4.31/OpenBSD-3/README.3_2 *** ip_fil3.4.30/OpenBSD-3/README.3_2 Mon Nov 25 21:58:57 2002 --- ip_fil3.4.31/OpenBSD-3/README.3_2 Sat Dec 7 14:25:06 2002 *************** *** 29,41 **** 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.30.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.2-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.30 BSD/kupgrade If you want to build a new release with IPFilter, stop here and goto --- 29,41 ---- 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.31.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.2-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.31 BSD/kupgrade If you want to build a new release with IPFilter, stop here and goto *************** *** 52,58 **** 5. Build and install IPFilter ! cd ip_fil3.4.30 make openbsd make install-bsd OpenBSD-3/makedevs-3.2 --- 52,58 ---- 5. Build and install IPFilter ! cd ip_fil3.4.31 make openbsd make install-bsd OpenBSD-3/makedevs-3.2 *************** *** 60,66 **** 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.2-rc-diffs 7. Reboot --- 60,66 ---- 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.2-rc-diffs 7. Reboot *************** *** 79,86 **** Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.2-rc-diffs ! patch < ~/ip_fil3.4.30/OpenBSD-3/3.2-MAKEDEV-diffs ! cd ~/ip_fil3.4.30 ./OpenBSD-3/fixdist-3.2 --- 79,86 ---- Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.2-rc-diffs ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.2-MAKEDEV-diffs ! cd ~/ip_fil3.4.31 ./OpenBSD-3/fixdist-3.2 diff -cr ip_fil3.4.30/SunOS5/Makefile ip_fil3.4.31/SunOS5/Makefile *** ip_fil3.4.30/SunOS5/Makefile Wed Oct 2 01:28:45 2002 --- ip_fil3.4.31/SunOS5/Makefile Fri Dec 6 22:43:01 2002 *************** *** 276,282 **** $(MAKE) CPUDIR=$(CPUDIR) OBJ=. BITS=${BITS} $(CPUDIR)/ipf.pkg.bin;\ fi touch $(CPUDIR)/ipf.pkg ! pkgtrans -s $(TMP) $(CPUDIR)/ipf.pkg `ls $(TMP)` rm -rf $(TMP)/ipf* --- 276,282 ---- $(MAKE) CPUDIR=$(CPUDIR) OBJ=. BITS=${BITS} $(CPUDIR)/ipf.pkg.bin;\ fi touch $(CPUDIR)/ipf.pkg ! pkgtrans -s $(TMP) $(CPUDIR)/ipf.pkg `ls -r $(TMP)` rm -rf $(TMP)/ipf* *************** *** 318,324 **** # is smaller and only contains the 64 bit specific and not the common stuff. # $(CPUDIR)/ipf.pkg.bin: ! mkdir -p $(PKGBIN) $(ROOT)/$(SBINDEST) $(ROOT)/usr/kernel/drv/$(OBJ) -$(INSTALL) -c -s $(OBJDIR)/ipftest $(PKGBIN)/ipftest -$(INSTALL) -c -s $(OBJDIR)/ipmon $(PKGBIN)/ipmon -$(INSTALL) -c -s $(OBJDIR)/ipsend $(PKGBIN)/ipsend --- 318,324 ---- # is smaller and only contains the 64 bit specific and not the common stuff. # $(CPUDIR)/ipf.pkg.bin: ! -mkdir -p $(PKGBIN) $(ROOT)/$(SBINDEST) $(ROOT)/usr/kernel/drv/$(OBJ) -$(INSTALL) -c -s $(OBJDIR)/ipftest $(PKGBIN)/ipftest -$(INSTALL) -c -s $(OBJDIR)/ipmon $(PKGBIN)/ipmon -$(INSTALL) -c -s $(OBJDIR)/ipsend $(PKGBIN)/ipsend diff -cr ip_fil3.4.30/SunOS5/pkginfo ip_fil3.4.31/SunOS5/pkginfo *** ip_fil3.4.30/SunOS5/pkginfo Tue Nov 26 21:34:14 2002 --- ip_fil3.4.31/SunOS5/pkginfo Sat Dec 7 13:40:05 2002 *************** *** 5,11 **** PKG=ipf NAME=IP Filter ARCH=ARCH_updated_by_sed_when_package_is_built ! VERSION=3.4.30 CATEGORY=system DESC=This package contains tools for building a firewall VENDOR=Darren Reed --- 5,11 ---- PKG=ipf NAME=IP Filter ARCH=ARCH_updated_by_sed_when_package_is_built ! VERSION=3.4.31 CATEGORY=system DESC=This package contains tools for building a firewall VENDOR=Darren Reed diff -cr ip_fil3.4.30/common.c ip_fil3.4.31/common.c *** ip_fil3.4.30/common.c Sat Feb 23 02:32:43 2002 --- ip_fil3.4.31/common.c Fri Dec 6 22:40:20 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include diff -cr ip_fil3.4.30/fil.c ip_fil3.4.31/fil.c *** ip_fil3.4.30/fil.c Sat Oct 26 16:21:26 2002 --- ip_fil3.4.31/fil.c Sat Dec 7 00:28:05 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 97,103 **** #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: fil.c,v 2.35.2.65 2002/10/26 06:21:26 darrenr Exp $"; #endif #ifndef _KERNEL --- 97,103 ---- #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: fil.c,v 2.35.2.67 2002/12/06 13:28:05 darrenr Exp $"; #endif #ifndef _KERNEL *************** *** 815,820 **** --- 815,840 ---- # endif int up; + # if !SOLARIS && !defined(NETBSD_PF) && \ + ((defined(__FreeBSD__) && (__FreeBSD_version < 500011)) || \ + defined(__OpenBSD__) || defined(_BSDI_VERSION)) + if (fr_checkp != fr_check && fr_running > 0) { + static int counter = 0; + + if (counter == 0) { + printf("WARNING: fr_checkp corrupt: value %lx\n", + (u_long)fr_checkp); + printf("WARNING: fr_checkp should be %lx\n", + (u_long)fr_check); + printf("WARNING: fixing fr_checkp\n"); + } + fr_checkp = fr_check; + counter++; + if (counter == 10000) + counter = 0; + } + # endif + # ifdef M_CANFASTFWD /* * XXX For now, IP Filter and fast-forwarding of cached flows *************** *** 1511,1517 **** * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 ! * $Id: fil.c,v 2.35.2.65 2002/10/26 06:21:26 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, --- 1531,1537 ---- * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 ! * $Id: fil.c,v 2.35.2.67 2002/12/06 13:28:05 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, diff -cr ip_fil3.4.30/fils.c ip_fil3.4.31/fils.c *** ip_fil3.4.30/fils.c Sat Nov 2 14:38:06 2002 --- ip_fil3.4.31/fils.c Fri Dec 6 22:40:20 2002 *************** *** 12,18 **** # endif # endif #endif ! #ifdef __sgi # include #endif #include --- 12,18 ---- # endif # endif #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 99,105 **** #if !defined(lint) static const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: fils.c,v 2.21.2.39 2002/11/02 03:38:06 darrenr Exp $"; #endif extern char *optarg; --- 99,105 ---- #if !defined(lint) static const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: fils.c,v 2.21.2.40 2002/12/06 11:40:20 darrenr Exp $"; #endif extern char *optarg; diff -cr ip_fil3.4.30/ip_auth.c ip_fil3.4.31/ip_auth.c *** ip_fil3.4.30/ip_auth.c Sat Nov 2 14:29:07 2002 --- ip_fil3.4.31/ip_auth.c Fri Dec 6 22:40:21 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 104,110 **** #endif #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.23 2002/11/02 03:29:07 darrenr Exp $"; #endif --- 104,110 ---- #endif #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.24 2002/12/06 11:40:21 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ip_fil.c ip_fil3.4.31/ip_fil.c *** ip_fil3.4.30/ip_fil.c Mon Nov 25 21:56:37 2002 --- ip_fil3.4.31/ip_fil.c Fri Dec 6 22:45:45 2002 *************** *** 24,30 **** # include # endif #endif ! #ifdef __sgi # define _KMEMUSER # include #endif --- 24,30 ---- # include # endif #endif ! #if defined(__sgi) && (IRIX > 602) # define _KMEMUSER # include #endif *************** *** 124,130 **** #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.42.2.63 2002/11/25 10:56:37 darrenr Exp $"; #endif --- 124,130 ---- #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.42.2.64 2002/12/06 11:45:45 darrenr Exp $"; #endif *************** *** 332,338 **** # endif ! # if defined(__NetBSD__) int ipl_enable() # else int iplattach() --- 332,338 ---- # endif ! # if defined(__NetBSD__) || defined(__OpenBSD__) int ipl_enable() # else int iplattach() *************** *** 376,385 **** # ifdef NETBSD_PF # if (__NetBSD_Version__ >= 104200000) || (__FreeBSD_version >= 500011) # if __NetBSD_Version__ >= 105110000 ! if ( ! !(ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET)) # ifdef USE_INET6 ! && !(ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6)) # endif ) return ENODEV; --- 376,388 ---- # ifdef NETBSD_PF # if (__NetBSD_Version__ >= 104200000) || (__FreeBSD_version >= 500011) # if __NetBSD_Version__ >= 105110000 ! ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); # ifdef USE_INET6 ! ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); ! # endif ! if (ph_inet == NULL ! # ifdef USE_INET6 ! && ph_inet6 == NULL # endif ) return ENODEV; *************** *** 717,723 **** if (error) break; if (enable) ! # if defined(__NetBSD__) error = ipl_enable(); # else error = iplattach(); --- 720,726 ---- if (error) break; if (enable) ! # if defined(__NetBSD__) || defined(__OpenBSD__) error = ipl_enable(); # else error = iplattach(); *************** *** 1520,1526 **** iplinit() { ! # if defined(__NetBSD__) if (ipl_enable() != 0) # else if (iplattach() != 0) --- 1523,1529 ---- iplinit() { ! # if defined(__NetBSD__) || defined(__OpenBSD__) if (ipl_enable() != 0) # else if (iplattach() != 0) *************** *** 1625,1631 **** /* * Route packet. */ ! #ifdef __sgi ROUTE_RDLOCK(); #endif bzero((caddr_t)ro, sizeof (*ro)); --- 1628,1634 ---- /* * Route packet. */ ! #if defined(__sgi) && (IRIX >= 605) ROUTE_RDLOCK(); #endif bzero((caddr_t)ro, sizeof (*ro)); *************** *** 1665,1671 **** rtalloc(ro); # endif ! #ifdef __sgi ROUTE_UNLOCK(); #endif --- 1668,1674 ---- rtalloc(ro); # endif ! #if defined(__sgi) && (IRIX > 602) ROUTE_UNLOCK(); #endif diff -cr ip_fil3.4.30/ip_frag.c ip_fil3.4.31/ip_frag.c *** ip_fil3.4.30/ip_frag.c Wed Aug 28 22:41:04 2002 --- ip_fil3.4.31/ip_frag.c Fri Dec 6 22:40:21 2002 *************** *** 7,13 **** # define _KERNEL #endif ! #ifdef __sgi # include #endif #include --- 7,13 ---- # define _KERNEL #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 90,96 **** #if !defined(lint) static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.10.2.24 2002/08/28 12:41:04 darrenr Exp $"; #endif --- 90,96 ---- #if !defined(lint) static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.10.2.25 2002/12/06 11:40:21 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ip_nat.c ip_fil3.4.31/ip_nat.c *** ip_fil3.4.30/ip_nat.c Wed Nov 27 22:23:58 2002 --- ip_fil3.4.31/ip_nat.c Fri Dec 6 22:40:21 2002 *************** *** 9,15 **** #define _KERNEL #endif ! #ifdef __sgi # include #endif #include --- 9,15 ---- #define _KERNEL #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 109,115 **** #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.37.2.73 2002/11/27 09:28:43 darrenr Exp $"; #endif nat_t **nat_table[2] = { NULL, NULL }, --- 109,115 ---- #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.37.2.74 2002/12/06 11:40:21 darrenr Exp $"; #endif nat_t **nat_table[2] = { NULL, NULL }, diff -cr ip_fil3.4.30/ip_proxy.c ip_fil3.4.31/ip_proxy.c *** ip_fil3.4.30/ip_proxy.c Sat Nov 2 14:35:09 2002 --- ip_fil3.4.31/ip_proxy.c Fri Dec 6 22:40:23 2002 *************** *** 7,13 **** # define _KERNEL #endif ! #ifdef __sgi # include #endif #include --- 7,13 ---- # define _KERNEL #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 75,81 **** #endif #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.9.2.25 2002/11/02 03:35:09 darrenr Exp $"; #endif #if defined(_KERNEL) && (SOLARIS || defined(__sgi)) --- 75,81 ---- #endif #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.9.2.26 2002/12/06 11:40:23 darrenr Exp $"; #endif #if defined(_KERNEL) && (SOLARIS || defined(__sgi)) diff -cr ip_fil3.4.30/ip_sfil.c ip_fil3.4.31/ip_sfil.c *** ip_fil3.4.30/ip_sfil.c Sat Nov 2 14:30:36 2002 --- ip_fil3.4.31/ip_sfil.c Fri Dec 6 22:42:22 2002 *************** *** 7,13 **** */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_sfil.c,v 2.23.2.23 2002/11/02 03:30:36 darrenr Exp $"; #endif #include --- 7,13 ---- */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_sfil.c,v 2.23.2.24 2002/12/06 11:42:22 darrenr Exp $"; #endif #include *************** *** 409,414 **** --- 409,417 ---- { size_t len = strlen(name) + 1; /* includes \0 */ ill_t *il; + #if SOLARIS2 >= 10 + ill_walk_context_t ctx; + #endif int sap; if (v == 4) *************** *** 417,423 **** --- 420,430 ---- sap = 0x86dd; else return NULL; + #if SOLARIS2 >= 10 + for (il = ILL_START_WALK_ALL(&ctx); il; il = ill_next(&ctx, il)) + #else for (il = ill_g_head; il; il = il->ill_next) + #endif if ((len == il->ill_name_length) && (il->ill_sap == sap) && !strncmp(il->ill_name, name, len)) return il; diff -cr ip_fil3.4.30/ip_state.c ip_fil3.4.31/ip_state.c *** ip_fil3.4.30/ip_state.c Sat Oct 26 16:21:28 2002 --- ip_fil3.4.31/ip_state.c Fri Dec 6 22:40:24 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 93,99 **** #if !defined(lint) static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.30.2.76 2002/10/26 06:21:28 darrenr Exp $"; #endif #ifndef MIN --- 93,99 ---- #if !defined(lint) static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.30.2.77 2002/12/06 11:40:24 darrenr Exp $"; #endif #ifndef MIN diff -cr ip_fil3.4.30/ipf.c ip_fil3.4.31/ipf.c *** ip_fil3.4.30/ipf.c Wed Oct 2 01:26:48 2002 --- ip_fil3.4.31/ipf.c Fri Dec 6 22:41:13 2002 *************** *** 12,18 **** # endif # endif #endif ! #ifdef __sgi # include #endif #include --- 12,18 ---- # endif # endif #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 50,56 **** #if !defined(lint) static const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipf.c,v 2.10.2.18 2002/10/01 15:26:48 darrenr Exp $"; #endif #if SOLARIS --- 50,56 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipf.c,v 2.10.2.19 2002/12/06 11:41:13 darrenr Exp $"; #endif #if SOLARIS diff -cr ip_fil3.4.30/ipft_ef.c ip_fil3.4.31/ipft_ef.c *** ip_fil3.4.30/ipft_ef.c Fri Jun 28 00:29:17 2002 --- ip_fil3.4.31/ipft_ef.c Fri Dec 6 22:40:25 2002 *************** *** 17,23 **** 0.32 91 04 131.170.1.10 128.250.133.13 0.33 566 udp 128.250.37.155 128.250.133.3 901 901 */ ! #ifdef __sgi # include #endif #include --- 17,23 ---- 0.32 91 04 131.170.1.10 128.250.133.13 0.33 566 udp 128.250.37.155 128.250.133.3 901 901 */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 52,58 **** #if !defined(lint) static const char sccsid[] = "@(#)ipft_ef.c 1.6 2/4/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 2.2.2.3 2002/06/27 14:29:17 darrenr Exp $"; #endif static int etherf_open __P((char *)); --- 52,58 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipft_ef.c 1.6 2/4/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 2.2.2.4 2002/12/06 11:40:25 darrenr Exp $"; #endif static int etherf_open __P((char *)); diff -cr ip_fil3.4.30/ipft_hx.c ip_fil3.4.31/ipft_hx.c *** ip_fil3.4.30/ipft_hx.c Sat Feb 23 02:32:54 2002 --- ip_fil3.4.31/ipft_hx.c Fri Dec 6 22:40:25 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 43,49 **** #if !defined(lint) static const char sccsid[] = "@(#)ipft_hx.c 1.1 3/9/96 (C) 1996 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 2.2.2.5 2002/02/22 15:32:54 darrenr Exp $"; #endif extern int opts; --- 43,49 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipft_hx.c 1.1 3/9/96 (C) 1996 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 2.2.2.6 2002/12/06 11:40:25 darrenr Exp $"; #endif extern int opts; diff -cr ip_fil3.4.30/ipft_pc.c ip_fil3.4.31/ipft_pc.c *** ip_fil3.4.30/ipft_pc.c Sat Oct 26 16:47:11 2002 --- ip_fil3.4.31/ipft_pc.c Fri Dec 6 22:40:25 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 35,41 **** #include "ipt.h" #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 2.2.2.4 2002/10/26 06:47:11 darrenr Exp $"; #endif struct llc { --- 35,41 ---- #include "ipt.h" #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 2.2.2.5 2002/12/06 11:40:25 darrenr Exp $"; #endif struct llc { diff -cr ip_fil3.4.30/ipft_sn.c ip_fil3.4.31/ipft_sn.c *** ip_fil3.4.30/ipft_sn.c Sat Feb 23 02:32:54 2002 --- ip_fil3.4.31/ipft_sn.c Fri Dec 6 22:40:26 2002 *************** *** 7,13 **** /* * Written to comply with the recent RFC 1761 from Sun. */ ! #ifdef __sgi # include #endif #include --- 7,13 ---- /* * Written to comply with the recent RFC 1761 from Sun. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 38,44 **** #include "ipt.h" #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 2.2.2.3 2002/02/22 15:32:54 darrenr Exp $"; #endif struct llc { --- 38,44 ---- #include "ipt.h" #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 2.2.2.4 2002/12/06 11:40:26 darrenr Exp $"; #endif struct llc { diff -cr ip_fil3.4.30/ipft_td.c ip_fil3.4.31/ipft_td.c *** ip_fil3.4.30/ipft_td.c Fri Jun 28 00:29:17 2002 --- ip_fil3.4.31/ipft_td.c Fri Dec 6 22:40:26 2002 *************** *** 26,32 **** 8:0:20:f:65:f7 0:0:c:1:8a:c5 81: 128.250.133.13.23 > 128.250.20.20.2419: tcp 27 */ ! #ifdef __sgi # include #endif #include --- 26,32 ---- 8:0:20:f:65:f7 0:0:c:1:8a:c5 81: 128.250.133.13.23 > 128.250.20.20.2419: tcp 27 */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 61,67 **** #if !defined(lint) static const char sccsid[] = "@(#)ipft_td.c 1.8 2/4/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_td.c,v 2.2.2.3 2002/06/27 14:29:17 darrenr Exp $"; #endif static int tcpd_open __P((char *)); --- 61,67 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipft_td.c 1.8 2/4/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_td.c,v 2.2.2.4 2002/12/06 11:40:26 darrenr Exp $"; #endif static int tcpd_open __P((char *)); diff -cr ip_fil3.4.30/ipft_tx.c ip_fil3.4.31/ipft_tx.c *** ip_fil3.4.30/ipft_tx.c Fri Jun 28 00:29:17 2002 --- ip_fil3.4.31/ipft_tx.c Fri Dec 6 22:40:26 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 44,50 **** #if !defined(lint) static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 2.3.2.7 2002/06/27 14:29:17 darrenr Exp $"; #endif extern int opts; --- 44,50 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 2.3.2.8 2002/12/06 11:40:26 darrenr Exp $"; #endif extern int opts; diff -cr ip_fil3.4.30/ipl.h ip_fil3.4.31/ipl.h *** ip_fil3.4.30/ipl.h Tue Nov 26 21:34:13 2002 --- ip_fil3.4.31/ipl.h Sat Dec 7 13:40:05 2002 *************** *** 4,15 **** * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ipl.h 1.21 6/5/96 ! * $Id: ipl.h,v 2.15.2.37 2002/11/26 10:34:13 darrenr Exp $ */ #ifndef __IPL_H__ #define __IPL_H__ ! #define IPL_VERSION "IP Filter: v3.4.30" #endif --- 4,15 ---- * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ipl.h 1.21 6/5/96 ! * $Id: ipl.h,v 2.15.2.38 2002/12/07 02:40:05 darrenr Exp $ */ #ifndef __IPL_H__ #define __IPL_H__ ! #define IPL_VERSION "IP Filter: v3.4.31" #endif diff -cr ip_fil3.4.30/iplang/iplang_y.y ip_fil3.4.31/iplang/iplang_y.y *** ip_fil3.4.30/iplang/iplang_y.y Sat Feb 23 02:32:57 2002 --- ip_fil3.4.31/iplang/iplang_y.y Fri Dec 6 22:41:14 2002 *************** *** 6,15 **** * provided that this notice is preserved and due credit is given * to the original author and the contributors. * ! * $Id: iplang_y.y,v 2.2.2.2 2002/02/22 15:32:57 darrenr Exp $ */ ! #ifdef __sgi # include #endif #include --- 6,15 ---- * provided that this notice is preserved and due credit is given * to the original author and the contributors. * ! * $Id: iplang_y.y,v 2.2.2.3 2002/12/06 11:41:14 darrenr Exp $ */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 52,58 **** #include "iplang.h" #if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ ! __FreeBSD_version < 400020) extern struct ether_addr *ether_aton __P((char *)); #endif --- 52,58 ---- #include "iplang.h" #if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ ! __FreeBSD_version < 400020 ) && SOLARIS2 < 10 extern struct ether_addr *ether_aton __P((char *)); #endif diff -cr ip_fil3.4.30/ipmon.c ip_fil3.4.31/ipmon.c *** ip_fil3.4.30/ipmon.c Fri Aug 23 01:12:23 2002 --- ip_fil3.4.31/ipmon.c Fri Dec 6 22:40:26 2002 *************** *** 7,13 **** #define SOLARIS (defined(__SVR4) || defined(__svr4__)) && defined(sun) #endif ! #ifdef __sgi # include #endif #include --- 7,13 ---- #define SOLARIS (defined(__SVR4) || defined(__svr4__)) && defined(sun) #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 68,74 **** #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.36 2002/08/22 15:12:23 darrenr Exp $"; #endif --- 68,74 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.37 2002/12/06 11:40:26 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipnat.c ip_fil3.4.31/ipnat.c *** ip_fil3.4.30/ipnat.c Thu Jun 6 20:49:19 2002 --- ip_fil3.4.31/ipnat.c Fri Dec 6 22:40:26 2002 *************** *** 5,11 **** * * Added redirect stuff and a variety of bug fixes. (mcn@EnGarde.com) */ ! #ifdef __sgi # include #endif #include --- 5,11 ---- * * Added redirect stuff and a variety of bug fixes. (mcn@EnGarde.com) */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 60,66 **** #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.16.2.21 2002/06/06 10:49:19 darrenr Exp $"; #endif --- 60,66 ---- #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.16.2.22 2002/12/06 11:40:26 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/44arp.c ip_fil3.4.31/ipsend/44arp.c *** ip_fil3.4.30/ipsend/44arp.c Sat Feb 23 02:32:57 2002 --- ip_fil3.4.31/ipsend/44arp.c Fri Dec 6 22:40:35 2002 *************** *** 1,7 **** /* * Based upon 4.4BSD's /usr/sbin/arp */ ! #ifdef __sgi # include #endif #include --- 1,7 ---- /* * Based upon 4.4BSD's /usr/sbin/arp */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include diff -cr ip_fil3.4.30/ipsend/arp.c ip_fil3.4.31/ipsend/arp.c *** ip_fil3.4.30/ipsend/arp.c Sat Feb 23 02:32:57 2002 --- ip_fil3.4.31/ipsend/arp.c Fri Dec 6 22:40:35 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 29,35 **** #if !defined(lint) static const char sccsid[] = "@(#)arp.c 1.4 1/11/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: arp.c,v 2.1.4.3 2002/02/22 15:32:57 darrenr Exp $"; #endif --- 29,35 ---- #if !defined(lint) static const char sccsid[] = "@(#)arp.c 1.4 1/11/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: arp.c,v 2.1.4.4 2002/12/06 11:40:35 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/ip.c ip_fil3.4.31/ipsend/ip.c *** ip_fil3.4.30/ipsend/ip.c Sat Feb 23 02:32:57 2002 --- ip_fil3.4.31/ipsend/ip.c Fri Dec 6 22:40:35 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 32,38 **** #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995"; ! static const char rcsid[] = "@(#)$Id: ip.c,v 2.1.4.4 2002/02/22 15:32:57 darrenr Exp $"; #endif static char *ipbuf = NULL, *ethbuf = NULL; --- 32,38 ---- #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995"; ! static const char rcsid[] = "@(#)$Id: ip.c,v 2.1.4.5 2002/12/06 11:40:35 darrenr Exp $"; #endif static char *ipbuf = NULL, *ethbuf = NULL; diff -cr ip_fil3.4.30/ipsend/ipresend.c ip_fil3.4.31/ipsend/ipresend.c *** ip_fil3.4.30/ipsend/ipresend.c Sat Feb 23 02:32:57 2002 --- ip_fil3.4.31/ipsend/ipresend.c Fri Dec 6 22:40:35 2002 *************** *** 8,14 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 8,14 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 34,40 **** #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipresend.c,v 2.1.4.3 2002/02/22 15:32:57 darrenr Exp $"; #endif --- 34,40 ---- #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipresend.c,v 2.1.4.4 2002/12/06 11:40:35 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/ipsend.c ip_fil3.4.31/ipsend/ipsend.c *** ip_fil3.4.30/ipsend/ipsend.c Wed Apr 24 00:58:57 2002 --- ip_fil3.4.31/ipsend/ipsend.c Fri Dec 6 22:40:35 2002 *************** *** 8,14 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 8,14 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 34,40 **** #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.2.2.5 2002/04/23 14:58:57 darrenr Exp $"; #endif --- 34,40 ---- #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.2.2.6 2002/12/06 11:40:35 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/ipsopt.c ip_fil3.4.31/ipsend/ipsopt.c *** ip_fil3.4.30/ipsend/ipsopt.c Sat Feb 23 02:32:58 2002 --- ip_fil3.4.31/ipsend/ipsopt.c Fri Dec 6 22:40:35 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 25,31 **** #if !defined(lint) static const char sccsid[] = "@(#)ipsopt.c 1.2 1/11/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipsopt.c,v 2.1.4.3 2002/02/22 15:32:58 darrenr Exp $"; #endif --- 25,31 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipsopt.c 1.2 1/11/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipsopt.c,v 2.1.4.4 2002/12/06 11:40:35 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/iptest.c ip_fil3.4.31/ipsend/iptest.c *** ip_fil3.4.30/ipsend/iptest.c Sat Feb 23 02:32:58 2002 --- ip_fil3.4.31/ipsend/iptest.c Fri Dec 6 22:40:35 2002 *************** *** 8,14 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 8,14 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 37,43 **** #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: iptest.c,v 2.2.2.3 2002/02/22 15:32:58 darrenr Exp $"; #endif --- 37,43 ---- #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: iptest.c,v 2.2.2.4 2002/12/06 11:40:35 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/iptests.c ip_fil3.4.31/ipsend/iptests.c *** ip_fil3.4.30/ipsend/iptests.c Tue Nov 26 23:44:11 2002 --- ip_fil3.4.31/ipsend/iptests.c Fri Dec 6 22:40:35 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 82,88 **** #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: iptests.c,v 2.1.4.7 2002/11/26 12:44:11 darrenr Exp $"; #endif --- 82,88 ---- #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: iptests.c,v 2.1.4.8 2002/12/06 11:40:35 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/lsock.c ip_fil3.4.31/ipsend/lsock.c *** ip_fil3.4.30/ipsend/lsock.c Sat Feb 23 02:32:58 2002 --- ip_fil3.4.31/ipsend/lsock.c Fri Dec 6 22:40:36 2002 *************** *** 5,13 **** */ #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.1.4.2 2002/02/22 15:32:58 darrenr Exp $"; #endif ! #ifdef __sgi # include #endif #include --- 5,13 ---- */ #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.1.4.3 2002/12/06 11:40:36 darrenr Exp $"; #endif ! #if defined(__sgi) && (IRIX > 602) # include #endif #include diff -cr ip_fil3.4.30/ipsend/resend.c ip_fil3.4.31/ipsend/resend.c *** ip_fil3.4.30/ipsend/resend.c Sat Feb 23 02:32:58 2002 --- ip_fil3.4.31/ipsend/resend.c Fri Dec 6 22:40:36 2002 *************** *** 8,14 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 8,14 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 38,44 **** #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.1.4.4 2002/02/22 15:32:58 darrenr Exp $"; #endif --- 38,44 ---- #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.1.4.5 2002/12/06 11:40:36 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipsend/sirix.c ip_fil3.4.31/ipsend/sirix.c *** ip_fil3.4.30/ipsend/sirix.c Sat Feb 23 02:32:58 2002 --- ip_fil3.4.31/ipsend/sirix.c Fri Dec 6 22:40:36 2002 *************** *** 4,10 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 4,10 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include diff -cr ip_fil3.4.30/ipsend/sock.c ip_fil3.4.31/ipsend/sock.c *** ip_fil3.4.30/ipsend/sock.c Sat Feb 23 02:32:58 2002 --- ip_fil3.4.31/ipsend/sock.c Fri Dec 6 22:40:36 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 65,71 **** #if !defined(lint) static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: sock.c,v 2.1.4.5 2002/02/22 15:32:58 darrenr Exp $"; #endif --- 65,71 ---- #if !defined(lint) static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: sock.c,v 2.1.4.6 2002/12/06 11:40:36 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/ipt.c ip_fil3.4.31/ipt.c *** ip_fil3.4.30/ipt.c Sat Oct 26 16:53:06 2002 --- ip_fil3.4.31/ipt.c Fri Dec 6 22:40:26 2002 *************** *** 12,18 **** # endif # endif #endif ! #ifdef __sgi # define _KMEMUSER # include #endif --- 12,18 ---- # endif # endif #endif ! #if defined(__sgi) && (IRIX > 602) # define _KMEMUSER # include #endif *************** *** 64,70 **** #if !defined(lint) static const char sccsid[] = "@(#)ipt.c 1.19 6/3/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipt.c,v 2.6.2.23 2002/10/26 06:53:06 darrenr Exp $"; #endif extern char *optarg; --- 64,70 ---- #if !defined(lint) static const char sccsid[] = "@(#)ipt.c 1.19 6/3/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: ipt.c,v 2.6.2.24 2002/12/06 11:40:26 darrenr Exp $"; #endif extern char *optarg; diff -cr ip_fil3.4.30/kmem.c ip_fil3.4.31/kmem.c *** ip_fil3.4.30/kmem.c Sun Jul 28 01:59:37 2002 --- ip_fil3.4.31/kmem.c Fri Dec 6 22:40:27 2002 *************** *** 8,14 **** * returns 0 on success, -1 on error. */ ! #ifdef __sgi # include #endif #include --- 8,14 ---- * returns 0 on success, -1 on error. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 46,52 **** #if !defined(lint) static const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: kmem.c,v 2.2.2.15 2002/07/27 15:59:37 darrenr Exp $"; #endif #ifdef __sgi --- 46,52 ---- #if !defined(lint) static const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: kmem.c,v 2.2.2.16 2002/12/06 11:40:27 darrenr Exp $"; #endif #ifdef __sgi diff -cr ip_fil3.4.30/misc.c ip_fil3.4.31/misc.c *** ip_fil3.4.30/misc.c Fri Apr 26 20:24:24 2002 --- ip_fil3.4.31/misc.c Fri Dec 6 22:40:27 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #if (SOLARIS2 >= 7) --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #if (SOLARIS2 >= 7) *************** *** 53,59 **** #if !defined(lint) static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.8 2002/04/26 10:24:24 darrenr Exp $"; #endif extern int opts; --- 53,59 ---- #if !defined(lint) static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.9 2002/12/06 11:40:27 darrenr Exp $"; #endif extern int opts; diff -cr ip_fil3.4.30/mli_ipl.c ip_fil3.4.31/mli_ipl.c *** ip_fil3.4.30/mli_ipl.c Sat Feb 23 02:32:55 2002 --- ip_fil3.4.31/mli_ipl.c Tue Dec 3 22:28:04 2002 *************** *** 274,283 **** static void nifattach() { - nif_t *nif, *qf2; struct ifnet *ifp; struct frentry *f; ipnat_t *np; MUTEX_ENTER(&ipfi_mutex); /* sets interrupt priority level to splhi */ --- 274,283 ---- static void nifattach() { struct ifnet *ifp; struct frentry *f; ipnat_t *np; + nif_t *nif; MUTEX_ENTER(&ipfi_mutex); /* sets interrupt priority level to splhi */ *************** *** 430,437 **** static void nifdetach() { - nif_t *nif, *qf2, **qp; struct ifnet *ifp; MUTEX_ENTER(&ipfi_mutex); /* sets interrupt priority level to splhi */ /* --- 430,437 ---- static void nifdetach() { struct ifnet *ifp; + nif_t *nif, **qp; MUTEX_ENTER(&ipfi_mutex); /* sets interrupt priority level to splhi */ /* diff -cr ip_fil3.4.30/mln_ipl.c ip_fil3.4.31/mln_ipl.c *** ip_fil3.4.30/mln_ipl.c Wed Oct 2 01:27:01 2002 --- ip_fil3.4.31/mln_ipl.c Fri Dec 6 22:46:42 2002 *************** *** 61,67 **** extern int lkmenodev __P((void)); ! #if NetBSD >= 199706 int if_ipl_lkmentry __P((struct lkm_table *, int, int)); #else #if defined(OpenBSD) --- 61,67 ---- extern int lkmenodev __P((void)); ! #if (NetBSD >= 199706) || (defined(OpenBSD) && (OpenBSD >= 200211)) int if_ipl_lkmentry __P((struct lkm_table *, int, int)); #else #if defined(OpenBSD) *************** *** 128,134 **** extern int nchrdev; ! #if NetBSD >= 199706 int if_ipl_lkmentry(lkmtp, cmd, ver) #else #if defined(OpenBSD) --- 128,134 ---- extern int nchrdev; ! #if (NetBSD >= 199706) || (defined(OpenBSD) && (OpenBSD >= 200211)) int if_ipl_lkmentry(lkmtp, cmd, ver) #else #if defined(OpenBSD) *************** *** 237,243 **** --- 237,247 ---- * Unloading - remove the filter rule check from the IP * input/output stream. */ + #if defined(__NetBSD__) + error = ipl_disable(); + #else error = ipldetach(); + #endif if (!error) error = ipl_remove(); diff -cr ip_fil3.4.30/natparse.c ip_fil3.4.31/natparse.c *** ip_fil3.4.30/natparse.c Mon Nov 4 00:06:22 2002 --- ip_fil3.4.31/natparse.c Fri Dec 6 22:40:27 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 56,62 **** #if !defined(lint) static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: natparse.c,v 1.17.2.26 2002/11/03 13:06:22 darrenr Exp $"; #endif --- 56,62 ---- #if !defined(lint) static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: natparse.c,v 1.17.2.27 2002/12/06 11:40:27 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/opt.c ip_fil3.4.31/opt.c *** ip_fil3.4.30/opt.c Sat Feb 23 02:32:56 2002 --- ip_fil3.4.31/opt.c Fri Dec 6 22:40:27 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 28,34 **** #if !defined(lint) static const char sccsid[] = "@(#)opt.c 1.8 4/10/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: opt.c,v 2.2.2.2 2002/02/22 15:32:56 darrenr Exp $"; #endif extern int opts; --- 28,34 ---- #if !defined(lint) static const char sccsid[] = "@(#)opt.c 1.8 4/10/96 (C) 1993-2000 Darren Reed"; ! static const char rcsid[] = "@(#)$Id: opt.c,v 2.2.2.3 2002/12/06 11:40:27 darrenr Exp $"; #endif extern int opts; diff -cr ip_fil3.4.30/parse.c ip_fil3.4.31/parse.c *** ip_fil3.4.30/parse.c Sat Oct 26 15:10:39 2002 --- ip_fil3.4.31/parse.c Fri Dec 6 22:40:27 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include diff -cr ip_fil3.4.30/printnat.c ip_fil3.4.31/printnat.c *** ip_fil3.4.30/printnat.c Mon Nov 4 00:06:22 2002 --- ip_fil3.4.31/printnat.c Fri Dec 6 22:40:27 2002 *************** *** 5,11 **** * * Added redirect stuff and a variety of bug fixes. (mcn@EnGarde.com) */ ! #ifdef __sgi # include #endif #include --- 5,11 ---- * * Added redirect stuff and a variety of bug fixes. (mcn@EnGarde.com) */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include *************** *** 58,64 **** #endif #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.12 2002/11/03 13:06:22 darrenr Exp $"; #endif --- 58,64 ---- #endif #if !defined(lint) ! static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.13 2002/12/06 11:40:27 darrenr Exp $"; #endif diff -cr ip_fil3.4.30/printstate.c ip_fil3.4.31/printstate.c *** ip_fil3.4.30/printstate.c Sun Apr 21 02:42:37 2002 --- ip_fil3.4.31/printstate.c Fri Dec 6 22:40:28 2002 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. */ ! #ifdef __sgi # include #endif #include --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. */ ! #if defined(__sgi) && (IRIX > 602) # include #endif #include diff -cr ip_fil3.4.30/solaris.c ip_fil3.4.31/solaris.c *** ip_fil3.4.30/solaris.c Fri Jun 28 00:39:41 2002 --- ip_fil3.4.31/solaris.c Fri Dec 6 22:42:22 2002 *************** *** 4,10 **** * See the IPFILTER.LICENCE file for details on licencing. */ /* #pragma ident "@(#)solaris.c 1.12 6/5/96 (C) 1995 Darren Reed"*/ ! #pragma ident "@(#)$Id: solaris.c,v 2.15.2.32 2002/06/27 14:39:41 darrenr Exp $" #include #include --- 4,10 ---- * See the IPFILTER.LICENCE file for details on licencing. */ /* #pragma ident "@(#)solaris.c 1.12 6/5/96 (C) 1995 Darren Reed"*/ ! #pragma ident "@(#)$Id: solaris.c,v 2.15.2.33 2002/12/06 11:42:22 darrenr Exp $" #include #include *************** *** 1405,1412 **** ipnat_t *np; size_t len; ill_t *il; ! for (il = ill_g_head; il; il = il->ill_next) { in = il->ill_rq; if (!in || !il->ill_wq) continue; --- 1405,1418 ---- ipnat_t *np; size_t len; ill_t *il; + #if SOLARIS2 >= 10 + ill_walk_context_t ctx; ! for (il = ILL_START_WALK_ALL(&ctx); il; il = ill_next(&ctx, il)) ! #else ! for (il = ill_g_head; il; il = il->ill_next) ! #endif ! { in = il->ill_rq; if (!in || !il->ill_wq) continue; *************** *** 1655,1665 **** --- 1661,1679 ---- register ipnat_t *np; register qif_t *qif, **qp; register ill_t *il; + #if SOLARIS2 >= 10 + ill_walk_context_t ctx; + #endif queue_t *in, *out; WRITE_ENTER(&ipfs_mutex); for (qp = &qif_head; (qif = *qp); ) { + #if SOLARIS2 >= 10 + il = ILL_START_WALK_ALL(&ctx); + for (; il; il = ill_next(&ctx, il)) + #else for (il = ill_g_head; il; il = il->ill_next) + #endif if ((qif->qf_ill == il) && !strcmp(qif->qf_name, il->ill_name)) { #if SOLARIS2 < 8 *************** *** 1752,1758 **** /* * Resync. any NAT `connections' using this interface and its IP #. */ ! for (il = ill_g_head; il; il = il->ill_next) { ip_natsync((void *)il); ip_statesync((void *)il); } --- 1766,1777 ---- /* * Resync. any NAT `connections' using this interface and its IP #. */ ! #if SOLARIS2 >= 10 ! for (il = ILL_START_WALK_ALL(&ctx); il; il = ill_next(&ctx, il)) ! #else ! for (il = ill_g_head; il; il = il->ill_next) ! #endif ! { ip_natsync((void *)il); ip_statesync((void *)il); } *************** *** 1768,1773 **** --- 1787,1795 ---- queue_t *in, *out; qif_t *qif, **qp; ill_t *il; + #if SOLARIS2 >= 10 + ill_walk_context_t ctx; + #endif WRITE_ENTER(&ipfs_mutex); /* *************** *** 1775,1781 **** --- 1797,1808 ---- * unlink known devices. */ for (qp = &qif_head; (qif = *qp); ) { + #if SOLARIS2 >= 10 + il = ILL_START_WALK_ALL(&ctx); + for (; il; il = ill_next(&ctx, il)) + #else for (il = ill_g_head; il; il = il->ill_next) + #endif if (qif->qf_ill == il) break; if (il) { *************** *** 1789,1795 **** --- 1816,1827 ---- while ((qif = qif_head)) { qif_head = qif->qf_next; + #if SOLARIS2 >= 10 + il = ILL_START_WALK_ALL(&ctx); + for (; il; il = ill_next(&ctx, il)) + #else for (il = ill_g_head; il; il = il->ill_next) + #endif if (qif->qf_ill == il) break; if (il) {