diff -cr ip_fil3.4.34/BSD/kupgrade ip_fil3.4.35/BSD/kupgrade *** ip_fil3.4.34/BSD/kupgrade Mon Nov 25 21:57:16 2002 --- ip_fil3.4.35/BSD/kupgrade Sun Jun 20 20:28:49 2004 *************** *** 16,21 **** --- 16,24 ---- echo "Copying /usr/include/osreldate.h to /sys/sys" cp /usr/include/osreldate.h /sys/sys fi + if [ -f /sys/contrib/ipfilter/netinet/mlfk_ipl.c ] ; then + /bin/cp mlfk_ipl.c /sys/contrib/ipfilter/netinet/ + fi fi archdir="/sys/arch/$karch" ipfdir=/sys/netinet diff -cr ip_fil3.4.34/HISTORY ip_fil3.4.35/HISTORY *** ip_fil3.4.34/HISTORY Tue Apr 20 22:09:10 2004 --- ip_fil3.4.35/HISTORY Mon Jun 21 21:49:08 2004 *************** *** 22,27 **** --- 22,38 ---- # and especially those who have found the time to port IP Filter to new # platforms. # + 3.4.35 21/6/2004 - Released + + some cases of ICMP checksum alteration were wrong + + block packets that fail to create state table entries + + correctly handle all return values from ip_natout() when fastrouting + + ipmon was not correctly calculating the length of the IPv6 packet (excluded + ipv6 header length) + 3.4.34 20/4/2004 - Released correct the ICMP packet checksum fixing up when processing ICMP errors for NAT Only in ip_fil3.4.35/OpenBSD-3: 3.4-MAKEDEV-diffs Only in ip_fil3.4.35/OpenBSD-3: 3.4-rc-diffs Only in ip_fil3.4.35/OpenBSD-3: 3.4-sys-diffs diff -cr ip_fil3.4.34/OpenBSD-3/README.3_0 ip_fil3.4.35/OpenBSD-3/README.3_0 *** ip_fil3.4.34/OpenBSD-3/README.3_0 Sat Dec 7 14:25:06 2002 --- ip_fil3.4.35/OpenBSD-3/README.3_0 Mon Jun 21 22:48:38 2004 *************** *** 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 --- 29,41 ---- 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.35.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.0-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.35 BSD/kupgrade 4. Build a new OpenBSD kernel *************** *** 49,55 **** 5. Build and install IPFilter ! cd ip_fil3.4.31 make openbsd make install-bsd OpenBSD-3/makedevs-3.0 --- 49,55 ---- 5. Build and install IPFilter ! cd ip_fil3.4.35 make openbsd make install-bsd OpenBSD-3/makedevs-3.0 *************** *** 57,63 **** 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.0-rc-diffs 7. Reboot --- 57,63 ---- 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.0-rc-diffs 7. Reboot diff -cr ip_fil3.4.34/OpenBSD-3/README.3_1 ip_fil3.4.35/OpenBSD-3/README.3_1 *** ip_fil3.4.34/OpenBSD-3/README.3_1 Sat Dec 7 14:25:06 2002 --- ip_fil3.4.35/OpenBSD-3/README.3_1 Mon Jun 21 22:48:39 2004 *************** *** 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 --- 29,41 ---- 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.35.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.1-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.35 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.31 make openbsd make install-bsd OpenBSD-3/makedevs-3.1 --- 52,58 ---- 5. Build and install IPFilter ! cd ip_fil3.4.35 make openbsd make install-bsd OpenBSD-3/makedevs-3.1 *************** *** 60,66 **** 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.1-rc-diffs 7. Reboot --- 60,66 ---- 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.1-rc-diffs 7. Reboot *************** *** 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 --- 79,86 ---- Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.1-rc-diffs ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.1-MAKEDEV-diffs ! cd ~/ip_fil3.4.35 ./OpenBSD-3/fixdist-3.0 diff -cr ip_fil3.4.34/OpenBSD-3/README.3_2 ip_fil3.4.35/OpenBSD-3/README.3_2 *** ip_fil3.4.34/OpenBSD-3/README.3_2 Sat Dec 7 14:25:06 2002 --- ip_fil3.4.35/OpenBSD-3/README.3_2 Mon Jun 21 22:48:39 2004 *************** *** 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 --- 29,41 ---- 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.35.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.2-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.35 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.31 make openbsd make install-bsd OpenBSD-3/makedevs-3.2 --- 52,58 ---- 5. Build and install IPFilter ! cd ip_fil3.4.35 make openbsd make install-bsd OpenBSD-3/makedevs-3.2 *************** *** 60,66 **** 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.31/OpenBSD-3/3.2-rc-diffs 7. Reboot --- 60,66 ---- 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.2-rc-diffs 7. Reboot *************** *** 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 --- 79,86 ---- Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.2-rc-diffs ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.2-MAKEDEV-diffs ! cd ~/ip_fil3.4.35 ./OpenBSD-3/fixdist-3.2 diff -cr ip_fil3.4.34/OpenBSD-3/README.3_3 ip_fil3.4.35/OpenBSD-3/README.3_3 *** ip_fil3.4.34/OpenBSD-3/README.3_3 Thu Jun 26 20:15:56 2003 --- ip_fil3.4.35/OpenBSD-3/README.3_3 Mon Jun 21 22:48:39 2004 *************** *** 29,41 **** 2. Unpack IPFilter and apply the patches to the kernel source cd ~ ! gunzip -c ip_fil3.4.32.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.32/OpenBSD-3/3.3-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.32 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.35.tar.gz | tar xpf - cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.3-sys-diffs 3. Add IPFilter to the source code tree: ! cd ~/ip_fil3.4.35 BSD/kupgrade If you want to build a new release with IPFilter, stop here and goto *************** *** 52,66 **** 5. Build and install IPFilter ! cd ip_fil3.4.32 make openbsd make install-bsd ! OpenBSD-3/makedevs-3.2 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.32/OpenBSD-3/3.3-rc-diffs 7. Reboot --- 52,66 ---- 5. Build and install IPFilter ! cd ip_fil3.4.35 make openbsd make install-bsd ! OpenBSD-3/makedevs-3.3 6. Patch rc scripts in /etc cd /etc ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.3-rc-diffs 7. Reboot *************** *** 79,86 **** Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.32/OpenBSD-3/3.3-rc-diffs ! patch < ~/ip_fil3.4.32/OpenBSD-3/3.3-MAKEDEV-diffs ! cd ~/ip_fil3.4.32 ! ./OpenBSD-3/fixdist-3.2 --- 79,86 ---- Building a Release ================== cd /usr/src ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.3-rc-diffs ! patch < ~/ip_fil3.4.35/OpenBSD-3/3.3-MAKEDEV-diffs ! cd ~/ip_fil3.4.35 ! ./OpenBSD-3/fixdist-3.3 Only in ip_fil3.4.35/OpenBSD-3: README.3_4 Only in ip_fil3.4.35/OpenBSD-3: fixdist-3.4 Only in ip_fil3.4.35/OpenBSD-3: makedevs-3.4 diff -cr ip_fil3.4.34/SunOS5/pkginfo ip_fil3.4.35/SunOS5/pkginfo *** ip_fil3.4.34/SunOS5/pkginfo Tue Apr 20 22:09:11 2004 --- ip_fil3.4.35/SunOS5/pkginfo Fri Jun 4 03:28:20 2004 *************** *** 5,11 **** PKG=ipf NAME=IP Filter ARCH=ARCH_updated_by_sed_when_package_is_built ! VERSION=3.4.34 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.35 CATEGORY=system DESC=This package contains tools for building a firewall VENDOR=Darren Reed diff -cr ip_fil3.4.34/fil.c ip_fil3.4.35/fil.c *** ip_fil3.4.34/fil.c Sat Apr 10 21:45:20 2004 --- ip_fil3.4.35/fil.c Sun Jun 20 20:27:47 2004 *************** *** 98,104 **** #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.80 2004/04/10 11:45:20 darrenr Exp $"; #endif #ifndef _KERNEL --- 98,104 ---- #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.82 2004/06/20 10:27:47 darrenr Exp $"; #endif #ifndef _KERNEL *************** *** 230,236 **** if (v == 4) { fin->fin_id = ip->ip_id; fi->fi_tos = ip->ip_tos; ! #if OpenBSD >= 200311 ip->ip_off = ntohs(ip->ip_off); #endif off = (ip->ip_off & IP_OFFMASK); --- 230,236 ---- if (v == 4) { fin->fin_id = ip->ip_id; fi->fi_tos = ip->ip_tos; ! #if (OpenBSD >= 200311) && defined(_KERNEL) ip->ip_off = ntohs(ip->ip_off); #endif off = (ip->ip_off & IP_OFFMASK); *************** *** 247,253 **** fi->fi_fl = (hlen > sizeof(ip_t)) ? FI_OPTIONS : 0; if (ip->ip_off & (IP_MF|IP_OFFMASK)) fi->fi_fl |= FI_FRAG; ! #if OpenBSD >= 200311 ip->ip_len = ntohs(ip->ip_len); #endif plen = ip->ip_len; --- 247,253 ---- fi->fi_fl = (hlen > sizeof(ip_t)) ? FI_OPTIONS : 0; if (ip->ip_off & (IP_MF|IP_OFFMASK)) fi->fi_fl |= FI_FRAG; ! #if (OpenBSD >= 200311) && defined(_KERNEL) ip->ip_len = ntohs(ip->ip_len); #endif plen = ip->ip_len; *************** *** 821,827 **** #endif /* IPFILTER_LOG */ ATOMIC_INCL(fr->fr_hits); if (passt & FR_ACCOUNT) ! fr->fr_bytes += (U_QUAD_T)ip->ip_len; else fin->fin_icode = fr->fr_icode; fin->fin_rule = rulen; --- 821,827 ---- #endif /* IPFILTER_LOG */ ATOMIC_INCL(fr->fr_hits); if (passt & FR_ACCOUNT) ! fr->fr_bytes += (U_QUAD_T)fin->fin_plen; else fin->fin_icode = fr->fr_icode; fin->fin_rule = rulen; *************** *** 1217,1222 **** --- 1217,1226 ---- if (pass & FR_KEEPSTATE) { if (fr_addstate(ip, fin, NULL, 0) == NULL) { ATOMIC_INCL(frstats[out].fr_bads); + if (pass & FR_PASS) { + pass &= ~FR_PASS; + pass |= FR_BLOCK; + } } else { ATOMIC_INCL(frstats[out].fr_ads); } *************** *** 1398,1404 **** (void) ipfr_fastroute(ip, mc, &mc, fin, &fr->fr_dif); } # endif /* !SOLARIS */ ! #if OpenBSD >= 200311 if (pass & FR_PASS) { ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); --- 1402,1408 ---- (void) ipfr_fastroute(ip, mc, &mc, fin, &fr->fr_dif); } # endif /* !SOLARIS */ ! #if (OpenBSD >= 200311) && defined(_KERNEL) if (pass & FR_PASS) { ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); *************** *** 1645,1651 **** * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 ! * $Id: fil.c,v 2.35.2.80 2004/04/10 11:45:20 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, --- 1649,1655 ---- * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 ! * $Id: fil.c,v 2.35.2.82 2004/06/20 10:27:47 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, diff -cr ip_fil3.4.34/ip_compat.h ip_fil3.4.35/ip_compat.h *** ip_fil3.4.34/ip_compat.h Sat Nov 15 23:23:31 2003 --- ip_fil3.4.35/ip_compat.h Wed Jun 9 10:01:14 2004 *************** *** 4,10 **** * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_compat.h 1.8 1/14/96 ! * $Id: ip_compat.h,v 2.26.2.51 2003/11/15 12:23:31 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ --- 4,10 ---- * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_compat.h 1.8 1/14/96 ! * $Id: ip_compat.h,v 2.26.2.52 2004/06/09 00:01:14 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ *************** *** 262,268 **** # endif # endif # if !defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(USE_INET6) ! # if (defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)) || \ (defined(OpenBSD) && (OpenBSD >= 200111)) || \ (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000)) # define USE_INET6 --- 262,269 ---- # endif # endif # if !defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(USE_INET6) ! # if (defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ ! !defined(NOINET6)) || \ (defined(OpenBSD) && (OpenBSD >= 200111)) || \ (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000)) # define USE_INET6 diff -cr ip_fil3.4.34/ip_fil.c ip_fil3.4.35/ip_fil.c *** ip_fil3.4.34/ip_fil.c Sat Apr 10 21:46:14 2004 --- ip_fil3.4.35/ip_fil.c Thu May 13 09:21:03 2004 *************** *** 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.75 2004/04/10 11:46:14 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.76 2004/05/12 23:21:03 darrenr Exp $"; #endif *************** *** 1559,1565 **** register struct ip *ip, *mhip; register struct mbuf *m = m0; register struct route *ro; ! int len, off, error = 0, hlen, code; struct ifnet *ifp, *sifp; struct sockaddr_in *dst; struct route iproute; --- 1559,1565 ---- register struct ip *ip, *mhip; register struct mbuf *m = m0; register struct route *ro; ! int len, off, error = 0, hlen, code, sout; struct ifnet *ifp, *sifp; struct sockaddr_in *dst; struct route iproute; *************** *** 1713,1718 **** --- 1713,1719 ---- */ if (fin->fin_out == 0) { sifp = fin->fin_ifp; + sout = fin->fin_out; fin->fin_ifp = ifp; fin->fin_out = 1; if ((fin->fin_fr = ipacct[1][fr_active]) && *************** *** 1722,1731 **** fin->fin_fr = NULL; if (!fr || !(fr->fr_flags & FR_RETMASK)) (void) fr_checkstate(ip, fin); ! (void) ip_natout(ip, fin); fin->fin_ifp = sifp; } else ip->ip_sum = 0; /* * If small enough for interface, can just send directly. */ --- 1723,1747 ---- fin->fin_fr = NULL; if (!fr || !(fr->fr_flags & FR_RETMASK)) (void) fr_checkstate(ip, fin); ! ! switch (ip_natout(ip, fin)) ! { ! case 0 : ! break; ! case 1 : ! ip->ip_sum = 0; ! break; ! case -1 : ! error = EINVAL; ! goto done; ! break; ! } ! fin->fin_ifp = sifp; + fin->fin_out = sout; } else ip->ip_sum = 0; + /* * If small enough for interface, can just send directly. */ diff -cr ip_fil3.4.34/ip_ftp_pxy.c ip_fil3.4.35/ip_ftp_pxy.c *** ip_fil3.4.34/ip_ftp_pxy.c Wed Jul 2 01:11:09 2003 --- ip_fil3.4.35/ip_ftp_pxy.c Mon Jun 21 21:48:07 2004 *************** *** 2,8 **** * Simple FTP transparent proxy for in-kernel use. For use with the NAT * code. * ! * $Id: ip_ftp_pxy.c,v 2.7.2.45 2003/07/01 15:11:09 darrenr Exp $ */ #if SOLARIS && defined(_KERNEL) extern kmutex_t ipf_rw; --- 2,8 ---- * Simple FTP transparent proxy for in-kernel use. For use with the NAT * code. * ! * $Id: ip_ftp_pxy.c,v 2.7.2.47 2004/06/21 11:48:07 darrenr Exp $ */ #if SOLARIS && defined(_KERNEL) extern kmutex_t ipf_rw; *************** *** 207,214 **** --- 207,219 ---- a1 >>= 24; olen = s - f->ftps_rptr; /* DO NOT change this to snprintf! */ + #if defined(OpenBSD) && (200311 >= 200311) + (void) snprintf(newbuf, sizeof(newbuf), "%s %u,%u,%u,%u,%u,%u\r\n", + "PORT", a1, a2, a3, a4, a5, a6); + #else (void) sprintf(newbuf, "%s %u,%u,%u,%u,%u,%u\r\n", "PORT", a1, a2, a3, a4, a5, a6); + #endif nlen = strlen(newbuf); inc = nlen - olen; *************** *** 263,269 **** # endif #endif if (inc != 0) { ! #if (SOLARIS || defined(__sgi)) && defined(_KERNEL) register u_32_t sum1, sum2; sum1 = ip->ip_len; --- 268,274 ---- # endif #endif if (inc != 0) { ! #if ((SOLARIS || defined(__sgi)) && defined(_KERNEL)) || !defined(_KERNEL) register u_32_t sum1, sum2; sum1 = ip->ip_len; *************** *** 577,583 **** # endif /* SOLARIS */ #endif /* _KERNEL */ if (inc != 0) { ! #if (SOLARIS || defined(__sgi)) && defined(_KERNEL) register u_32_t sum1, sum2; sum1 = ip->ip_len; --- 582,588 ---- # endif /* SOLARIS */ #endif /* _KERNEL */ if (inc != 0) { ! #if ((SOLARIS || defined(__sgi)) && defined(_KERNEL)) || !defined(_KERNEL) register u_32_t sum1, sum2; sum1 = ip->ip_len; diff -cr ip_fil3.4.34/ip_log.c ip_fil3.4.35/ip_log.c *** ip_fil3.4.34/ip_log.c Sat Apr 10 21:46:51 2004 --- ip_fil3.4.35/ip_log.c Sun Jun 20 11:59:01 2004 *************** *** 3,9 **** * * See the IPFILTER.LICENCE file for details on licencing. * ! * $Id: ip_log.c,v 2.5.2.25 2004/04/10 11:46:51 darrenr Exp $ */ #include #if defined(KERNEL) && !defined(_KERNEL) --- 3,9 ---- * * See the IPFILTER.LICENCE file for details on licencing. * ! * $Id: ip_log.c,v 2.5.2.26 2004/06/20 01:59:01 darrenr Exp $ */ #include #if defined(KERNEL) && !defined(_KERNEL) *************** *** 241,247 **** */ bzero((char *)ipfl.fl_ifname, sizeof(ipfl.fl_ifname)); # if SOLARIS && defined(_KERNEL) ! ipfl.fl_unit = (u_char)ifp->ill_ppa; bcopy(ifp->ill_name, ipfl.fl_ifname, MIN(ifp->ill_name_length, sizeof(ipfl.fl_ifname))); mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0; --- 241,247 ---- */ bzero((char *)ipfl.fl_ifname, sizeof(ipfl.fl_ifname)); # if SOLARIS && defined(_KERNEL) ! ipfl.fl_unit = (u_int)ifp->ill_ppa; bcopy(ifp->ill_name, ipfl.fl_ifname, MIN(ifp->ill_name_length, sizeof(ipfl.fl_ifname))); mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0; *************** *** 251,257 **** (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ); # else ! ipfl.fl_unit = (u_char)ifp->if_unit; strncpy(ipfl.fl_ifname, ifp->if_name, MIN(sizeof(ipfl.fl_ifname), sizeof(ifp->if_name))); # endif --- 251,257 ---- (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ); # else ! ipfl.fl_unit = (u_int)ifp->if_unit; strncpy(ipfl.fl_ifname, ifp->if_name, MIN(sizeof(ipfl.fl_ifname), sizeof(ifp->if_name))); # endif diff -cr ip_fil3.4.34/ip_nat.c ip_fil3.4.35/ip_nat.c *** ip_fil3.4.34/ip_nat.c Sat Apr 10 21:48:31 2004 --- ip_fil3.4.35/ip_nat.c Mon May 31 03:56:52 2004 *************** *** 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.81 2004/04/10 11:48:31 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.82 2004/05/30 17:56:52 darrenr Exp $"; #endif nat_t **nat_table[2] = { NULL, NULL }, *************** *** 1704,1709 **** --- 1704,1710 ---- return NULL; flags = 0; + sumd2 = 0; *nflags = IPN_ICMPERR; icmp = (icmphdr_t *)fin->fin_dp; oip = (ip_t *)&icmp->icmp_ip; *************** *** 1757,1897 **** CALC_SUMD(sum1, sum2, sumd); ! if (nat->nat_dir == NAT_OUTBOUND) { ! /* ! * Fix IP checksum of the offending IP packet to adjust for ! * the change in the IP address. ! * ! * Normally, you would expect that the ICMP checksum of the ! * ICMP error message needs to be adjusted as well for the ! * IP address change in oip. ! * However, this is a NOP, because the ICMP checksum is ! * calculated over the complete ICMP packet, which includes the ! * changed oip IP addresses and oip->ip_sum. However, these ! * two changes cancel each other out (if the delta for ! * the IP address is x, then the delta for ip_sum is minus x), ! * so no change in the icmp_cksum is necessary. ! * ! * Be careful that nat_dir refers to the direction of the ! * offending IP packet (oip), not to its ICMP response (icmp) ! */ ! fix_datacksum(&oip->ip_sum, sumd); ! /* Fix icmp cksum : IP Addr + Cksum */ ! sumd2 = (sumd << 1); /* ! * Fix UDP pseudo header checksum to compensate for the ! * IP address change. */ ! if (oip->ip_p == IPPROTO_UDP && udp->uh_sum) { ! /* ! * The UDP checksum is optional, only adjust it ! * if it has been set. ! */ ! sum1 = ntohs(udp->uh_sum); ! fix_datacksum(&udp->uh_sum, sumd); ! sum2 = ntohs(udp->uh_sum); ! ! /* ! * Fix ICMP checksum to compensate the UDP ! * checksum adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } /* ! * Fix TCP pseudo header checksum to compensate for the ! * IP address change. Before we can do the change, we ! * must make sure that oip is sufficient large to hold ! * the TCP checksum (normally it does not!). */ ! if (oip->ip_p == IPPROTO_TCP && dlen >= 18) { ! ! sum1 = ntohs(tcp->th_sum); ! fix_datacksum(&tcp->th_sum, sumd); ! sum2 = ntohs(tcp->th_sum); ! /* ! * Fix ICMP checksum to compensate the TCP ! * checksum adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } ! } else { /* ! * Fix IP checksum of the offending IP packet to adjust for ! * the change in the IP address. ! * ! * Normally, you would expect that the ICMP checksum of the ! * ICMP error message needs to be adjusted as well for the ! * IP address change in oip. ! * However, this is a NOP, because the ICMP checksum is ! * calculated over the complete ICMP packet, which includes the ! * changed oip IP addresses and oip->ip_sum. However, these ! * two changes cancel each other out (if the delta for ! * the IP address is x, then the delta for ip_sum is minus x), ! * so no change in the icmp_cksum is necessary. ! * ! * Be careful that nat_dir refers to the direction of the ! * offending IP packet (oip), not to its ICMP response (icmp) ! */ ! fix_datacksum(&oip->ip_sum, sumd); ! /* Fix icmp cksum : IP Addr + Cksum */ ! sumd2 = (sumd << 1); ! ! /* XXX FV : without having looked at Solaris source code, it seems unlikely ! * that SOLARIS would compensate this in the kernel (a body of an IP packet ! * in the data section of an ICMP packet). I have the feeling that this should ! * be unconditional, but I'm not in a position to check. ! */ ! #if !SOLARIS && !defined(__sgi) ! /* ! * Fix UDP pseudo header checksum to compensate for the ! * IP address change. */ ! if (oip->ip_p == IPPROTO_UDP && udp->uh_sum) { ! /* ! * The UDP checksum is optional, only adjust it ! * if it has been set ! */ ! sum1 = ntohs(udp->uh_sum); ! fix_datacksum(&udp->uh_sum, sumd); ! sum2 = ntohs(udp->uh_sum); ! ! /* ! * Fix ICMP checksum to compensate the UDP ! * checksum adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } ! ! /* ! * Fix TCP pseudo header checksum to compensate for the ! * IP address change. Before we can do the change, we ! * must make sure that oip is sufficient large to hold ! * the TCP checksum (normally it does not!). ! */ ! if (oip->ip_p == IPPROTO_TCP && dlen >= 18) { ! ! sum1 = ntohs(tcp->th_sum); ! fix_datacksum(&tcp->th_sum, sumd); ! sum2 = ntohs(tcp->th_sum); ! ! /* ! * Fix ICMP checksum to compensate the TCP ! * checksum adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } ! #endif } ! if ((flags & IPN_TCPUDP) != 0) { /* * Step 2 : * For offending TCP/UDP IP packets, translate the ports as --- 1758,1832 ---- CALC_SUMD(sum1, sum2, sumd); ! /* ! * Fix IP checksum of the offending IP packet to adjust for ! * the change in the IP address. ! * ! * Normally, you would expect that the ICMP checksum of the ! * ICMP error message needs to be adjusted as well for the ! * IP address change in oip. ! * However, this is a NOP, because the ICMP checksum is ! * calculated over the complete ICMP packet, which includes the ! * changed oip IP addresses and oip->ip_sum. However, these ! * two changes cancel each other out (if the delta for ! * the IP address is x, then the delta for ip_sum is minus x), ! * so no change in the icmp_cksum is necessary. ! * ! * Be careful that nat_dir refers to the direction of the ! * offending IP packet (oip), not to its ICMP response (icmp) ! */ ! fix_datacksum(&oip->ip_sum, sumd); ! /* Fix icmp cksum : IP Addr + Cksum */ + /* + * Fix UDP pseudo header checksum to compensate for the + * IP address change. + */ + if ((oip->ip_p == IPPROTO_UDP) && (dlen >= 8) && udp->uh_sum) { /* ! * The UDP checksum is optional, only adjust it ! * if it has been set. */ ! sum1 = ntohs(udp->uh_sum); ! fix_datacksum(&udp->uh_sum, sumd); ! sum2 = ntohs(udp->uh_sum); /* ! * Fix ICMP checksum to compensate the UDP ! * checksum adjustment. */ ! sumd2 = sumd << 1; ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } ! /* ! * Fix TCP pseudo header checksum to compensate for the ! * IP address change. Before we can do the change, we ! * must make sure that oip is sufficient large to hold ! * the TCP checksum (normally it does not!). ! */ ! else if ((oip->ip_p == IPPROTO_TCP) && (dlen >= 18)) { ! sum1 = ntohs(tcp->th_sum); ! fix_datacksum(&tcp->th_sum, sumd); ! sum2 = ntohs(tcp->th_sum); /* ! * Fix ICMP checksum to compensate the TCP ! * checksum adjustment. */ ! sumd2 = sumd << 1; ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } else { ! sumd2 = (sumd >> 16); ! if (nat->nat_dir == NAT_OUTBOUND) ! sumd2 = ~sumd2; ! else ! sumd2 = ~sumd2 + 1; } ! if (((flags & IPN_TCPUDP) != 0) && (dlen >= 4)) { /* * Step 2 : * For offending TCP/UDP IP packets, translate the ports as *************** *** 1911,1927 **** * include the TCP checksum. So we have to check if the * ip->ip_len actually holds the TCP checksum of the oip! */ - if (nat->nat_oport == tcp->th_dport) { if (tcp->th_sport != nat->nat_inport) { /* * Fix ICMP checksum to compensate port * adjustment. */ ! sum1 = ntohs(tcp->th_sport); ! sum2 = ntohs(nat->nat_inport); ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; tcp->th_sport = nat->nat_inport; /* --- 1846,1859 ---- * include the TCP checksum. So we have to check if the * ip->ip_len actually holds the TCP checksum of the oip! */ if (nat->nat_oport == tcp->th_dport) { if (tcp->th_sport != nat->nat_inport) { /* * Fix ICMP checksum to compensate port * adjustment. */ ! sum1 = ntohs(nat->nat_inport); ! sum2 = ntohs(tcp->th_sport); tcp->th_sport = nat->nat_inport; /* *************** *** 1933,1948 **** * The UDP checksum is optional, only adjust * it if it has been set. */ ! if (oip->ip_p == IPPROTO_UDP && udp->uh_sum) { sum1 = ntohs(udp->uh_sum); fix_datacksum(&udp->uh_sum, sumd); sum2 = ntohs(udp->uh_sum); /* ! * Fix ICMP checksum to ! * compensate UDP checksum ! * adjustment. */ CALC_SUMD(sum1, sum2, sumd); sumd2 += sumd; --- 1865,1882 ---- * The UDP checksum is optional, only adjust * it if it has been set. */ ! if ((oip->ip_p == IPPROTO_UDP) && ! (dlen >= 8) && udp->uh_sum) { ! sumd = sum1 - sum2; ! sumd2 += sumd; sum1 = ntohs(udp->uh_sum); fix_datacksum(&udp->uh_sum, sumd); sum2 = ntohs(udp->uh_sum); /* ! * Fix ICMP checksum to compensate ! * UDP checksum adjustment. */ CALC_SUMD(sum1, sum2, sumd); sumd2 += sumd; *************** *** 1954,2016 **** * packet flows the other direction compared to * the ICMP message. */ ! if (oip->ip_p == IPPROTO_TCP && dlen >= 18) { ! ! sum1 = ntohs(tcp->th_sum); ! fix_datacksum(&tcp->th_sum, sumd); ! sum2 = ntohs(tcp->th_sum); ! ! /* ! * Fix ICMP checksum to ! * compensate TCP checksum ! * adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; } } ! } else { ! if (tcp->th_dport != nat->nat_outport) { ! /* ! * Fix ICMP checksum to compensate port ! * adjustment. ! */ ! sum1 = ntohs(tcp->th_dport); ! sum2 = ntohs(nat->nat_outport); ! CALC_SUMD(sum1, sum2, sumd); sumd2 += sumd; ! tcp->th_dport = nat->nat_outport; /* ! * Fix udp checksum to compensate port ! * adjustment. NOTE : the offending IP ! * packet flows the other direction compared ! * to the ICMP message. ! * ! * The UDP checksum is optional, only adjust ! * it if it has been set. */ ! if (oip->ip_p == IPPROTO_UDP && udp->uh_sum) { ! ! sum1 = ntohs(udp->uh_sum); ! fix_datacksum(&udp->uh_sum, sumd); ! sum2 = ntohs(udp->uh_sum); ! /* ! * Fix ICMP checksum to compensate ! * UDP checksum adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); sumd2 += sumd; - } - - /* - * Fix tcp checksum (if present) to compensate - * port adjustment. NOTE : the offending IP - * packet flows the other direction compared to - * the ICMP message. - */ - if (oip->ip_p == IPPROTO_TCP && dlen >= 18) { sum1 = ntohs(tcp->th_sum); fix_datacksum(&tcp->th_sum, sumd); --- 1888,1960 ---- * packet flows the other direction compared to * the ICMP message. */ ! if (oip->ip_p == IPPROTO_TCP) { ! if (dlen >= 18) { ! sumd = sum1 - sum2; ! sumd2 += sumd; ! ! sum1 = ntohs(tcp->th_sum); ! fix_datacksum(&tcp->th_sum, ! sumd); ! sum2 = ntohs(tcp->th_sum); ! ! /* ! * Fix ICMP checksum to ! * compensate TCP checksum ! * adjustment. ! */ ! CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; ! } else { ! sumd = sum2 - sum1 + 1; ! sumd2 += sumd; ! } } } ! } else if (tcp->th_dport != nat->nat_outport) { ! /* ! * Fix ICMP checksum to compensate port ! * adjustment. ! */ ! sum1 = ntohs(nat->nat_outport); ! sum2 = ntohs(tcp->th_dport); ! tcp->th_dport = nat->nat_outport; ! ! /* ! * Fix udp checksum to compensate port ! * adjustment. NOTE : the offending IP ! * packet flows the other direction compared ! * to the ICMP message. ! * ! * The UDP checksum is optional, only adjust ! * it if it has been set. ! */ ! if ((oip->ip_p == IPPROTO_UDP) && ! (dlen >= 8) && udp->uh_sum) { ! sumd = sum1 - sum2; sumd2 += sumd; ! ! sum1 = ntohs(udp->uh_sum); ! fix_datacksum(&udp->uh_sum, sumd); ! sum2 = ntohs(udp->uh_sum); /* ! * Fix ICMP checksum to compensate ! * UDP checksum adjustment. */ ! CALC_SUMD(sum1, sum2, sumd); ! } ! /* ! * Fix tcp checksum (if present) to compensate ! * port adjustment. NOTE : the offending IP ! * packet flows the other direction compared to ! * the ICMP message. ! */ ! if (oip->ip_p == IPPROTO_TCP) { ! if (dlen >= 18) { ! sumd = sum1 - sum2; sumd2 += sumd; sum1 = ntohs(tcp->th_sum); fix_datacksum(&tcp->th_sum, sumd); *************** *** 2021,2038 **** * UDP checksum adjustment. */ CALC_SUMD(sum1, sum2, sumd); ! sumd2 += sumd; } } } if (sumd2) { sumd2 = (sumd2 & 0xffff) + (sumd2 >> 16); sumd2 = (sumd2 & 0xffff) + (sumd2 >> 16); ! if (nat->nat_dir == NAT_INBOUND) { ! fix_outcksum(fin, &icmp->icmp_cksum, sumd2); ! } else { ! fix_incksum(fin, &icmp->icmp_cksum, sumd2); ! } } } if (oip->ip_p == IPPROTO_ICMP) --- 1965,1982 ---- * UDP checksum adjustment. */ CALC_SUMD(sum1, sum2, sumd); ! } else { ! sumd = sum2 - sum1; ! if (nat->nat_dir == NAT_OUTBOUND) ! sumd++; } } + sumd2 += sumd; } if (sumd2) { sumd2 = (sumd2 & 0xffff) + (sumd2 >> 16); sumd2 = (sumd2 & 0xffff) + (sumd2 >> 16); ! fix_incksum(fin, &icmp->icmp_cksum, sumd2); } } if (oip->ip_p == IPPROTO_ICMP) *************** *** 2502,2514 **** s1 = LONG_SUM(ntohl(fin->fin_saddr)); s2 = LONG_SUM(ntohl(nat->nat_outip.s_addr)); CALC_SUMD(s1, s2, sumd); ! ! if (nat->nat_dir == NAT_OUTBOUND) ! fix_outcksum(fin, &ip->ip_sum, sumd); ! else ! fix_incksum(fin, &ip->ip_sum, sumd); } ! #if (SOLARIS || defined(__sgi)) && defined(_KERNEL) else { if (nat->nat_dir == NAT_OUTBOUND) fix_outcksum(fin, &ip->ip_sum, nat->nat_ipsumd); --- 2446,2454 ---- s1 = LONG_SUM(ntohl(fin->fin_saddr)); s2 = LONG_SUM(ntohl(nat->nat_outip.s_addr)); CALC_SUMD(s1, s2, sumd); ! fix_outcksum(fin, &ip->ip_sum, sumd); } ! #if (SOLARIS || defined(__sgi)) || !defined(_KERNEL) else { if (nat->nat_dir == NAT_OUTBOUND) fix_outcksum(fin, &ip->ip_sum, nat->nat_ipsumd); *************** *** 2730,2748 **** nat->nat_bytes += ip->ip_len; nat->nat_pkts++; MUTEX_EXIT(&nat->nat_lock); - ip->ip_dst = nat->nat_inip; - fin->fin_fi.fi_daddr = nat->nat_inip.s_addr; /* * Fix up checksums, not by recalculating them, but * simply computing adjustments. */ - #if (SOLARIS || defined(__sgi)) && defined(_KERNEL) if (nat->nat_dir == NAT_OUTBOUND) fix_incksum(fin, &ip->ip_sum, nat->nat_ipsumd); else fix_outcksum(fin, &ip->ip_sum, nat->nat_ipsumd); ! #endif if ((fin->fin_off == 0) && !(fin->fin_fl & FI_SHORT)) { if ((nat->nat_inport != 0) && (tcp != NULL)) { --- 2670,2688 ---- nat->nat_bytes += ip->ip_len; nat->nat_pkts++; MUTEX_EXIT(&nat->nat_lock); /* * Fix up checksums, not by recalculating them, but * simply computing adjustments. */ if (nat->nat_dir == NAT_OUTBOUND) fix_incksum(fin, &ip->ip_sum, nat->nat_ipsumd); else fix_outcksum(fin, &ip->ip_sum, nat->nat_ipsumd); ! ! ip->ip_dst = nat->nat_inip; ! fin->fin_fi.fi_daddr = nat->nat_inip.s_addr; ! if ((fin->fin_off == 0) && !(fin->fin_fl & FI_SHORT)) { if ((nat->nat_inport != 0) && (tcp != NULL)) { diff -cr ip_fil3.4.34/ipl.h ip_fil3.4.35/ipl.h *** ip_fil3.4.34/ipl.h Tue Apr 20 22:09:10 2004 --- ip_fil3.4.35/ipl.h Fri Jun 4 03:28:20 2004 *************** *** 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.43 2004/04/20 12:09:10 darrenr Exp $ */ #ifndef __IPL_H__ #define __IPL_H__ ! #define IPL_VERSION "IP Filter: v3.4.34" #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.44 2004/06/03 17:28:20 darrenr Exp $ */ #ifndef __IPL_H__ #define __IPL_H__ ! #define IPL_VERSION "IP Filter: v3.4.35" #endif diff -cr ip_fil3.4.34/ipmon.c ip_fil3.4.35/ipmon.c *** ip_fil3.4.34/ipmon.c Sat Apr 10 21:47:17 2004 --- ip_fil3.4.35/ipmon.c Thu May 13 09:21:55 2004 *************** *** 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.39 2004/04/10 11:47:17 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.40 2004/05/12 23:21:55 darrenr Exp $"; #endif *************** *** 992,998 **** p = (u_short)ip6->ip6_nxt; s = (u_32_t *)&ip6->ip6_src; d = (u_32_t *)&ip6->ip6_dst; ! plen = ntohs(ip6->ip6_plen); #else sprintf(t, "ipv6"); goto printipflog; --- 992,998 ---- p = (u_short)ip6->ip6_nxt; s = (u_32_t *)&ip6->ip6_src; d = (u_32_t *)&ip6->ip6_dst; ! plen = hl + ntohs(ip6->ip6_plen); #else sprintf(t, "ipv6"); goto printipflog; diff -cr ip_fil3.4.34/man/ipnat.5 ip_fil3.4.35/man/ipnat.5 *** ip_fil3.4.34/man/ipnat.5 Sun Jun 29 00:53:40 2003 --- ip_fil3.4.35/man/ipnat.5 Sat May 15 23:12:34 2004 *************** *** 12,27 **** mapblock ::= "map-block" ifname ipmask "->" ipmask [ ports ] mapoptions. redir ::= "rdr" ifname ipmask dport "->" ip [ "," ip ] rdrport rdroptions . ! dport ::= "port" portnum [ "-" portnum ] . ! ports ::= "ports" numports | "auto" . ! rdrport ::= "port" portnum . mapit ::= "map" | "bimap" . fromto ::= "from" object "to" object . ipmask ::= ip "/" bits | ip "/" mask | ip "netmask" mask . dstipmask ::= ipmask | "range" ip "-" ip . mapport ::= "portmap" tcpudp portspec . mapoptions ::= [ tcpudp ] [ "frag" ] [ age ] [ clamp ] . ! rdroptions ::= [ tcpudp ] [ rr ] [ "frag" ] [ age ] [ clamp ] . object :: = addr [ port-comp | port-range ] . addr :: = "any" | nummask | host-name [ "mask" ipaddr | "mask" hexnumber ] . --- 12,27 ---- mapblock ::= "map-block" ifname ipmask "->" ipmask [ ports ] mapoptions. redir ::= "rdr" ifname ipmask dport "->" ip [ "," ip ] rdrport rdroptions . ! dport ::= "port" number [ "-" number ] . ! ports ::= "ports" number | "auto" . ! rdrport ::= "port" number . mapit ::= "map" | "bimap" . fromto ::= "from" object "to" object . ipmask ::= ip "/" bits | ip "/" mask | ip "netmask" mask . dstipmask ::= ipmask | "range" ip "-" ip . mapport ::= "portmap" tcpudp portspec . mapoptions ::= [ tcpudp ] [ "frag" ] [ age ] [ clamp ] . ! rdroptions ::= [ tcpudp | protocol ] [ rr ] [ "frag" ] [ age ] [ clamp ] . object :: = addr [ port-comp | port-range ] . addr :: = "any" | nummask | host-name [ "mask" ipaddr | "mask" hexnumber ] . *************** *** 31,44 **** rr ::= "round-robin" . age ::= "age" decnumber [ "/" decnumber ] . clamp ::= "mssclamp" decnumber . ! tcpudp ::= "tcp/udp" | protocol . protocol ::= protocol-name | decnumber . ! nummask ::= host-name [ "/" decnumber ] . ! portspec ::= "auto" | portnumber ":" portnumber . ! portnumber ::= number { numbers } . ifname ::= 'A' - 'Z' { 'A' - 'Z' } numbers . numbers ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' . .fi .PP --- 31,44 ---- rr ::= "round-robin" . age ::= "age" decnumber [ "/" decnumber ] . clamp ::= "mssclamp" decnumber . ! tcpudp ::= "tcp/udp" | "tcp" | "udp" . protocol ::= protocol-name | decnumber . ! nummask ::= host-name [ "/" number ] . ! portspec ::= "auto" | number ":" number . ifname ::= 'A' - 'Z' { 'A' - 'Z' } numbers . + number ::= numbers [ number ] . numbers ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' . .fi .PP diff -cr ip_fil3.4.34/test/Makefile ip_fil3.4.35/test/Makefile *** ip_fil3.4.34/test/Makefile Sat Oct 26 16:21:44 2002 --- ip_fil3.4.35/test/Makefile Fri Jun 4 03:29:21 2004 *************** *** 51,57 **** n1 n2 n3 n4 n5 n6 n7: @/bin/sh ./nattest $@ ! ni1 ni2 ni3 ni4 ni5: @/bin/sh ./natipftest $@ in1 in2 in3 in4: --- 51,57 ---- n1 n2 n3 n4 n5 n6 n7: @/bin/sh ./nattest $@ ! ni1 ni2 ni3 ni4 ni5 ni7 ni8 ni10 ni11: @/bin/sh ./natipftest $@ in1 in2 in3 in4: Only in ip_fil3.4.35/test: README.TXT diff -cr ip_fil3.4.34/test/expected/ni1 ip_fil3.4.35/test/expected/ni1 *** ip_fil3.4.34/test/expected/ni1 Tue Jun 10 23:26:30 2003 --- ip_fil3.4.35/test/expected/ni1 Fri Jun 4 03:29:29 2004 *************** *** 1,3 **** ! 4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 ! 4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 b547 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f ------------------------------- --- 1,4 ---- ! 4500 0028 4706 4000 0111 1eac 0606 0606 0404 0404 afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 ! 4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 5773 0000 0000 4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 afc9 829e 0014 6b10 ! 4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 afc9 829e 0014 6b10 0402 0000 3be5 468d 000a cfc3 ------------------------------- Only in ip_fil3.4.35/test/expected: ni10 Only in ip_fil3.4.35/test/expected: ni11 diff -cr ip_fil3.4.34/test/expected/ni2 ip_fil3.4.35/test/expected/ni2 *** ip_fil3.4.34/test/expected/ni2 Tue Jun 10 23:26:30 2003 --- ip_fil3.4.35/test/expected/ni2 Sun May 30 19:45:18 2004 *************** *** 1,10 **** ! 4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 ! 4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 ! 4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 ! 4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a ! 4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 ! 4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a ! 4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 ! 4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 ! 4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 488b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 ------------------------------- --- 1,10 ---- ! 4510 002c bd0d 4000 3e06 bbd1 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 ! 4500 002c ce83 4000 7e06 606b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 ! 4510 0028 bd0e 4000 3e06 bbd4 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 ! 4500 005b cf83 4000 7e06 5f3c c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a ! 4510 0028 bd18 4000 3e06 bbca 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 ! 4510 002e bd1e 4000 3e06 bbbe 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a ! 4500 0048 e383 4000 7e06 4b4f c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 ! 4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 ! 4500 0038 d71d 4000 4001 9fca 0101 0101 c0a8 0133 0304 444f 0000 05a0 4500 05dc e483 4000 7e06 4ebb c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 ------------------------------- diff -cr ip_fil3.4.34/test/expected/ni3 ip_fil3.4.35/test/expected/ni3 *** ip_fil3.4.34/test/expected/ni3 Tue Jun 10 23:26:30 2003 --- ip_fil3.4.35/test/expected/ni3 Sun May 30 19:45:19 2004 *************** *** 1,4 **** ! 4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ! 4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 bcbb 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 ! 4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 1947 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- --- 1,4 ---- ! 4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ! 4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 ! 4500 0058 809a 0000 ff01 3101 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- diff -cr ip_fil3.4.34/test/expected/ni4 ip_fil3.4.35/test/expected/ni4 *** ip_fil3.4.34/test/expected/ni4 Tue Jun 10 23:26:30 2003 --- ip_fil3.4.35/test/expected/ni4 Sun May 30 19:45:19 2004 *************** *** 1,4 **** ! 4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ! 4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 bcbb 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 ! 4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 1947 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- --- 1,4 ---- ! 4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ! 4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 ! 4500 0058 809a 0000 ff01 3101 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- diff -cr ip_fil3.4.34/test/expected/ni5 ip_fil3.4.35/test/expected/ni5 *** ip_fil3.4.34/test/expected/ni5 Sat Nov 2 14:30:10 2002 --- ip_fil3.4.35/test/expected/ni5 Sun May 30 19:45:19 2004 *************** *** 1,28 **** ! 4500 002c 10c9 4000 ff06 3289 0101 0101 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 f5a2 0000 0204 05b4 4500 002c ffdd 4000 ef06 5374 96cb e002 c0a8 0103 0015 8032 3786 76c4 bd6b c9c9 6012 269c 8369 0000 0204 0584 ! 4500 0028 10ca 4000 ff06 328c 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a ! 4500 0028 10cb 4000 ff06 328b 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000 ippr_ftp_server_valid:junk after cmd[220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Comp] 4500 00c7 ffdf 4000 ef06 52d7 96cb e002 c0a8 0103 0015 8032 3786 770c bd6b c9c9 5018 269c 1087 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 5253 5353 2061 6e64 2052 5350 4153 2049 5420 5374 6166 6620 2870 7265 7669 6f75 736c 7920 6b6e 6f77 6e20 6173 2043 6f6f 6d62 7320 436f 6d70 7574 696e 6720 556e 6974 290d 0a32 3230 2d41 6e79 2070 726f 626c 656d 7320 636f 6e74 6163 7420 6674 706d 6173 7465 7240 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 750d 0a32 3230 2d0d 0a32 3230 200d 0a ! 4500 0028 10cc 4000 ff06 328a 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 ! 4500 0038 10cd 4000 ff06 3279 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5018 269c d1c5 0000 5553 4552 2061 6e6f 6e79 6d6f 7573 0d0a 4500 0028 ffe0 4000 ef06 5375 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5010 269c 9a00 0000 4500 006c ffe1 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5018 269c b00f 0000 3333 3120 4775 6573 7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64 2079 6f75 7220 636f 6d70 6c65 7465 2065 2d6d 6169 6c20 6164 6472 6573 7320 6173 2070 6173 7377 6f72 642e 0d0a ! 4500 0028 10ce 4000 ff06 3288 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5010 269c 5966 0000 ! 4500 0036 10cf 4000 ff06 3279 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a 4500 005f ffe2 4000 ef06 533c 96cb e002 c0a8 0103 0015 8032 3786 77ef bd6b c9e7 5018 269c 895e 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 3020 7369 6d75 6c74 616e 656f 7573 2075 7365 7273 2061 6c6c 6f77 6564 2e0d 0a ! 4500 0028 10d0 4000 ff06 3286 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7826 5010 269c 5921 0000 4500 0099 ffe3 4000 ef06 5301 96cb e002 c0a8 0103 0015 8032 3786 7826 bd6b c9e7 5018 269c d399 0000 3233 302d 0d0a 3233 302d 0d0a 3233 302d 4869 2e20 2057 6527 7265 2063 6c65 616e 696e 6720 7570 2e20 2041 6e79 2066 6565 6462 6163 6b20 6d6f 7374 2077 656c 636f 6d65 2e20 3130 2041 7567 2030 300d 0a32 3330 2d0d 0a32 3330 204c 6f67 6765 6420 696e 2061 6e6f 6e79 6d6f 7573 6c79 2e0d 0a ! 4500 0028 10d1 4000 ff06 3285 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5010 269c 58b0 0000 ! 4500 0030 10d2 4000 ff06 327c 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5018 269c 86ae 0000 5459 5045 2049 0d0a 4500 0038 ffe4 4000 ef06 5361 96cb e002 c0a8 0103 0015 8032 3786 7897 bd6b c9ef 5018 269c 5fae 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a ! 4500 0028 10d3 4000 ff06 3283 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5010 269c 5898 0000 ! 4500 003d 10d4 4000 ff06 3269 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5018 269c 4b67 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 310d 0a 4500 0046 ffe5 4000 ef06 5352 96cb e002 c0a8 0103 0015 8032 3786 78a7 bd6b ca0c 5018 269c dbc3 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a ! 4500 0030 10d5 4000 ff06 3279 0101 0101 96cb e002 8032 0015 bd6b ca04 3786 78c5 5018 269c 866b 0000 5459 5045 2041 0d0a 4500 0038 ffe6 4000 ef06 535f 96cb e002 c0a8 0103 0015 8032 3786 78c5 bd6b ca14 5018 269c 5f5b 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a ! 4500 002e 10d6 4000 ff06 327a 0101 0101 96cb e002 8032 0015 bd6b ca0c 3786 78d5 5018 269c a994 0000 4e4c 5354 0d0a 4500 002c ffe7 4000 ef06 536a 96cb e002 c0a8 0103 0014 8033 d9f8 11d4 0000 0000 6002 2238 d190 0000 0204 0584 4500 002c 10d7 4000 ff06 327b c0a8 0103 96cb e002 8033 0014 bd78 5c12 d9f8 11d5 6012 02f8 d734 0000 0204 0584 4500 0028 ffe8 4000 ef06 536d 96cb e002 c0a8 0103 0014 8033 d9f8 11d5 bd78 5c13 5010 269c cb1d 0000 --- 1,28 ---- ! 4500 002c 10c9 4000 ff06 f232 0101 0101 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 f5a2 0000 0204 05b4 4500 002c ffdd 4000 ef06 5374 96cb e002 c0a8 0103 0015 8032 3786 76c4 bd6b c9c9 6012 269c 8369 0000 0204 0584 ! 4500 0028 10ca 4000 ff06 f235 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a ! 4500 0028 10cb 4000 ff06 f234 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000 ippr_ftp_server_valid:junk after cmd[220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Comp] 4500 00c7 ffdf 4000 ef06 52d7 96cb e002 c0a8 0103 0015 8032 3786 770c bd6b c9c9 5018 269c 1087 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 5253 5353 2061 6e64 2052 5350 4153 2049 5420 5374 6166 6620 2870 7265 7669 6f75 736c 7920 6b6e 6f77 6e20 6173 2043 6f6f 6d62 7320 436f 6d70 7574 696e 6720 556e 6974 290d 0a32 3230 2d41 6e79 2070 726f 626c 656d 7320 636f 6e74 6163 7420 6674 706d 6173 7465 7240 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 750d 0a32 3230 2d0d 0a32 3230 200d 0a ! 4500 0028 10cc 4000 ff06 f233 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 ! 4500 0038 10cd 4000 ff06 f222 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5018 269c d1c5 0000 5553 4552 2061 6e6f 6e79 6d6f 7573 0d0a 4500 0028 ffe0 4000 ef06 5375 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5010 269c 9a00 0000 4500 006c ffe1 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 77ab bd6b c9d9 5018 269c b00f 0000 3333 3120 4775 6573 7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64 2079 6f75 7220 636f 6d70 6c65 7465 2065 2d6d 6169 6c20 6164 6472 6573 7320 6173 2070 6173 7377 6f72 642e 0d0a ! 4500 0028 10ce 4000 ff06 f231 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5010 269c 5966 0000 ! 4500 0036 10cf 4000 ff06 f222 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a 4500 005f ffe2 4000 ef06 533c 96cb e002 c0a8 0103 0015 8032 3786 77ef bd6b c9e7 5018 269c 895e 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 3020 7369 6d75 6c74 616e 656f 7573 2075 7365 7273 2061 6c6c 6f77 6564 2e0d 0a ! 4500 0028 10d0 4000 ff06 f22f 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7826 5010 269c 5921 0000 4500 0099 ffe3 4000 ef06 5301 96cb e002 c0a8 0103 0015 8032 3786 7826 bd6b c9e7 5018 269c d399 0000 3233 302d 0d0a 3233 302d 0d0a 3233 302d 4869 2e20 2057 6527 7265 2063 6c65 616e 696e 6720 7570 2e20 2041 6e79 2066 6565 6462 6163 6b20 6d6f 7374 2077 656c 636f 6d65 2e20 3130 2041 7567 2030 300d 0a32 3330 2d0d 0a32 3330 204c 6f67 6765 6420 696e 2061 6e6f 6e79 6d6f 7573 6c79 2e0d 0a ! 4500 0028 10d1 4000 ff06 f22e 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5010 269c 58b0 0000 ! 4500 0030 10d2 4000 ff06 f225 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5018 269c 86ae 0000 5459 5045 2049 0d0a 4500 0038 ffe4 4000 ef06 5361 96cb e002 c0a8 0103 0015 8032 3786 7897 bd6b c9ef 5018 269c 5fae 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a ! 4500 0028 10d3 4000 ff06 f22c 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5010 269c 5898 0000 ! 4500 003d 10d4 4000 ff06 f216 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5018 269c 4b67 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 310d 0a 4500 0046 ffe5 4000 ef06 5352 96cb e002 c0a8 0103 0015 8032 3786 78a7 bd6b ca0c 5018 269c dbc3 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a ! 4500 0030 10d5 4000 ff06 f222 0101 0101 96cb e002 8032 0015 bd6b ca04 3786 78c5 5018 269c 866b 0000 5459 5045 2041 0d0a 4500 0038 ffe6 4000 ef06 535f 96cb e002 c0a8 0103 0015 8032 3786 78c5 bd6b ca14 5018 269c 5f5b 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a ! 4500 002e 10d6 4000 ff06 f223 0101 0101 96cb e002 8032 0015 bd6b ca0c 3786 78d5 5018 269c a994 0000 4e4c 5354 0d0a 4500 002c ffe7 4000 ef06 536a 96cb e002 c0a8 0103 0014 8033 d9f8 11d4 0000 0000 6002 2238 d190 0000 0204 0584 4500 002c 10d7 4000 ff06 327b c0a8 0103 96cb e002 8033 0014 bd78 5c12 d9f8 11d5 6012 02f8 d734 0000 0204 0584 4500 0028 ffe8 4000 ef06 536d 96cb e002 c0a8 0103 0014 8033 d9f8 11d5 bd78 5c13 5010 269c cb1d 0000 *************** *** 34,47 **** 4500 0028 10da 4000 ff06 327c c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1211 5010 6348 8e35 0000 4500 0028 10db 4000 ff06 327b c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1211 5011 6348 8e34 0000 4500 0028 ffec 4000 ef06 5369 96cb e002 c0a8 0103 0014 8033 d9f8 1211 bd78 5c14 5010 269c cae0 0000 ! 4500 0028 10dc 4000 ff06 327a 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 790a 5010 269c 5812 0000 4500 0040 ffed 4000 ef06 5350 96cb e002 c0a8 0103 0015 8032 3786 790a bd6b ca1a 5018 269c 7c9e 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a ! 4500 0030 10dd 4000 ff06 3271 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 7922 5018 269c 85f8 0000 5459 5045 2049 0d0a 4500 0038 ffee 4000 ef06 5357 96cb e002 c0a8 0103 0015 8032 3786 7922 bd6b ca22 5018 269c 5ef0 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a ! 4500 0028 10de 4000 ff06 3278 0101 0101 96cb e002 8032 0015 bd6b ca1a 3786 7932 5010 269c 57e2 0000 ! 4500 002e 10df 4000 ff06 3271 0101 0101 96cb e002 8032 0015 bd6b ca1a 3786 7932 5018 269c b020 0000 5155 4954 0d0a 4500 0036 ffef 4000 ef06 5358 96cb e002 c0a8 0103 0015 8032 3786 7932 bd6b ca28 5018 269c a93c 0000 3232 3120 476f 6f64 6279 652e 0d0a ! 4500 0028 10e0 4000 ff06 3276 0101 0101 96cb e002 8032 0015 bd6b ca20 3786 7940 5011 269c 57cd 0000 4500 0028 fff0 4000 ef06 5365 96cb e002 c0a8 0103 0015 8032 3786 7940 bd6b ca28 5011 269c 981b 0000 4500 0028 10e1 4000 ff06 3275 c0a8 0103 96cb e002 8032 0015 bd6b ca25 3786 7941 5010 269c 981e 0000 4500 0028 fff1 4000 ef06 5364 96cb e002 c0a8 0103 0015 8032 3786 7941 bd6b ca29 5010 269c 981a 0000 --- 34,47 ---- 4500 0028 10da 4000 ff06 327c c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1211 5010 6348 8e35 0000 4500 0028 10db 4000 ff06 327b c0a8 0103 96cb e002 8033 0014 bd78 5c13 d9f8 1211 5011 6348 8e34 0000 4500 0028 ffec 4000 ef06 5369 96cb e002 c0a8 0103 0014 8033 d9f8 1211 bd78 5c14 5010 269c cae0 0000 ! 4500 0028 10dc 4000 ff06 f223 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 790a 5010 269c 5812 0000 4500 0040 ffed 4000 ef06 5350 96cb e002 c0a8 0103 0015 8032 3786 790a bd6b ca1a 5018 269c 7c9e 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a ! 4500 0030 10dd 4000 ff06 f21a 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 7922 5018 269c 85f8 0000 5459 5045 2049 0d0a 4500 0038 ffee 4000 ef06 5357 96cb e002 c0a8 0103 0015 8032 3786 7922 bd6b ca22 5018 269c 5ef0 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a ! 4500 0028 10de 4000 ff06 f221 0101 0101 96cb e002 8032 0015 bd6b ca1a 3786 7932 5010 269c 57e2 0000 ! 4500 002e 10df 4000 ff06 f21a 0101 0101 96cb e002 8032 0015 bd6b ca1a 3786 7932 5018 269c b020 0000 5155 4954 0d0a 4500 0036 ffef 4000 ef06 5358 96cb e002 c0a8 0103 0015 8032 3786 7932 bd6b ca28 5018 269c a93c 0000 3232 3120 476f 6f64 6279 652e 0d0a ! 4500 0028 10e0 4000 ff06 f21f 0101 0101 96cb e002 8032 0015 bd6b ca20 3786 7940 5011 269c 57cd 0000 4500 0028 fff0 4000 ef06 5365 96cb e002 c0a8 0103 0015 8032 3786 7940 bd6b ca28 5011 269c 981b 0000 4500 0028 10e1 4000 ff06 3275 c0a8 0103 96cb e002 8032 0015 bd6b ca25 3786 7941 5010 269c 981e 0000 4500 0028 fff1 4000 ef06 5364 96cb e002 c0a8 0103 0015 8032 3786 7941 bd6b ca29 5010 269c 981a 0000 Only in ip_fil3.4.35/test/expected: ni7 Only in ip_fil3.4.35/test/expected: ni8 diff -cr ip_fil3.4.34/test/input/f12 ip_fil3.4.35/test/input/f12 *** ip_fil3.4.34/test/input/f12 Fri Jan 10 02:14:56 1997 --- ip_fil3.4.35/test/input/f12 Sun May 30 19:45:36 2004 *************** *** 1,35 **** # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF SYN ! 45 00 0028 0000 4000 3f 06 0000 01010101 02010101 0401 0019 00000000 00000000 50 02 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF ACK ! 45 00 0028 0000 4000 3f 06 0000 01010101 02010101 0401 0019 00000000 00000000 50 10 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 ACK ! 45 00 0028 0000 6000 3f 06 0000 01010101 02010101 0401 0019 00000000 00000000 50 10 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 ! 45 00 001c 0000 6000 3f 06 0000 01010101 02010101 0401 0019 00000000 # 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 ACK ! 45 00 001c 0000 6001 3f 06 0000 01010101 02010101 00000000 50 10 2000 # 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 ! 45 00 0014 0000 6000 3f 11 0000 01010101 02010101 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 0018 0000 2000 3f 11 0000 01010101 02010101 0035 0035 # 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 ! 45 00 001c 0000 2000 3f 11 0000 01010101 02010101 0001 0001 0004 0000 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 001c 0000 2000 3f 11 0000 01010101 02010101 0035 0035 0004 0000 --- 1,35 ---- # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF SYN ! 45 00 0028 0000 4000 3f 06 36cd 01010101 02010101 0401 0019 00000000 00000000 50 02 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF ACK ! 45 00 0028 0000 4000 3f 06 36cd 01010101 02010101 0401 0019 00000000 00000000 50 10 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 ACK ! 45 00 0028 0000 6000 3f 06 16cd 01010101 02010101 0401 0019 00000000 00000000 50 10 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 ! 45 00 001c 0000 6000 3f 06 16d9 01010101 02010101 0401 0019 00000000 # 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 ACK ! 45 00 001c 0000 6001 3f 06 16d8 01010101 02010101 00000000 50 10 2000 # 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 ! 45 00 0014 0000 6000 3f 11 16d6 01010101 02010101 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 0018 0000 2000 3f 11 56d2 01010101 02010101 0035 0035 # 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 ! 45 00 001c 0000 2000 3f 11 56ce 01010101 02010101 0001 0001 0004 0000 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 001c 0000 2000 3f 11 56ce 01010101 02010101 0035 0035 0004 0000 diff -cr ip_fil3.4.34/test/input/f13 ip_fil3.4.35/test/input/f13 *** ip_fil3.4.34/test/input/f13 Sun Jun 30 01:33:47 2002 --- ip_fil3.4.35/test/input/f13 Sun May 30 19:45:36 2004 *************** *** 1,51 **** # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF,MF,FO=0 SYN ! 45 00 0028 0001 4000 3f 06 0000 01010101 02010101 0401 0019 00000000 00000000 50 02 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP MF ACK ! 45 00 0024 0002 2000 3f 06 0000 01010101 02010101 0401001900000000 0000000050102000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP FO=2 ACK ! 45 00 002c 0002 0002 3f 06 0000 01010101 02010101 0000000000010203 0405060708090a0b 0c0d0e0f10111213 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 SYN ! 45 00 0028 0003 6000 3f 06 0000 01010101 02010101 0401 0019 00000000 00000000 50 10 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 ! 45 00 001c 0004 6000 3f 06 0000 01010101 02010101 0401 0019 00000000 # 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 SYN ! 45 00 001c 0005 6001 3f 06 0000 01010101 02010101 00000000 50 10 2000 # 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 ! 45 00 0014 0006 6000 3f 11 0000 01010101 02010101 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 0018 0007 2000 3f 11 0000 01010101 02010101 0035 0035 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 001c 0008 2000 3f 11 0000 01010101 02010101 0035003500040000 # 1.1.1.1,53 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 (short) ! 45 00 0018 0008 2000 3f 11 0000 01010101 02010101 00350036 # 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 ! 45 00 001c 0008 2000 3f 11 0000 01010101 02010101 0015003600040000 # 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 TCP MF FO=0 ! 45 00 001c 0008 2000 3f 06 0000 01010101 02010101 0015 0036 00000000 00000000 50 02 2000 0000 0000 # 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=1 ! 45 00 001c 0008 0001 3f 11 0000 01010101 02010101 0000000000000000 --- 1,51 ---- # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF,MF,FO=0 SYN ! 45 00 0028 0001 4000 3f 06 36cc 01010101 02010101 0401 0019 00000000 00000000 50 02 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP MF ACK ! 45 00 0024 0002 2000 3f 06 56cf 01010101 02010101 0401001900000000 0000000050102000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP FO=2 ACK ! 45 00 002c 0002 0002 3f 06 76c5 01010101 02010101 0000000000010203 0405060708090a0b 0c0d0e0f10111213 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 SYN ! 45 00 0028 0003 6000 3f 06 16ca 01010101 02010101 0401 0019 00000000 00000000 50 10 2000 0000 0000 # 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 ! 45 00 001c 0004 6000 3f 06 16d5 01010101 02010101 0401 0019 00000000 # 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 SYN ! 45 00 001c 0005 6001 3f 06 16d3 01010101 02010101 00000000 50 10 2000 # 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 ! 45 00 0014 0006 6000 3f 11 16d0 01010101 02010101 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 0018 0007 2000 3f 11 56cb 01010101 02010101 0035 0035 # 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 ! 45 00 001c 0008 2000 3f 11 56c6 01010101 02010101 0035003500040000 # 1.1.1.1,53 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 (short) ! 45 00 0018 0008 2000 3f 11 56ca 01010101 02010101 00350036 # 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 ! 45 00 001c 0008 2000 3f 11 56c6 01010101 02010101 0015003600040000 # 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 TCP MF FO=0 ! 45 00 001c 0008 2000 3f 06 56d1 01010101 02010101 0015 0036 00000000 00000000 50 02 2000 0000 0000 # 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=1 ! 45 00 001c 0008 0001 3f 11 76c5 01010101 02010101 0000000000000000 diff -cr ip_fil3.4.34/test/input/f17 ip_fil3.4.35/test/input/f17 *** ip_fil3.4.34/test/input/f17 Wed Apr 10 15:05:32 2002 --- ip_fil3.4.35/test/input/f17 Sun May 30 19:45:36 2004 *************** *** 1,61 **** # (1.1.1.1,54076,seq=0xbfd08989) -> (2.2.2.2,25,seq=0) SYN [out,ppp0] ! 4500 003c 8262 0000 4006 8417 0101 0101 0202 0202 d33c 0019 bfd0 8989 0000 0000 ! a002 4000 6190 0000 0204 05b4 0103 0300 0101 080a 008e 17f7 0000 0000 # (2.2.2.2,25,seq=0x40203436) -> (1.1.1.1,54076,seq=0xbfdfcbc9) ACK [in,ppp0] ! 4500 003c 8262 0000 1106 b317 0202 0202 0101 0101 0019 d33c 4020 3436 bfdf cbc9 ! 5010 4000 fb0c 0000 0204 0584 0103 0300 0101 080a 008e 17f7 0000 0000 # (1.1.1.1,54076,seq=0xbfd08989) -> (2.2.2.2,25,seq=0x0) SYN [out,ppp0] ! 4500 003c 8265 0000 4006 8414 0101 0101 0202 0202 d33c 0019 bfd0 8989 0000 0000 ! a002 4000 6185 0000 0204 05b4 0103 0300 0101 080a 008e 1802 0000 0000 # (2.2.2.2,25,seq=0xed674d4e) -> (1.1.1.1,54076,seq=0xbfd0898a) SYN-ACK [in,ppp0] ! 4500 002c 7442 4000 2906 6947 0202 0202 0101 0101 0019 d33c ed67 4d4e bfd0 898a ! 6012 2118 ab84 0000 0204 0584 # # (2.2.2.2,25,seq=0xbfd0898a) -> (1.1.1.1,54076,seq=0xed674d4e) ACK [out,ppp0] ! 4500 002c 8262 0000 4006 8417 0101 0101 0202 0202 d33c 0019 bfd0 898a ed67 4d4e 5010 4000 6190 0000 0000 # (1.1.1.1,54076,seq=0xcfd08989) -> (2.2.2.2,25,seq=0x0) SYN [out,ppp0] ! 4500 003c 8265 0000 4006 8414 0101 0101 0202 0202 d33c 0019 cfd0 8989 0000 0000 ! a002 4000 6185 0000 0204 05b4 0103 0300 0101 080a 008e 1802 0000 0000 # (1.1.1.1,54076,seq=0xcfd08989) -> (2.2.2.2,25,seq=0x0) SYN [out,ppp0] ! 4500 003c 8266 0000 4006 8413 0101 0101 0202 0202 d33c 0019 cfd0 8989 0000 0000 ! a002 4000 6185 0000 0204 05b4 0103 0300 0101 080a 008e 1802 0000 0000 # (2.2.2.2,25,seq=0xed674d4e) -> (1.1.1.1,54076,seq=0xcfd0898a) SYN-ACK [in,ppp0] ! 4500 002c 7442 4000 2906 6947 0202 0202 0101 0101 0019 d33c ed67 4d4e cfd0 898a ! 6012 2118 ab84 0000 0204 0584 # # (2.2.2.2,25,seq=0xcfd0898a) -> (1.1.1.1,54076,seq=0xed674d4e) ACK [out,ppp0] ! 4500 002c 8262 0000 4006 8417 0101 0101 0202 0202 d33c 0019 cfd0 898a ed67 4d4e 5010 4000 6190 0000 0000 --- 1,61 ---- # (1.1.1.1,54076,seq=0xbfd08989) -> (2.2.2.2,25,seq=0) SYN [out,ppp0] ! 4500 003c 8262 0000 4006 f254 0101 0101 0202 0202 d33c 0019 bfd0 8989 0000 0000 ! a002 4000 cfcd 0000 0204 05b4 0103 0300 0101 080a 008e 17f7 0000 0000 # (2.2.2.2,25,seq=0x40203436) -> (1.1.1.1,54076,seq=0xbfdfcbc9) ACK [in,ppp0] ! 4500 003c 8262 0000 1106 2155 0202 0202 0101 0101 0019 d33c 4020 3436 bfdf cbc9 ! 5010 4000 694a 0000 0204 0584 0103 0300 0101 080a 008e 17f7 0000 0000 # (1.1.1.1,54076,seq=0xbfd08989) -> (2.2.2.2,25,seq=0x0) SYN [out,ppp0] ! 4500 003c 8265 0000 4006 f251 0101 0101 0202 0202 d33c 0019 bfd0 8989 0000 0000 ! a002 4000 cfc2 0000 0204 05b4 0103 0300 0101 080a 008e 1802 0000 0000 # (2.2.2.2,25,seq=0xed674d4e) -> (1.1.1.1,54076,seq=0xbfd0898a) SYN-ACK [in,ppp0] ! 4500 002c 7442 4000 2906 d784 0202 0202 0101 0101 0019 d33c ed67 4d4e bfd0 898a ! 6012 2118 19c2 0000 0204 0584 # # (2.2.2.2,25,seq=0xbfd0898a) -> (1.1.1.1,54076,seq=0xed674d4e) ACK [out,ppp0] ! 4500 002c 8262 0000 4006 f264 0101 0101 0202 0202 d33c 0019 bfd0 898a ed67 4d4e 5010 4000 6190 0000 0000 # (1.1.1.1,54076,seq=0xcfd08989) -> (2.2.2.2,25,seq=0x0) SYN [out,ppp0] ! 4500 003c 8265 0000 4006 f251 0101 0101 0202 0202 d33c 0019 cfd0 8989 0000 0000 ! a002 4000 bfc2 0000 0204 05b4 0103 0300 0101 080a 008e 1802 0000 0000 # (1.1.1.1,54076,seq=0xcfd08989) -> (2.2.2.2,25,seq=0x0) SYN [out,ppp0] ! 4500 003c 8266 0000 4006 f250 0101 0101 0202 0202 d33c 0019 cfd0 8989 0000 0000 ! a002 4000 bfc2 0000 0204 05b4 0103 0300 0101 080a 008e 1802 0000 0000 # (2.2.2.2,25,seq=0xed674d4e) -> (1.1.1.1,54076,seq=0xcfd0898a) SYN-ACK [in,ppp0] ! 4500 002c 7442 4000 2906 d784 0202 0202 0101 0101 0019 d33c ed67 4d4e cfd0 898a ! 6012 2118 09c2 0000 0204 0584 # # (2.2.2.2,25,seq=0xcfd0898a) -> (1.1.1.1,54076,seq=0xed674d4e) ACK [out,ppp0] ! 4500 002c 8262 0000 4006 f264 0101 0101 0202 0202 d33c 0019 cfd0 898a ed67 4d4e 5010 4000 6190 0000 0000 diff -cr ip_fil3.4.34/test/input/ni1 ip_fil3.4.35/test/input/ni1 *** ip_fil3.4.34/test/input/ni1 Sat Jan 12 01:22:47 2002 --- ip_fil3.4.35/test/input/ni1 Fri Jun 4 03:29:30 2004 *************** *** 1,6 **** #v tos len id off ttl p sum src dst # ICMP timeout exceeded in reply to a ICMP packet going out. ! [out,df0] 45 00 0028 4706 4000 01 11 ced8 0202 0202 0404 0404 afc9 829e 0014 1335 0402 0000 3be5 468d 000a cfc3 ! [in,df0] 45 00 0038 809a 0000 ff 01 8f31 0303 0303 0101 0101 0b00 ad3f 0000 0000 4500 0028 4703 4000 0111 e781 0606 0606 0404 0404 afc9 829e 0014 1547 --- 1,19 ---- #v tos len id off ttl p sum src dst # ICMP timeout exceeded in reply to a ICMP packet going out. ! [out,df0] ! 4500 0028 4706 4000 0111 26b4 0202 0202 ! 0404 0404 afc9 829e 0014 6b10 0402 0000 ! 3be5 468d 000a cfc3 ! [in,df0] ! 4500 0038 809a 0000 ff01 2919 0303 0303 ! 0606 0606 0b00 5f7b 0000 0000 ! 4500 0028 4706 4000 0111 1eac 0606 0606 0404 0404 ! afc9 829e 0014 6308 ! ! [in,df0] ! 4500 0044 809a 0000 ff01 290d 0303 0303 ! 0606 0606 0b00 0939 0000 0000 ! 4500 0028 4706 4000 0111 1eac 0606 0606 0404 0404 ! afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 Only in ip_fil3.4.35/test/input: ni10 Only in ip_fil3.4.35/test/input: ni11 diff -cr ip_fil3.4.34/test/input/ni2 ip_fil3.4.35/test/input/ni2 *** ip_fil3.4.34/test/input/ni2 Fri Apr 26 20:25:11 2002 --- ip_fil3.4.35/test/input/ni2 Sun May 30 19:45:37 2004 *************** *** 1,27 **** # Test of fragmentation required coming from the inside. [out,xl0] ! 4510 002c bd0d 4000 3e06 ea1d 0a01 0201 c0a8 0133 05f6 0077 a664 2485 0000 0000 6002 4000 b8f2 0000 0204 05b4 [in,xl0] ! 4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 0000 [out,xl0] ! 4510 0028 bd0e 4000 3e06 ea20 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a22 5010 4470 b62d 0000 [in,xl0] ! 4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 --- 1,27 ---- # Test of fragmentation required coming from the inside. [out,xl0] ! 4510 002c bd0d 4000 3e06 b1d1 0a01 0201 c0a8 0133 05f6 0077 a664 2485 0000 0000 6002 4000 b8f2 0000 0204 05b4 [in,xl0] ! 4500 002c ce83 4000 7e06 606b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 0000 [out,xl0] ! 4510 0028 bd0e 4000 3e06 b1d4 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a22 5010 4470 b62d 0000 [in,xl0] ! 4500 005b cf83 4000 7e06 5f3c c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 *************** *** 31,51 **** 0000 0000 0000 0000 0000 0a [out,xl0] ! 4510 0028 bd18 4000 3e06 ea16 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 5010 4470 b5fa 0000 [out,xl0] ! 4510 002e bd1e 4000 3e06 ea0a 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 5018 4470 a8e2 0000 0000 0000 0d0a [in,xl0] ! 4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c --- 31,51 ---- 0000 0000 0000 0000 0000 0a [out,xl0] ! 4510 0028 bd18 4000 3e06 b1ca 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 5010 4470 b5fa 0000 [out,xl0] ! 4510 002e bd1e 4000 3e06 b1be 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 5018 4470 a8e2 0000 0000 0000 0d0a [in,xl0] ! 4500 0048 e383 4000 7e06 4b4f c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c *************** *** 54,60 **** 0000 0000 0000 0000 [in,xl0] ! 4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c --- 54,60 ---- 0000 0000 0000 0000 [in,xl0] ! 4500 05dc e483 4000 7e06 44bb c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c *************** *** 152,161 **** 0000 0000 0000 0000 0000 0000 [out,xl0] ! 4500 0038 d71d 4000 4001 ce16 c0a8 6401 c0a8 0133 ! 0304 cad5 0000 05a0 4500 05dc ! e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 --- 152,161 ---- 0000 0000 0000 0000 0000 0000 [out,xl0] ! 4500 0038 d71d 4000 4001 7d22 c0a8 6401 c0a8 0133 ! 0304 da99 0000 05a0 4500 05dc ! e483 4000 7e06 44bb c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 diff -cr ip_fil3.4.34/test/input/ni3 ip_fil3.4.35/test/input/ni3 *** ip_fil3.4.34/test/input/ni3 Thu Jun 6 21:18:27 2002 --- ip_fil3.4.35/test/input/ni3 Sun May 30 19:45:37 2004 *************** *** 3,10 **** # going out) [out,df0] 45 00 00 3c 47 06 40 00 ff 06 28 aa 02 02 02 02 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d8 e2 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 ! [in,df0] 45 00 00 38 80 9a 00 00 ff 01 33 23 03 03 03 03 01 01 01 01 03 03 ac ab 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 50 00 00 50 00 00 00 01 # ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) ! [in,df0] 45 00 00 58 80 9a 00 00 ff 01 33 03 03 03 03 03 01 01 01 01 03 03 11 3f 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d0 da 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 --- 3,10 ---- # going out) [out,df0] 45 00 00 3c 47 06 40 00 ff 06 28 aa 02 02 02 02 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d8 e2 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 ! [in,df0] 45 00 00 38 80 9a 00 00 ff 01 29 19 03 03 03 03 06 06 06 06 03 03 ac ac 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 50 00 00 50 00 00 00 01 # ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) ! [in,df0] 45 00 00 58 80 9a 00 00 ff 01 28 f9 03 03 03 03 06 06 06 06 03 03 11 3f 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d0 da 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 diff -cr ip_fil3.4.34/test/input/ni4 ip_fil3.4.35/test/input/ni4 *** ip_fil3.4.34/test/input/ni4 Mon Apr 22 01:53:12 2002 --- ip_fil3.4.35/test/input/ni4 Sun May 30 19:45:37 2004 *************** *** 3,10 **** # going out) [out,df0] 45 00 00 3c 47 06 40 00 ff 06 28 aa 02 02 02 02 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d8 e2 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 ! [in,df0] 45 00 00 38 80 9a 00 00 ff 01 33 23 03 03 03 03 01 01 01 01 03 03 60 6b 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 9c 40 00 50 00 00 00 01 # ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) ! [in,df0] 45 00 00 58 80 9a 00 00 ff 01 33 03 03 03 03 03 01 01 01 01 03 03 11 3f 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 9c 40 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 84 9a 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 --- 3,10 ---- # going out) [out,df0] 45 00 00 3c 47 06 40 00 ff 06 28 aa 02 02 02 02 04 04 04 04 50 00 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 d8 e2 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 ! [in,df0] 45 00 00 38 80 9a 00 00 ff 01 29 19 03 03 03 03 06 06 06 06 03 03 60 6c 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 9c 40 00 50 00 00 00 01 # ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) ! [in,df0] 45 00 00 58 80 9a 00 00 ff 01 28 f9 03 03 03 03 06 06 06 06 03 03 11 3f 00 00 00 00 45 00 00 3c 47 06 40 00 ff 06 20 a2 06 06 06 06 04 04 04 04 9c 40 00 50 00 00 00 01 00 00 00 00 a0 02 16 d0 84 9a 00 00 02 04 05 b4 04 02 08 0a 00 47 fb b0 00 00 00 00 01 03 03 00 diff -cr ip_fil3.4.34/test/input/ni5 ip_fil3.4.35/test/input/ni5 *** ip_fil3.4.34/test/input/ni5 Sat Nov 2 14:29:47 2002 --- ip_fil3.4.35/test/input/ni5 Sun May 30 19:45:37 2004 *************** *** 4,10 **** 6002 2238 35f9 0000 0204 05b4 [in,ppp0] ! 4500 002c ffdd 4000 ef06 5374 96cb e002 0101 0101 0015 8032 3786 76c4 bd6b c9c9 6012 269c 4313 0000 0204 0584 --- 4,10 ---- 6002 2238 35f9 0000 0204 05b4 [in,ppp0] ! 4500 002c ffdd 4000 ef06 131e 96cb e002 0101 0101 0015 8032 3786 76c4 bd6b c9c9 6012 269c 4313 0000 0204 0584 *************** *** 14,20 **** 5010 269c 9af6 0000 [in,ppp0] ! 4500 006f ffde 4000 ef06 5330 96cb e002 0101 0101 0015 8032 3786 76c5 bd6b c9c9 5018 269c 5628 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 --- 14,20 ---- 5010 269c 9af6 0000 [in,ppp0] ! 4500 006f ffde 4000 ef06 12da 96cb e002 0101 0101 0015 8032 3786 76c5 bd6b c9c9 5018 269c 5628 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 *************** *** 28,34 **** 5010 269c 9aaf 0000 [in,ppp0] ! 4500 00c7 ffdf 4000 ef06 52d7 96cb e002 0101 0101 0015 8032 3786 770c bd6b c9c9 5018 269c d030 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 --- 28,34 ---- 5010 269c 9aaf 0000 [in,ppp0] ! 4500 00c7 ffdf 4000 ef06 1281 96cb e002 0101 0101 0015 8032 3786 770c bd6b c9c9 5018 269c d030 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 *************** *** 54,65 **** 6e79 6d6f 7573 0d0a [in,ppp0] ! 4500 0028 ffe0 4000 ef06 5375 96cb e002 0101 0101 0015 8032 3786 77ab bd6b c9d9 5010 269c 59aa 0000 [in,ppp0] ! 4500 006c ffe1 4000 ef06 5330 96cb e002 0101 0101 0015 8032 3786 77ab bd6b c9d9 5018 269c 6fb9 0000 3333 3120 4775 6573 7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64 --- 54,65 ---- 6e79 6d6f 7573 0d0a [in,ppp0] ! 4500 0028 ffe0 4000 ef06 131f 96cb e002 0101 0101 0015 8032 3786 77ab bd6b c9d9 5010 269c 59aa 0000 [in,ppp0] ! 4500 006c ffe1 4000 ef06 12da 96cb e002 0101 0101 0015 8032 3786 77ab bd6b c9d9 5018 269c 6fb9 0000 3333 3120 4775 6573 7420 6c6f 6769 6e20 6f6b 2c20 7365 6e64 *************** *** 79,85 **** 6c6f 6e40 0d0a [in,ppp0] ! 4500 005f ffe2 4000 ef06 533c 96cb e002 0101 0101 0015 8032 3786 77ef bd6b c9e7 5018 269c 4908 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 --- 79,85 ---- 6c6f 6e40 0d0a [in,ppp0] ! 4500 005f ffe2 4000 ef06 12e6 96cb e002 0101 0101 0015 8032 3786 77ef bd6b c9e7 5018 269c 4908 0000 3233 302d 596f 7520 6172 6520 7573 6572 2023 3420 6f66 2035 *************** *** 92,98 **** 5010 269c 9977 0000 [in,ppp0] ! 4500 0099 ffe3 4000 ef06 5301 96cb e002 0101 0101 0015 8032 3786 7826 bd6b c9e7 5018 269c 9343 0000 3233 302d 0d0a 3233 302d 0d0a 3233 302d 4869 2e20 2057 6527 --- 92,98 ---- 5010 269c 9977 0000 [in,ppp0] ! 4500 0099 ffe3 4000 ef06 12ab 96cb e002 0101 0101 0015 8032 3786 7826 bd6b c9e7 5018 269c 9343 0000 3233 302d 0d0a 3233 302d 0d0a 3233 302d 4869 2e20 2057 6527 *************** *** 114,120 **** 5018 269c c704 0000 5459 5045 2049 0d0a [in,ppp0] ! 4500 0038 ffe4 4000 ef06 5361 96cb e002 0101 0101 0015 8032 3786 7897 bd6b c9ef 5018 269c 1f58 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a --- 114,120 ---- 5018 269c c704 0000 5459 5045 2049 0d0a [in,ppp0] ! 4500 0038 ffe4 4000 ef06 130b 96cb e002 0101 0101 0015 8032 3786 7897 bd6b c9ef 5018 269c 1f58 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a *************** *** 132,138 **** 0a [in,ppp0] ! 4500 0046 ffe5 4000 ef06 5352 96cb e002 0101 0101 0015 8032 3786 78a7 bd6b ca08 5018 269c 9b71 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 --- 132,138 ---- 0a [in,ppp0] ! 4500 0046 ffe5 4000 ef06 12fc 96cb e002 0101 0101 0015 8032 3786 78a7 bd6b ca08 5018 269c 9b71 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 *************** *** 144,150 **** 5018 269c c6bd 0000 5459 5045 2041 0d0a [in,ppp0] ! 4500 0038 ffe6 4000 ef06 535f 96cb e002 0101 0101 0015 8032 3786 78c5 bd6b ca10 5018 269c 1f09 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a --- 144,150 ---- 5018 269c c6bd 0000 5459 5045 2041 0d0a [in,ppp0] ! 4500 0038 ffe6 4000 ef06 1309 96cb e002 0101 0101 0015 8032 3786 78c5 bd6b ca10 5018 269c 1f09 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a *************** *** 155,161 **** 5018 269c e9e6 0000 4e4c 5354 0d0a [in,ppp0] ! 4500 002c ffe7 4000 ef06 536a 96cb e002 0101 0101 0014 8033 d9f8 11d4 0000 0000 6002 2238 913a 0000 0204 0584 --- 155,161 ---- 5018 269c e9e6 0000 4e4c 5354 0d0a [in,ppp0] ! 4500 002c ffe7 4000 ef06 1314 96cb e002 0101 0101 0014 8033 d9f8 11d4 0000 0000 6002 2238 913a 0000 0204 0584 *************** *** 165,176 **** 6012 02f8 d734 0000 0204 0584 [in,ppp0] ! 4500 0028 ffe8 4000 ef06 536d 96cb e002 0101 0101 0014 8033 d9f8 11d5 bd78 5c13 5010 269c 8ac7 0000 [in,ppp0] ! 4500 005d ffe9 4000 ef06 5337 96cb e002 0101 0101 0015 8032 3786 78d5 bd6b ca16 5018 269c ae7e 0000 3135 3020 4f70 656e 696e 6720 4153 4349 4920 6d6f 6465 2064 --- 165,176 ---- 6012 02f8 d734 0000 0204 0584 [in,ppp0] ! 4500 0028 ffe8 4000 ef06 1317 96cb e002 0101 0101 0014 8033 d9f8 11d5 bd78 5c13 5010 269c 8ac7 0000 [in,ppp0] ! 4500 005d ffe9 4000 ef06 12e1 96cb e002 0101 0101 0015 8032 3786 78d5 bd6b ca16 5018 269c ae7e 0000 3135 3020 4f70 656e 696e 6720 4153 4349 4920 6d6f 6465 2064 *************** *** 183,189 **** 5010 6348 8e71 0000 [in,ppp0] ! 4500 0063 ffea 4000 ef06 5330 96cb e002 0101 0101 0014 8033 d9f8 11d5 bd78 5c13 5018 269c 62bf 0000 636f 6f6d 6273 7061 7065 7273 0d0a 6465 7074 730d 0a66 6f75 --- 183,189 ---- 5010 6348 8e71 0000 [in,ppp0] ! 4500 0063 ffea 4000 ef06 12da 96cb e002 0101 0101 0014 8033 d9f8 11d5 bd78 5c13 5018 269c 62bf 0000 636f 6f6d 6273 7061 7065 7273 0d0a 6465 7074 730d 0a66 6f75 *************** *** 197,203 **** 5010 6348 8e36 0000 [in,ppp0] ! 4500 0028 ffeb 4000 ef06 536a 96cb e002 0101 0101 0014 8033 d9f8 1210 bd78 5c13 5011 269c 8a8b 0000 --- 197,203 ---- 5010 6348 8e36 0000 [in,ppp0] ! 4500 0028 ffeb 4000 ef06 1314 96cb e002 0101 0101 0014 8033 d9f8 1210 bd78 5c13 5011 269c 8a8b 0000 *************** *** 212,218 **** 5011 6348 8e34 0000 [in,ppp0] ! 4500 0028 ffec 4000 ef06 5369 96cb e002 0101 0101 0014 8033 d9f8 1211 bd78 5c14 5010 269c 8a8a 0000 --- 212,218 ---- 5011 6348 8e34 0000 [in,ppp0] ! 4500 0028 ffec 4000 ef06 1313 96cb e002 0101 0101 0014 8033 d9f8 1211 bd78 5c14 5010 269c 8a8a 0000 *************** *** 222,228 **** 5010 269c 9864 0000 [in,ppp0] ! 4500 0040 ffed 4000 ef06 5350 96cb e002 0101 0101 0015 8032 3786 790a bd6b ca16 5018 269c 3c4c 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a --- 222,228 ---- 5010 269c 9864 0000 [in,ppp0] ! 4500 0040 ffed 4000 ef06 12fa 96cb e002 0101 0101 0015 8032 3786 790a bd6b ca16 5018 269c 3c4c 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a *************** *** 233,239 **** 5018 269c c64a 0000 5459 5045 2049 0d0a [in,ppp0] ! 4500 0038 ffee 4000 ef06 5357 96cb e002 0101 0101 0015 8032 3786 7922 bd6b ca1e 5018 269c 1e9e 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a --- 233,239 ---- 5018 269c c64a 0000 5459 5045 2049 0d0a [in,ppp0] ! 4500 0038 ffee 4000 ef06 1301 96cb e002 0101 0101 0015 8032 3786 7922 bd6b ca1e 5018 269c 1e9e 0000 3230 3020 5479 7065 206f 6b61 792e 0d0a *************** *** 249,255 **** 5018 269c f072 0000 5155 4954 0d0a [in,ppp0] ! 4500 0036 ffef 4000 ef06 5358 96cb e002 0101 0101 0015 8032 3786 7932 bd6b ca24 5018 269c 68ea 0000 3232 3120 476f 6f64 6279 652e 0d0a --- 249,255 ---- 5018 269c f072 0000 5155 4954 0d0a [in,ppp0] ! 4500 0036 ffef 4000 ef06 1302 96cb e002 0101 0101 0015 8032 3786 7932 bd6b ca24 5018 269c 68ea 0000 3232 3120 476f 6f64 6279 652e 0d0a *************** *** 260,266 **** 5011 269c 981f 0000 [in,ppp0] ! 4500 0028 fff0 4000 ef06 5365 96cb e002 0101 0101 0015 8032 3786 7940 bd6b ca24 5011 269c 57c9 0000 --- 260,266 ---- 5011 269c 981f 0000 [in,ppp0] ! 4500 0028 fff0 4000 ef06 130f 96cb e002 0101 0101 0015 8032 3786 7940 bd6b ca24 5011 269c 57c9 0000 *************** *** 270,276 **** 5010 269c 981e 0000 [in,ppp0] ! 4500 0028 fff1 4000 ef06 5364 96cb e002 0101 0101 0015 8032 3786 7941 bd6b ca25 5010 269c 57c8 0000 --- 270,276 ---- 5010 269c 981e 0000 [in,ppp0] ! 4500 0028 fff1 4000 ef06 130e 96cb e002 0101 0101 0015 8032 3786 7941 bd6b ca25 5010 269c 57c8 0000 Only in ip_fil3.4.35/test/input: ni7 Only in ip_fil3.4.35/test/input: ni8 Only in ip_fil3.4.35/test/regress: ni10.ipf Only in ip_fil3.4.35/test/regress: ni10.nat Only in ip_fil3.4.35/test/regress: ni11.ipf Only in ip_fil3.4.35/test/regress: ni11.nat Only in ip_fil3.4.35/test/regress: ni7.ipf Only in ip_fil3.4.35/test/regress: ni7.nat Only in ip_fil3.4.35/test/regress: ni8.ipf Only in ip_fil3.4.35/test/regress: ni8.nat Only in ip_fil3.4.35/test: vfycksum.pl