diff options
| author | cy <cy@FreeBSD.org> | 2013-09-21 14:23:20 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2013-09-21 14:23:20 +0000 |
| commit | 1f79bda80fc99a9bea37dc83f80019be39c33c5a (patch) | |
| tree | 3915c70585141494037a8c4fd909db7ea85a2aac | |
| parent | b3f0452e3485d31d295010234a8951b1129a6f0b (diff) | |
| download | FreeBSD-src-1f79bda80fc99a9bea37dc83f80019be39c33c5a.zip FreeBSD-src-1f79bda80fc99a9bea37dc83f80019be39c33c5a.tar.gz | |
Remove redundant files.
Approved by: glebius (mentor)
Approved by: re (blanket)
529 files changed, 0 insertions, 30779 deletions
diff --git a/contrib/ipfilter/BSD/Makefile b/contrib/ipfilter/BSD/Makefile deleted file mode 100644 index 4f2c2b9..0000000 --- a/contrib/ipfilter/BSD/Makefile +++ /dev/null @@ -1,619 +0,0 @@ -# -# Copyright (C) 2012 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -BINDEST=/usr/sbin -SBINDEST=/sbin -MANDIR=/usr/share/man -SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i<NF;i++){print $$i;}}' - | sort -u - -CC=gcc -Wall -Wuninitialized -Wstrict-prototypes -O -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare -Wno-traditional -Werror -#UFLAGS=-fprofile-arcs -ftest-coverage -CFLAGS=-g -I$(TOP) -# -# For NetBSD/FreeBSD -# -DEVFS!=/usr/bin/lsvfs 2>&1 | sed -n 's/.*devfs.*/-DDEVFS/p' -CPU!=uname -m -COMPDIR!=/bin/ls -1tr /usr/src/sys/arch/${CPU}/compile | tail -1 -INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -I/usr/src/sys/arch/${CPU}/compile/${COMPDIR} -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin -IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST -VNODESHDIR=/sys/kern -MLD=$(ML) -ML=mln_ipl.c -LKM=ipflkm.o -LKMR=ipfrule.o -DLKM= -OBJ=. -DEST=$(OBJ) -MFLAGS="BINDEST=$(BINDEST)" "SBINDEST=$(SBINDEST)" "MANDIR=$(MANDIR)" \ - 'CFLAGS=$(CFLAGS) $(SOLARIS2)' "IPFLKM=$(IPFLKM)" \ - "IPFLOG=$(IPFLOG)" "LOGFAC=$(LOGFAC)" "POLICY=$(POLICY)" \ - "SOLARIS2=$(SOLARIS2)" "DEBUG=$(DEBUG)" "DCPU=$(CPU)" \ - "CPUDIR=$(CPUDIR)" "LOOKUP=$(LOOKUP)" "SYNC=$(SYNC)" -LIBS=-L. -lipf $(LIBBPF) -# -########## ########## ########## ########## ########## ########## ########## -# -CP=/bin/cp -RM=/bin/rm -CHMOD=/bin/chmod -INSTALL=install -# -MODOBJS=ip_fil.o fil.o ml_ipl.o ip_nat.o ip_frag.o ip_state.o ip_proxy.o \ - ip_auth.o ip_log.o ip_pool.o ip_htable.o ip_lookup.o ip_rules.o \ - ip_scan.o ip_sync.o ip_nat6.o ip_dstlist.o radix_ipf.o -# ip_trafcon.o -DFLAGS=$(IPFLKM) $(IPFLOG) $(LOOKUP) $(SYNC) $(DEF) $(DLKM) $(IPFBPF) -IPF=ipf.o ipfcomp.o ipf_y.o ipf_l.o -IPT=ipftest.o fil_u.o ip_frag_u.o ip_state_u.o ip_nat_u.o ip_nat6_u.o \ - ip_proxy_u.o ip_auth_u.o ip_htable_u.o ip_lookup_u.o ip_pool_u.o \ - ip_scan_u.o ip_sync_u.o ip_rules_u.o ip_fil_u.o ip_log_u.o \ - ippool_y.o ippool_l.o ipf_y.o ipf_l.o ipnat_y.o ipnat_l.o \ - md5_u.o radix_ipf_u.o ip_dstlist_u.o -# ip_syn_u.o -#ip_trafcon_u.o -TOOL=$(TOP)/tools -IPNAT=ipnat.o ipnat_y.o ipnat_l.o -IPMON=ipmon.o ipmon_y.o ipmon_l.o -IPPOOL=ippool_y.o ippool_l.o kmem.o ippool.o -IPTRAFCON=iptrafcon.o -PROXYLIST=$(TOP)/ip_dns_pxy.c $(TOP)/ip_ftp_pxy.c $(TOP)/ip_ipsec_pxy.c \ - $(TOP)/ip_irc_pxy.c $(TOP)/ip_netbios_pxy.c $(TOP)/ip_raudio_pxy.c \ - $(TOP)/ip_rcmd_pxy.c $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_pptp_pxy.c -FILS=ipfstat.o -LIBSRC=$(TOP)/lib -RANLIB=ranlib -AROPTS=cq -HERE!=pwd -CCARGS=-I. $(DEBUG) $(CFLAGS) $(UFLAGS) -KCARGS=-I. $(DEBUG) $(CFLAGS) -.if ${MACHINE_ARCH} == amd64 -KCARGS+=-mcmodel=kernel -mno-red-zone -fno-omit-frame-pointer \ - -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow \ - -msoft-float -fno-asynchronous-unwind-tables -.endif -# -# Extra is option kernel things we always want in user space. -# -EXTRA=$(ALLOPTS) - -include $(TOP)/lib/Makefile - -build all: machine $(OBJ)/libipf.a tools $(LKM) $(LKMR) - -tools: ipf ipfs ipfstat ipftest ipmon ipnat ippool ipscan ipsyncm \ - ipsyncs ipfsyncd - -sh -c 'for i in ipf ipftest ipmon ippool ipnat ipscan ipsyncm ipsyncs ipfsyncd; do /bin/rm -f $(TOP)/$$i; ln -s `pwd`/$$i $(TOP); done' - -/bin/rm -f ../tools ./tools - -ln -s ../tools . - -ln -s ../tools .. - -bpf.h: - echo '#define DEV_BPF 1' > bpf.h - -$(TOP)/ip_compat.h: bpf.h - -machine: Makefile.kmod - if [ -f Makefile.kmod ] ; then \ - make -f Makefile.kmod depend MKUPDATE=no; \ - fi - -Makefile.kmod: - if [ -f /usr/share/mk/bsd.kmod.mk -a "`uname -s`" = "NetBSD" ] ; then \ - rm -f Makefile.kmod; \ - ln -s /usr/share/mk/bsd.kmod.mk Makefile.kmod; \ - fi - -ipfstat: $(FILS) $(OBJ)/libipf.a - $(CC) $(CCARGS) $(STATETOP_CFLAGS) $(STATETOP_INC) $(FILS) \ - -o $@ $(LIBS) $(STATETOP_LIB) -lkvm - -ipf: $(IPF) $(OBJ)/libipf.a - $(CC) $(CCARGS) $(IPF) -o $@ $(LIBS) -ll $(LIBBPF) - -ipftest: $(IPT) $(OBJ)/libipf.a - $(CC) $(CCARGS) $(IPT) -o $@ $(LIBS) -ll $(LIBBPF) - -ipnat: $(IPNAT) $(OBJ)/libipf.a - $(CC) $(CCARGS) $(IPNAT) -o $@ $(LIBS) -lkvm -ll - -ipfs: ipfs.o - $(CC) $(CCARGS) ipfs.o -o $@ - -ipsyncm: ipsyncm.o $(OBJ)/libipf.a - $(CC) $(CCARGS) ipsyncm.o -o $@ $(LIBS) - -ipsyncs: ipsyncs.o $(OBJ)/libipf.a - $(CC) $(CCARGS) ipsyncs.o -o $@ $(LIBS) - -ipfsyncd: ipfsyncd.o $(OBJ)/libipf.a - $(CC) $(CCARGS) ipfsyncd.o -o $@ $(LIBS) - -ipsyncm.o: $(TOOL)/ipsyncm.c $(TOP)/ip_sync.h - $(CC) $(CCARGS) -c $(TOOL)/ipsyncm.c -o $@ - -ipsyncs.o: $(TOOL)/ipsyncs.c $(TOP)/ip_sync.h - $(CC) $(CCARGS) -c $(TOOL)/ipsyncs.c -o $@ - -ipfsyncd.o: $(TOOL)/ipfsyncd.c $(TOP)/ip_sync.h - $(CC) $(CCARGS) -c $(TOOL)/ipfsyncd.c -o $@ - -tests: - (cd test; make ) - -ipfstat.o: $(TOOL)/ipfstat.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_frag.h \ - $(TOP)/ip_compat.h $(TOP)/ip_state.h $(TOP)/ip_nat.h $(TOP)/opts.h - $(CC) $(CCARGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \ - -c $(TOOL)/ipfstat.c -o $@ - -ipfs.o: $(TOOL)/ipfs.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_state.h \ - $(TOP)/ip_nat.h $(TOP)/opts.h - $(CC) $(CCARGS) -c $(TOOL)/ipfs.c -o $@ - -fil_u.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_compat.h \ - $(TOP)/opts.h $(TOP)/ip_rules.h - $(CC) $(CCARGS) $(EXTRA) $(IPFBPF) -c $(TOP)/fil.c -o $@ - -fil.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ipl.h \ - $(TOP)/ip_rules.h - $(CC) $(KCARGS) $(POLICY) $(DFLAGS) $(IPFBPF) $(COMPIPF) $(COMPATIPF) \ - -c $(TOP)/fil.c -o $@ - -ipf.o: $(TOOL)/ipf.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/opts.h - $(CC) $(CCARGS) -c $(TOOL)/ipf.c -o $@ - -ipfcomp.o: $(TOOL)/ipfcomp.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/opts.h - $(CC) $(CCARGS) -c $(TOOL)/ipfcomp.c -o $@ - -ipftest.o: $(TOOL)/ipftest.c $(TOP)/ip_fil.h $(TOP)/ipt.h $(TOP)/ipf.h \ - $(TOP)/opts.h - $(CC) $(CCARGS) -c $(TOOL)/ipftest.c -o $@ - -ipnat.o: $(TOOL)/ipnat.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_nat.h \ - $(TOP)/opts.h - $(CC) $(CCARGS) -c $(TOOL)/ipnat.c -o $@ - -ipnat_y.o: ipnat_y.c ipnat_y.h ipnat_l.h $(TOP)/ip_fil.h $(TOP)/ip_nat.h - $(CC) $(CCARGS) -c ipnat_y.c -o $@ - -ipnat_l.o: ipnat_l.c ipnat_y.h - $(CC) $(CCARGS) -I. -c ipnat_l.c -o $@ - -ipnat_y.c: $(TOOL)/ipnat_y.y - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipnat_y.h: ipnat_y.c - -ipnat_l.c: $(TOOL)/lexer.c $(TOP)/ip_nat.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipnat_l.h: $(TOOL)/lexer.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ip_nat_u.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_nat.c -o $@ - -ip_nat6_u.o: $(TOP)/ip_nat6.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_nat6.c -o $@ - -ip_proxy_u.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h $(PROXYLIST) $(TOP)/ip_nat.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_proxy.c -o $@ - -ip_frag_u.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_frag.c -o $@ - -ip_state_u.o: $(TOP)/ip_state.c $(TOP)/ip_state.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h $(TOP)/ip_nat.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_state.c -o $@ - -ip_auth_u.o: $(TOP)/ip_auth.c $(TOP)/ip_auth.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_auth.c -o $@ - -ip_fil_u.o: $(TOP)/ip_fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_fil.c -o $@ - -ip_rules_u.o: ip_rules.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_rules.h - $(CC) $(CCARGS) $(EXTRA) -c ip_rules.c -o $@ - -ip_scan_u.o: $(TOP)/ip_scan.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_scan.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_scan.c -o $@ - -ip_sync_u.o: $(TOP)/ip_sync.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_sync.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_sync.c -o $@ - -ip_pool_u.o: $(TOP)/ip_pool.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_pool.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_pool.c -o $@ - -ip_htable_u.o: $(TOP)/ip_htable.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_htable.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_htable.c -o $@ - -ip_dstlist_u.o: $(TOP)/ip_dstlist.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_dstlist.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_dstlist.c -o $@ - -ip_lookup_u.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_lookup.h $(TOP)/ip_pool.h $(TOP)/ip_htable.h \ - $(TOP)/ip_dstlist.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_lookup.c -o $@ - -ip_trafcon_u.o: $(TOP)/ip_trafcon.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_trafcon.h - $(CC) $(CCARGS) -c $(TOP)/ip_trafcon.c -o $@ - -ip_log_u.o: $(TOP)/ip_log.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_log.c -o $@ - -md5_u.o: $(TOP)/md5.c $(TOP)/md5.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/md5.c -o $@ - -radix_ipf_u.o: $(TOP)/md5.c $(TOP)/radix_ipf.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/radix_ipf.c -o $@ - -bpf_filter_u.o: $(TOP)/bpf_filter.c $(TOP)/pcap-ipf.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/bpf_filter.c -o $@ - -ipflkm.o: $(MODOBJS) - ld -r $(MODOBJS) -o $(LKM) - ${RM} -f ipflkm - -ipfrule.ko.5: ip_rulesx.o $(MLR) -.if ${MACHINE_ARCH} != amd64 - ld -warn-common -r -d -o $(.TARGET:S/.ko/.kld/) ip_rulesx.o $(MLR) - ld -Bshareable -d -warn-common -o $(LKMR:S/.5$//) $(.TARGET:S/.ko/.kld/) -.else - ld -warn-common -r -d -o $(.TARGET:S/.5$//) ip_rulesx.o $(MLR) - nm -g $(.TARGET:S/.5$//) | \ - awk '/^[^[:space:]]+ [^AU] (.*)$$/ { print ($$2=="C" ? "-N" : "-L") $$3 }' | \ - xargs -J% objcopy % $(.TARGET:S/.5$//) - -.endif - -ipfrule.ko: ip_rulesx.o $(MLR) - gensetdefs ip_rulesx.o $(MLR) - $(CC) $(KCARGS) -c setdef0.c - $(CC) $(KCARGS) -c setdef1.c - ld -Bshareable -o $@ setdef0.o ip_rulesx.o $(MLR) setdef1.o - -ipf.ko.5 ipl.ko.5: $(MODOBJS) -.if ${MACHINE_ARCH} != amd64 - ld -warn-common -r -d -o $(.TARGET:S/.ko/.kld/) $(MODOBJS) - ld -Bshareable -d -warn-common -o $(LKM:S/.5$//) $(.TARGET:S/.ko/.kld/) -.else - ld -warn-common -r -d -o $(.TARGET:S/.5$//) $(MODOBJS) - nm -g $(.TARGET:S/.5$//) | \ - awk '/^[^[:space:]]+ [^AU] (.*)$$/ { print ($$2=="C" ? "-N" : "-L") $$3 }' | \ - xargs -J% objcopy % $(.TARGET:S/.5$//) -.endif - -ipf.ko ipl.ko: $(MODOBJS) - gensetdefs $(MODOBJS) - $(CC) $(KCARGS) -c setdef0.c - $(CC) $(KCARGS) -c setdef1.c - ld -Bshareable -o $@ setdef0.o $(MODOBJS) setdef1.o - -ip_nat.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_nat.c -o $@ - -ip_nat6.o: $(TOP)/ip_nat6.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_nat6.c -o $@ - -ip_frag.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_frag.c -o $@ - -ip_state.o: $(TOP)/ip_state.c $(TOP)/ip_state.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h $(TOP)/ip_nat.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_state.c -o $@ - -ip_proxy.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h $(PROXYLIST) $(TOP)/ip_nat.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_proxy.c -o $@ - -ip_auth.o: $(TOP)/ip_auth.c $(TOP)/ip_auth.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_auth.c -o $@ - -ip_fil.c: - /bin/rm -f ip_fil.c - ln -s $(TOP)/ip_fil_`uname -s|tr A-Z a-z`.c ip_fil.c - -ip_fil.o: ip_fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ip_nat.h - $(CC) $(KCARGS) $(DFLAGS) $(COMPIPF) -c ip_fil.c -o $@ - -ip_fil_compat.o: $(TOP)/ip_fil_compat.c $(TOP)/ipl.h $(TOP)/ip_fil.h \ - $(TOP)/ip_compat.h $(TOP)/ip_nat.h $(TOP)/ip_state.h - $(CC) $(KCARGS) $(DFLAGS) $(COMPIPF) $(COMPATIPF) \ - -c $(TOP)/ip_fil_compat.c -o $@ - -ip_log.o: $(TOP)/ip_log.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_log.c -o $@ - -ip_scan.o: $(TOP)/ip_scan.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_scan.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_scan.c -o $@ - -ip_sync.o: $(TOP)/ip_sync.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_sync.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_sync.c -o $@ - -ip_pool.o: $(TOP)/ip_pool.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_lookup.h $(TOP)/ip_pool.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_pool.c -o $@ - -ip_htable.o: $(TOP)/ip_htable.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_lookup.h $(TOP)/ip_htable.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_htable.c -o $@ - -ip_dstlist.o: $(TOP)/ip_dstlist.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_lookup.h $(TOP)/ip_dstlist.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_dstlist.c -o $@ - -ip_lookup.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_pool.h $(TOP)/ip_htable.h $(TOP)/ip_lookup.h \ - $(TOP)/ip_dstlist.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_lookup.c -o $@ - -radix_ipf.o: $(TOP)/md5.c $(TOP)/radix_ipf.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/radix_ipf.c -o $@ - -ip_trafcon.o: $(TOP)/ip_trafcon.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_trafcon.h - $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_trafcon.c -o $@ - -vnode_if.h: $(VNODESHDIR)/vnode_if.src - mkdir -p ../sys - mkdir -p ../rump/include/rump - mkdir -p ../rump/librump/rumpvfs - if [ -f $(VNODESHDIR)/vnode_if.sh ] ; then \ - sh $(VNODESHDIR)/vnode_if.sh $(VNODESHDIR)/vnode_if.src; \ - fi - if [ -f $(VNODESHDIR)/vnode_if.pl ] ; then \ - perl $(VNODESHDIR)/vnode_if.pl $(VNODESHDIR)/vnode_if.src; \ - fi - if [ -f ../sys/vnode_if.h ] ; then mv ../sys/vnode_if.h .; fi - rmdir ../sys - rm -rf ../rump - -ml_ipl.o: vnode_if.h $(TOP)/$(MLD) $(TOP)/ipl.h - -/bin/rm -f vnode_if.c - $(CC) -I. $(KCARGS) $(DFLAGS) -c $(TOP)/$(ML) -o $@ - -ip_rules.o: ip_rules.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) $(COMPIPF) -c ip_rules.c -o $@ - -ip_rules.c: $(TOP)/rules/ip_rules $(TOP)/tools/ipfcomp.c ipf - ./ipf -cc -nf $(TOP)/rules/ip_rules - -$(TOP)/ip_rules.h: ip_rules.c - if [ ! -f $(TOP)/ip_rules.h ] ; then \ - /bin/mv -f ip_rules.h $(TOP); \ - else \ - touch $(TOP)/ip_rules.h; \ - fi - -ip_rulesx.o: ip_rules.c $(TOP)/ip_rules.h - $(CC) -I. $(KCARGS) $(DFLAGS) -DIPFILTER_COMPILED -c ip_rules.c -o $@ - -mlf_rule.o: $(TOP)/mlf_rule.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlf_rule.c -o $@ - -mln_rule.o: $(TOP)/mln_rule.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mln_rule.c -o $@ - -mlo_rule.o: $(TOP)/mlo_rule.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlo_rule.c -o $@ - -mlfk_rule.o: $(TOP)/mlfk_rule.c $(TOP)/ip_rules.h - $(CC) -I. $(KCARGS) $(DFLAGS) -c $(TOP)/mlfk_rule.c -o $@ - -ipf_y.o: ipf_y.c ipf_y.h $(TOP)/ipf.h ipf_l.h $(TOP)/opts.h - $(CC) $(CCARGS) $(IPFBPF) -c ipf_y.c -o $@ - -ipf_l.o: ipf_l.c ipf_y.h $(TOP)/ipf.h ipf_l.h $(TOP)/opts.h - $(CC) $(CCARGS) -I. -c ipf_l.c -o $@ - -ipf_y.c: $(TOOL)/ipf_y.y $(TOP)/ipf.h $(TOP)/opts.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipf_y.h: ipf_y.c - -ipf_l.c: $(TOOL)/lexer.c $(TOP)/ipf.h $(TOP)/opts.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipf_l.h: $(TOOL)/lexer.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipmon: $(IPMON) $(OBJ)/libipf.a - $(CC) $(CCARGS) $(IPMON) -o $@ $(LIBS) -ll - -ipmon.o: $(TOOL)/ipmon.c $(TOP)/ipmon.h - $(CC) $(CCARGS) $(LOGFAC) -c $(TOOL)/ipmon.c -o $@ - -ipmon_y.o: ipmon_y.c ipmon_y.h $(TOP)/ipmon.h ipmon_l.h - $(CC) $(CCARGS) -c ipmon_y.c -o $@ - -ipmon_l.o: ipmon_l.c ipmon_y.h $(TOP)/ipmon.h - $(CC) $(CCARGS) -I. -c ipmon_l.c -o $@ - -ipmon_y.c: $(TOOL)/ipmon_y.y $(TOP)/ipmon.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipmon_y.h: ipmon_y.c - -ipmon_l.c: $(TOOL)/lexer.c $(TOP)/ipmon.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipmon_l.h: $(TOOL)/lexer.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipscan: ipscan_y.o ipscan_l.o - $(CC) $(DEBUG) ipscan_y.o ipscan_l.o -o $@ -ll $(LIBS) -lkvm - -ipscan_y.o: ipscan_y.c ipscan_y.h $(TOP)/ip_scan.h ipscan_l.h - $(CC) $(CCARGS) -c ipscan_y.c -o $@ - -ipscan_l.o: ipscan_l.c ipscan_y.h $(TOP)/ip_scan.h - $(CC) $(CCARGS) -I. -c ipscan_l.c -o $@ - -ipscan_y.c: $(TOOL)/ipscan_y.y $(TOP)/ip_scan.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ipscan_y.h: ipscan_y.c - -ipscan_l.c ipscan_l.h: $(TOOL)/lexer.c $(TOP)/ip_scan.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ippool: $(IPPOOL) $(OBJ)/libipf.a - $(CC) $(DEBUG) -I. $(CFLAGS) $(IPPOOL) -o $@ -ll -lkvm -L. -lipf - -ippool.o: $(TOOL)/ippool.c $(TOP)/ip_pool.h - $(CC) $(CCARGS) -c $(TOOL)/ippool.c -o $@ - -ippool_y.o: ippool_y.c ippool_y.h $(TOP)/ip_pool.h ippool_l.h - $(CC) $(CCARGS) -c ippool_y.c -o $@ - -ippool_l.o: ippool_l.c ippool_y.h $(TOP)/ip_pool.h - $(CC) $(CCARGS) -I. -c ippool_l.c -o $@ - -ippool_y.c: $(TOOL)/ippool_y.y $(TOP)/ip_pool.h ippool_l.h ippool_y.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ippool_y.h: $(TOOL)/ippool_y.y - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ippool_l.c: $(TOOL)/lexer.c $(TOP)/ip_pool.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -ippool_l.h: $(TOOL)/lexer.h - (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) - -iptrafcon.o: $(TOP)/iptrafcon.c - $(CC) $(CCARGS) -c $< -o $@ - -iptrafcon: $(IPTRAFCON) $(OBJ)/libipf.a - $(CC) $(CCARGS) $(IPTRAFCON) -o $@ $(LIBS) - -.y.c: - -.l.c: - -clean: - ${RM} -f ../ipf ../ipnat ../ipmon ../ippool ../ipftest - ${RM} -f ../ipscan ../ipsyncm ../ipsyncs - ${RM} -f *.core *.o *.a ipt ipfstat ipf ipfstat ipftest ipmon - ${RM} -f ipflkm ipnat ipfrule.ko* ipf.kld* ipfrule.kld* - ${RM} -f vnode_if.h $(LKM) ioconf.h *.ko setdef1.c setdef0.c setdefs.h - ${RM} -f ip_fil.c ipf_l.c ipf_y.c ipf_y.h ipf_l.h - ${RM} -f ipscan ipscan_y.c ipscan_y.h ipscan_l.c ipscan_l.h - ${RM} -f ippool ippool_y.c ippool_y.h ippool_l.c ippool_l.h - ${RM} -f ipnat_y.c ipnat_y.h ipnat_l.c ipnat_l.h - ${RM} -f ipmon_y.c ipmon_y.h ipmon_l.c ipmon_l.h - ${RM} -f ipsyncm ipsyncs ipfs ip_rules.c ip_rules.h bpf.h - ${RM} -f *.da *.gcov *.bb *.bbg tools - - ${MAKE} -f Makefile.ipsend ${MFLAGS} clean - if [ -f Makefile.kmod ] ; then \ - ${MAKE} -f Makefile.kmod ${MFLAGS} clean; \ - fi - -(for i in *; do \ - if [ -d $${i} -a -f $${i}/Makefile ] ; then \ - cd $${i}; (make TOP=../.. clean); cd ..; \ - /bin/rm -f $${i}/Makefile $${i}/Makefile.ipsend; \ - /bin/rm -f $${i}/Makefile.kmod; \ - rmdir $${i}; \ - fi \ - done) - -install: - for i in ip_compat.h ip_fil.h ip_nat.h ip_state.h ip_proxy.h \ - ip_frag.h ip_auth.h; do \ - /bin/cp $(TOP)/$$i /usr/include/netinet/; \ - $(CHMOD) 444 /usr/include/netinet/$$i; \ - done - -if [ -d /lkm -a -f ipflkm.o ] ; then \ - cp ipflkm.o /lkm; \ - fi - -if [ -d /modules -a -f ipf.ko ] ; then \ - if [ -f /modules/ipl.ko ] ; then \ - cp ipf.ko /modules/ipl.ko; \ - else \ - cp ipf.ko /modules; \ - fi \ - fi - -if [ -d /modules -a -f ipfrule.ko ] ; then \ - cp ipfrule.ko /modules; \ - fi -.if ${MACHINE_ARCH} != amd64 - -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ - if [ -f /boot/kernel/ipl.ko ] ; then \ - cp ipf.ko /boot/kernel/ipl.ko; \ - else \ - cp ipf.ko /boot/kernel; \ - fi \ - fi - -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ - cp ipfrule.ko /boot/kernel; \ - fi -.else - -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ - if [ -f /boot/kernel/ipl.ko ] ; then \ - objcopy --only-keep-debug ipf.ko - /boot/kernel/ipl.ko.symbols; \ - objcopy --strip-debug \ - --add-gnu-debuglink=ipl.ko.symbols \ - ipf.ko /boot/kernel/ipl.ko; \ - else \ - objcopy --only-keep-debug ipf.ko \ - /boot/kernel/ipf.ko.symbols; \ - objcopy --strip-debug \ - --add-gnu-debuglink=ipl.ko.symbols \ - ipf.ko /boot/kernel/ipf.ko; \ - fi \ - fi - -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ - objcopy --only-keep-debug ipfrule.ko /boot/kernel/ipfrule.ko.symbols; \ - objcopy --strip-debug --add-gnu-debuglink=ipfrule.ko.symbols ipfrule.ko /boot/kernel/ipfrule.ko; \ - fi -.endif - -if [ -d /usr/lkm -a -f ipflkm.o ] ; then \ - cp ipflkm.o /usr/lkm; \ - fi - -$(INSTALL) -cs -g wheel -m 755 -o root ipscan $(SBINDEST) - (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) - @for i in ipf:$(SBINDEST) ipfs:$(SBINDEST) ipnat:$(SBINDEST) \ - ippool:$(BINDEST) ipsyncm:$(BINDEST) ipsyncs:$(BINDEST) \ - ipfstat:$(SBINDEST) ipftest:$(SBINDEST) ipmon:$(BINDEST); do \ - def="`expr $$i : '[^:]*:\(.*\)'`"; \ - p="`expr $$i : '\([^:]*\):.*'`"; \ - dd=; \ - for d in $(SEARCHDIRS); do \ - if [ -f $$d/$$p ] ; then \ - echo "$(INSTALL) -cs -g wheel -m 755 -o root $$p $$d"; \ - $(INSTALL) -cs -g wheel -m 755 -o root $$p $$d; \ - dd=XXX; \ - fi; \ - done; \ - if [ -z "$$dd" ] ; then \ - echo $(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \ - $(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \ - fi \ - done - if [ -d /etc/rc.d ] ; then \ - $(INSTALL) -c -g wheel -m 755 -o root ../ipfadm-rcd $(SBINDEST)/ipfadm; \ - fi - (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) - -coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report - -clean-coverage: - /bin/rm -f *.gcov *.da diff --git a/contrib/ipfilter/BSD/Makefile.ipsend b/contrib/ipfilter/BSD/Makefile.ipsend deleted file mode 100644 index 68edf1a..0000000 --- a/contrib/ipfilter/BSD/Makefile.ipsend +++ /dev/null @@ -1,109 +0,0 @@ -# -# $Id$ -# - -BINDEST=/usr/sbin -SBINDEST=/sbin -MANDIR=/usr/share/man - -OBJS=ipsend.o ip.o ipsopt.o iplang_y.o iplang_l.o -IPFTO=ipft_ef.o ipft_hx.o ipft_pc.o ipft_sn.o ipft_td.o ipft_tx.o -ROBJS=ipresend.o ip.o resend.o -TOBJS=iptest.o iptests.o ip.o -UNIXOBJS=sbpf.o sock.o 44arp.o -OBJ=. -LIBS=-L$(OBJ) -lipf - -CC=gcc -Wuninitialized -Wstrict-prototypes -O -CFLAGS=-g -I$(TOP) -# -MFLAGS="BINDEST=$(BINDEST)" "SBINDEST=$(SBINDEST)" "MANDIR=$(MANDIR)" \ - 'CFLAGS=$(CFLAGS) $(SOLARIS2)' "IPFLKM=$(IPFLKM)" \ - "IPFLOG=$(IPFLOG)" "LOGFAC=$(LOGFAC)" "POLICY=$(POLICY)" \ - "SOLARIS2=$(SOLARIS2)" "DEBUG=$(DEBUG)" "DCPU=$(CPU)" \ - "CPUDIR=$(CPUDIR)" "LOOKUP=$(LOOKUP)" -# -build: -all bsd-bpf : ipsend ipresend iptest - -iplang_y.o: $(TOP)/iplang/iplang_y.y - (cd $(TOP)/iplang; $(MAKE) ../BSD/$(CPUDIR)/$@ $(MFLAGS) 'DESTDIR=../BSD/$(CPUDIR)' ) - -iplang_l.o: $(TOP)/iplang/iplang_l.l - (cd $(TOP)/iplang; $(MAKE) ../BSD/$(CPUDIR)/$@ $(MFLAGS) 'DESTDIR=../BSD/$(CPUDIR)' ) - -.c.o: - $(CC) $(DEBUG) $(CFLAGS) -c $< -o $@ - -ipsend: $(OBJS) $(UNIXOBJS) - $(CC) $(DEBUG) $(OBJS) $(UNIXOBJS) -o $@ $(LIBS) -ll - -ipresend: $(ROBJS) $(UNIXOBJS) - $(CC) $(DEBUG) $(ROBJS) $(UNIXOBJS) -o $@ $(LIBS) - -iptest: $(TOBJS) $(UNIXOBJS) - $(CC) $(DEBUG) $(TOBJS) $(UNIXOBJS) -o $@ $(LIBS) - -clean: - rm -rf *.o core a.out ipsend ipresend iptest iplang_y.* iplang_l.* - -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 - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_sn.c -o $@ - -ipft_pc.o: $(TOP)/ipft_pc.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_pc.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 $@ - -sbpf.o: $(TOP)/ipsend/sbpf.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/sbpf.c -o $@ - -snit.o: $(TOP)/ipsend/snit.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/snit.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 $@ - -44arp.o: $(TOP)/ipsend/44arp.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/44arp.c -o $@ - -lsock.o: $(TOP)/ipsend/lsock.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/lsock.c -o $@ - -slinux.o: $(TOP)/ipsend/slinux.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/slinux.c -o $@ - -larp.o: $(TOP)/ipsend/larp.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/larp.c -o $@ - -dlcommon.o: $(TOP)/ipsend/dlcommon.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/dlcommon.c -o $@ - -sdlpi.o: $(TOP)/ipsend/sdlpi.c - $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/sdlpi.c -o $@ - -install: - -$(INSTALL) -cs -g wheel -m 755 -o root ipsend ipresend iptest $(BINDEST) - diff --git a/contrib/ipfilter/BSD/ipfadm-rcd b/contrib/ipfilter/BSD/ipfadm-rcd deleted file mode 100755 index dbbd151..0000000 --- a/contrib/ipfilter/BSD/ipfadm-rcd +++ /dev/null @@ -1,350 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -prog=$0 - -RCD=/etc/rc.conf.d - -# This script is an interface to the following rc.d scripts: -# /etc/rc.d/ipfilter -# /etc/rc.d/ipfs -# /etc/rc.d/ipnat -# /etc/rc.d/ipmon - -running=`ipf -V 2>/dev/null|sed -ne 's/Running: \(.*\)/\1/p'` - -usage() { - echo "$prog status" - echo "$prog ipfilter <enable|disable|reload|resync|start|status|stop>" - echo "$prog ipfs <enable|disable|status|start|stop>" - echo "$prog ipmon <enable|disable|restart|start|status|stop>" - echo "$prog ipnat <enable|disable|reload|start|status|stop>" - exit 1 -} - -enable() { - old=${RCD}/$1.old - new=${RCD}/$1 - mkdir ${RCD}/$1.d - if [ $? -eq 0 ] ; then - if [ -f ${RCD}/$1 ] ; then - cp ${RCD}/$1 ${RCD}/$1.old - sed -e "s/^${1} *\=.*/${1}\=YES/" ${old} > ${new} - /bin/rm ${old} - else - echo "$1=YES" > ${RCD}/$1 - chmod go-wx ${RCD}/$1 - fi - rmdir ${RCD}/$1.d - fi -} - -disable() { - old=${RCD}/$1.old - new=${RCD}/$1 - mkdir ${RCD}/$1.d - if [ $? -eq 0 ] ; then - if [ -f ${RCD}/$1 ] ; then - cp ${RCD}/$1 ${RCD}/$1.old - sed -e "s/^${1} *\=.*/${1}\=NO/" ${old} > ${new} - /bin/rm ${old} - else - echo "$1=NO" > ${RCD}/$1 - chmod go-wx ${RCD}/$1 - fi - rmdir ${RCD}/$1.d - fi -} - -status() { - active=`/etc/rc.d/$1 rcvar|sed -ne "s/^$""${1}\=\(.*\)$/\1/p"` - case $active in - NO) - return 0 - ;; - YES) - return 1 - ;; - esac - return 2 -} - -status_ipmon() { - echo -n "ipmon " - pid=`pgrep ipmon` - status ipmon - case $? in - 0) - if [ -n "$pid" ] ; then - echo "disabled-but-running" - else - echo "disabled" - fi - ;; - 1) - if [ -n "$pid" ] ; then - echo "enabled" - else - echo "enabled-not-running" - fi - ;; - 2) - if [ -n "$pid" ] ; then - echo "unknown-state-running" - else - echo "unknown-state" - fi - ;; - esac -} - -status_ipfilter() { - if [ -z "$running" ] ; then - rules= - emsg="-not-in-kernel" - dmsg= - else - case $running in - yes) - emsg= - dmsg="-rules-loaded" - rules=`ipfstat -io 2>/dev/null` - if [ -z "$rules" ] ; then - rules=`ipfstat -aio 2>/dev/null` - if [ -z "$rules" ] ; then - emsg="-no-rules" - dmsg= - fi - fi - ;; - no) - rules= - emsg="-not-running" - dmsg= - ;; - esac - fi - - echo -n "ipfilter " - status ipfilter - case $? in - 0) - echo "disabled${dmsg}" - ;; - 1) - echo "enabled${emsg}" - ;; - 2) - if [ -n "$rules" ] ; then - echo "unknown${dmsg}" - else - echo "unknown-state" - fi - ;; - esac -} - -status_ipnat() { - if [ -z "$running" ] ; then - rules= - emsg="-not-in-kernel" - dmsg= - else - case $running in - yes) - emsg= - dmsg="-rules-loaded" - rules=`ipnat -l 2>/dev/null | egrep '^map|rdr' 2>/dev/null` - if [ -z "$rules" ] ; then - emsg="-no-rules" - dmsg= - fi - ;; - no) - rules= - emsg="-not-running" - dmsg= - ;; - esac - fi - - echo -n "ipnat " - status ipnat - case $? in - 0) - echo "disabled${dmsg}" - ;; - 1) - echo "enabled${dmsg}" - ;; - 2) - if [ -n "$rules" ] ; then - echo "unknown${dmsg}" - else - echo "unknown-state" - fi - ;; - esac -} - -status_ipfs() { - status ipfs - report ipfs $? -} - -report() { - echo -n "$1 " - case $2 in - 0) - echo "disabled" - ;; - 1) - echo "enabled" - ;; - 2) - echo "unknown-status" - ;; - *) - echo "$2" - ;; - esac -} - -do_ipfilter() { - case $1 in - enable) - enable ipfilter - ;; - disable) - disable ipfilter - ;; - reload) - /etc/rc.d/ipfilter reload - ;; - resync) - /etc/rc.d/ipfilter resync - ;; - start) - /etc/rc.d/ipfilter start - ;; - status) - status_ipfilter - ;; - stop) - /etc/rc.d/ipfilter stop - ;; - *) - usage - ;; - esac -} - -do_ipfs() { - case $1 in - enable) - enable ipfs - ;; - disable) - disble ipfs - ;; - start) - /etc/rc.d/ipfs start - ;; - status) - status_ipfs - ;; - stop) - /etc/rc.d/ipfs stop - ;; - *) - usage - ;; - esac -} - -do_ipmon() { - case $1 in - enable) - enable ipmon - ;; - disable) - disble ipmon - ;; - restart) - /etc/rc.d/ipmon restart - ;; - start) - /etc/rc.d/ipmon start - ;; - status) - status_ipmon - ;; - stop) - /etc/rc.d/ipmon stop - ;; - *) - usage - ;; - esac -} - -do_ipnat() { - case $1 in - enable) - enable ipnat - ;; - disable) - disable ipnat - ;; - reload) - /etc/rc.d/ipnat reload - ;; - restart) - /etc/rc.d/ipnat restart - ;; - start) - /etc/rc.d/ipnat start - ;; - status) - status_ipnat - ;; - stop) - /etc/rc.d/ipnat stop - ;; - *) - usage - ;; - esac -} - -do_status_all() { - status_ipfilter - status_ipfs - status_ipmon - status_ipnat -} - -case $1 in -status) - do_status_all - ;; -ipfilter) - do_ipfilter $2 - ;; -ipfs) - do_ipfs $2 - ;; -ipmon) - do_ipmon $2 - ;; -ipnat) - do_ipnat $2 - ;; -*) - usage - ;; -esac -exit 0 diff --git a/contrib/ipfilter/BSD/kupgrade b/contrib/ipfilter/BSD/kupgrade deleted file mode 100644 index 30df454..0000000 --- a/contrib/ipfilter/BSD/kupgrade +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/sh -# -PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH -argv0=`basename $0` - -os=`uname -s` -rev=`uname -r` -maj=`expr $rev : '\([0-9]*\)\.'` -min=`expr $rev : '[0-9]*\.\([0-9]*\)'` -sub=`expr $rev : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - -# try to bomb out fast if anything fails.... -set -e - -fullrev=`printf '%02d%02d%02d' $maj $min $sub` -dir=`pwd` -karch=`uname -m` -archdir="/sys/arch/$karch" -ipfdir=/sys/netinet -if [ -d /sys/contrib/ipfilter ] ; then - ipfdir=/sys/contrib/ipfilter/netinet -fi -if [ -d /sys/dist/ipf ] ; then - ipfdir=/sys/dist/ipf/netinet -fi -mkdir -m 755 -p $ipfdir/../net -confdir="$archdir/conf" -if [ -f /dev/ipnat ] ; then - major=`ls -l /dev/ipnat | sed -e 's/.* \([0-9]*\),.*/\1/'` - echo "Major number for IP Filter is $major" -else - major=x -fi - -if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then - echo "Trying to build ip_rules.c and ip_rules.h" - make ip_rules.c - if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then - echo "Please do a build of ipfilter and then run the following" - echo "command to build extra files:" - echo - echo "make ip_rules.c" - exit 1 - fi -fi - -echo -n "Installing into $ipfdir" -for j in auth frag nat proxy scan state sync pool dstlist htable lookup rules \ - dstlist; do - for i in ip_$j.[ch]; do - if [ -f "$i" ] ; then - echo -n " $i" - cp $i $ipfdir - chmod 644 $ipfdir/$i - fi - done -done -echo -n " net/radix_ipf.h" -cp radix_ipf.h $ipfdir -chmod 644 $ipfdir/radix_ipf.h -echo -n " radix_ipf.c -> $ipfdir/radix_ipf.c" -cp radix_ipf.c $ipfdir/radix_ipf.c -chmod 644 $ipfdir/radix_ipf.c - -case $os in -SunOS) - case `uname -r` in - 5.*) - filc=ip_fil_solaris.c - ;; - 4.*) - filc=ip_fil_sunos.c - ;; - esac - ;; -*BSD) - filc=ip_fil_`echo $os | tr A-Z a-z`.c - case $os in - FreeBSD) - cp mlfk_ipl.c $ipfdir/ - ;; - *) - ;; - esac - ;; -esac - -if [ -f $ipfdir/$filc ] ; then - echo -n "$filc -> $ipfdir/$filc " - cp $filc $ipfdir/$filc - chmod 644 $ipfdir/$filc -fi -if [ -f $ipfdir/ip_fil.c ] ; then - echo -n "$filc -> $ipfdir/ip_fil.c " - cp $filc $ipfdir/ip_fil.c - chmod 644 $ipfdir/ip_fil.c -fi - -for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \ - ip_fil_compat.c ipf_rb.h; do - echo -n " $i" - cp $i $ipfdir - chmod 644 $ipfdir/$i -done -echo "" -echo -n "Installing into /usr/include/netinet" -for j in auth compat fil frag nat proxy scan state sync pool htable dstlist \ - lookup; do - i=ip_$j.h - if [ -f "$i" ] ; then - echo -n " $i" - cp $i /usr/include/netinet/$i - chmod 644 /usr/include/netinet/$i - fi -done -for j in ipl.h ipf_rb.h; do - if [ -f "$j" ] ; then - echo -n " $j" - cp $j /usr/include/netinet/$j - chmod 644 /usr/include/netinet/$j - fi -done -echo - -if [ -f /sys/netinet/ip_fil_compat.h ] ; then - echo "Linking /sys/netinet/ip_compat.h to /sys/netinet/ip_fil_compat.h" - rm /sys/netinet/ip_fil_compat.h - ln -s /sys/netinet/ip_compat.h /sys/netinet/ip_fil_compat.h -fi - -if [ $major != x ] ; then - if [ ! -e /dev/ipsync ] ; then - echo "Creating /dev/ipsync" - mknod /dev/ipsync c $major 4 - fi - - if [ ! -e /dev/ipsync ] ; then - echo "Creating /dev/ipscan" - mknod /dev/ipsync c $major 5 - fi - - if [ ! -e /dev/iplookup ] ; then - echo "Creating /dev/iplookup" - mknod /dev/iplookup c $major 6 - fi -fi - -set +e -os=`uname -s` -if [ $os = FreeBSD -a -f /sys/conf/files ] ; then - cd /sys/conf - if [ -f options ] ; then - if [ ! -f options.preipf4 ] ; then - mv options options.preipf4 - cp -p options.preipf4 options - fi - for i in SCAN SYNC LOOKUP COMPILED; do - grep IPFILTER_$i options >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo >> options - echo "# extra option for IP Filter" >> options - echo "IPFILTER_$i opt_ipfilter.h" >> options - fi - done - fi - if [ ! -f files.preipf4 ] ; then - mv files files.preipf4 - cp -p files.preipf4 files - fi - for i in dstlist htable pool lookup; do - grep ip_$i.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo "contrib/ipfilter/netinet/ip_$i.c optional ipfilter inet ipfilter_lookup" >> files - fi - done - grep ip_fil_compat.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'contrib/ipfilter/netinet/ip_fil_compat.c optional ipfilter inet ipfilter_compat' >> files - fi - grep ip_sync.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet' >> files - fi - grep ip_scan.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'contrib/ipfilter/netinet/ip_scan.c optional ipfilter inet ipfilter_scan' >> files - fi - grep ip_rules.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'contrib/ipfilter/netinet/ip_rules.c optional ipfilter inet ipfilter_compiled' >> files - fi -fi -if [ $os = NetBSD -a -f /sys/conf/files ] ; then - if [ -f /sys/netinet/files.ipfilter ] ; then - if ! grep -q ip_fil_compat.c /sys/netinet/files.ipfilter; then - echo 'file dist/ipf/netinet/ip_fil_compat.c ipfilter & ipfilter_compat' >> /sys/netinet/files.ipfilter - echo 'defflag opt_ipfilter.h IPFILTER_COMPAT' >> /sys/netinet/files.ipfilter - fi - fi - cd /sys/conf - if [ ! -f files.preipf4 ] ; then - mv files files.preipf4 - cp -p files.preipf4 files - fi - if [ $fullrev -ge 010600 -a $fullrev -lt 020000 ] ; then - for i in dstlist htable pool lookup; do - grep ip_$i.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo "file netinet/ip_$i.c ipfilter & ipfilter_lookup" >> files - fi - done - grep ip_sync.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_sync.c ipfilter' >> files - fi - grep ip_scan.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_scan.c ipfilter & ipfilter_scan' >> files - fi - grep ip_rules.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_rules.c ipfilter & ipfilter_compiled' >> files - fi - fi -fi -if [ $os = OpenBSD -a -f /sys/conf/files ] ; then - cd /sys/conf - if [ ! -f files.preipf4 ] ; then - mv files files.preipf4 - cp -p files.preipf4 files - fi - if [ $fullrev -ge 030400 ] ; then - for i in dstlist htable pool lookup; do - grep ip_$i.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo "file netinet/ip_$i.c ipfilter & ipfilter_lookup" >> files - fi - done - grep ip_fil_compat.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_fil_compat.c ipfilter & ipfilter_compat' >> files - fi - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_sync.c ipfilter' >> files - fi - grep ip_scan.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_scan.c ipfilter & ipfilter_scan' >> files - fi - grep ip_rules.c files >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo 'file netinet/ip_rules.c ipfilter & ipfilter_compiled' >> files - fi - fi -fi - -if [ -f /usr/src/sys/modules/ipfilter/Makefile -a \ - ! -f /usr/src/sys/modules/ipfilter/Makefile.orig ] ; then -cat | (cd /usr/src/sys/modules/ipfilter; patch) <<__EOF__ -*** Makefile.orig Mon Mar 28 09:10:11 2005 ---- Makefile Mon Mar 28 09:12:51 2005 -*************** -*** 5,13 **** - KMOD= ipl - SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ -! ip_log.c ip_fil.c fil.c - - .if !defined(NOINET6) - CFLAGS+= -DUSE_INET6 - .endif - CFLAGS+= -I$${.CURDIR}/../../contrib/ipfilter -! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS ---- 5,15 ---- - KMOD= ipl - SRCS= mlfk_ipl.c ip_nat.c ip_nat6.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ -! ip_log.c ip_fil.c fil.c ip_lookup.c ip_pool.c ip_dstlist.c ip_htable.c \\ -! ip_sync.c ip_scan.c ip_rules.c ip_fil_compat.c - - .if !defined(NOINET6) - CFLAGS+= -DUSE_INET6 - .endif - CFLAGS+= -I$${.CURDIR}/../../contrib/ipfilter -! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS \\ -! -DIPFILTER_LOOKUP -DIPFILTER_COMPILED -__EOF__ -fi - -CONF=/sys/netinet/files.ipfilter -if [ -f $CONF -a $os = NetBSD ] ; then - for i in ip_nat6.c ip_dstlist.c radix_ipf.c; do - echo "Checking for $i in $CONF" - grep $i $CONF >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo "Adding $i to $CONF" - sed -n -e /ip_nat.c/s/ip_nat.c/$i/p $CONF >> $CONF - fi - done -fi - -CONF=/sys/conf/files -if [ -f $CONF -a $os = FreeBSD ] ; then - for i in ip_nat6.c ip_dstlist.c radix_ipf.c; do - echo "Checking for $i in $CONF" - grep $i $CONF >/dev/null 2>&1 - if [ $? -ne 0 ] ; then - echo "Adding $i to $CONF" - sed -n -e /ip_nat.c/,/NORMAL/p $CONF | \ - sed -e s/ip_nat.c/$i/p >> $CONF - fi - done -fi -exit 0 diff --git a/contrib/ipfilter/BSD/make-devices b/contrib/ipfilter/BSD/make-devices deleted file mode 100755 index d512e1c..0000000 --- a/contrib/ipfilter/BSD/make-devices +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -os=`uname -s`-`uname -r` - -case "$os" in - FreeBSD-2.2*) - major=79 - ;; - FreeBSD-*) - major=20 - ;; - NetBSD-*) - echo "see /dev/MAKEDEV" - exit 0 - ;; - OpenBSD-*) - echo "see /dev/MAKEDEV" - exit 0 - ;; - *) - ;; -esac - -umask 037 -mknod /dev/ipl c $major 0 -mknod /dev/ipnat c $major 1 -mknod /dev/ipstate c $major 2 -mknod /dev/ipauth c $major 3 -mknod /dev/ipsync c $major 4 -mknod /dev/ipscan c $major 5 diff --git a/contrib/ipfilter/BSD/upgrade b/contrib/ipfilter/BSD/upgrade deleted file mode 100755 index d5f8154..0000000 --- a/contrib/ipfilter/BSD/upgrade +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH -argv0=`basename $0` - -case `pwd` in -*BSD) - ;; -*) - cd BSD - ;; -esac -os=`uname -s` -rev=`uname -r` -maj=`expr $rev : '\([0-9]*\)\.'` -min=`expr $rev : '[0-9]*\.\([0-9]*\)'` -sub=`expr $rev : '[0-9]*\.[0-9]*\.\([0-9]*\)'` -plat=`uname -p` -objdir=${os}-${rev}-${plat} - -# try to bomb out fast if anything fails.... -set -e - -for i in ipf ipfstat ipmon ipnat ippool; do - if [ ! -f /sbin/${i}.dist -a -f /sbin/${i} ] ; then - mv /sbin/${i} /sbin/${i}.dist - cp -p /sbin/${i}.dist /sbin/${i} - cp ${objdir}/${i} /sbin/ - fi - if [ ! -f /usr/sbin/${i}.dist -a -f /usr/sbin/${i} ] ; then - mv /usr/sbin/${i} /usr/sbin/${i}.dist - cp -p /usr/sbin/${i}.dist /usr/sbin/${i} - cp ${objdir}/${i} /usr/sbin/ - fi -done -if [ -f /boot/kernel/ipl.ko ] ; then - if [ ! -f /boot/kernel/ipl.ko.dist ] ; then - mv /boot/kernel/ipl.ko /boot/kernel/ipl.ko.dist - cp -p /boot/kernel/ipl.ko.dist /boot/kernel/ipl.ko - fi - if [ ! -f /boot/kernel/ipl.ko.symbols.dist ] ; then - mv /boot/kernel/ipl.ko.symbols /boot/kernel/ipl.ko.symbols.dist - fi - cp ${objdir}/ipf.ko /boot/kernel/ipl.ko -fi -exit 0 diff --git a/contrib/ipfilter/FAQ.FreeBSD b/contrib/ipfilter/FAQ.FreeBSD deleted file mode 100644 index 6539b4f..0000000 --- a/contrib/ipfilter/FAQ.FreeBSD +++ /dev/null @@ -1,104 +0,0 @@ -These are Instructions for Configuring A FreeBSD Box For NAT -After you have installed IP-Filter. - -You will need to change three files: - -/etc/rc.local -/etc/sysconfig -/etc/natrules - -You will have to: - -1) Load the kernel module -2) Make the ipnat rules -3) Load the ipnat rules -4) Enable routing between interfaces -5) Add static routes for the subnet ranges -6) Configure your network interfaces -7) reboot the computer for the changes to take effect. - -The FAQ was written by Chris Coleman <chris@@bbcc.ctc.edu> -This was tested using ipfilter 3.1.4 and FreeBSD 2.1.6-RELEASE -_________________________________________________________ -1) Loading the Kernel Module - -If you are using a Kernal Loadable Module you need to edit your -/etc/rc.local file and load the module at boot time. -use the line: - - modload /lkm/if_ipl.o - -If you are not loading a kernel module, skip this step. -_________________________________________________________ -2) Setting up the NAT Rules - -Make a file called /etc/natrules -put in the rules that you need for your system. - -If you want to use the whole 10 Network. Try: - -map fpx0 10.0.0.0/8 -> 208.8.0.1/32 portmap tcp/udp 10000:65000 - -_________________________________________________________ -Here is an explaination of each part of the command: - -map starts the command. - -fpx0 is the interface with the real internet address. - -10.0.0.0 is the subnet you want to use. - -/8 is the subnet mask. ie 255.0.0.0 - -208.8.0.1 is the real ip address that you use. - -/32 is the subnet mask 255.255.255.255, ie only use this ip address. - -portmap tcp/udp 10000:65000 - tells it to use the ports to redirect the tcp/udp calls through - - -The one line should work for the whole network. -_________________________________________________________ -3) Loading the NAT Rules: - -The NAT Rules will need to be loaded every time the computer -reboots. - -In your /etc/rc.local put the line: - -ipnat -f /etc/natrules - -To check and see if it is loaded, as root type - ipnat -ls -_________________________________________________________ -4) Enable Routing between interfaces. - -Tell the kernel to route these addresses. - -in the rc.local file put the line: - -sysctl -w net.inet.ip.forwarding=1 - -_________________________________________________________ -5) Static Routes to Subnet Ranges - -Now you have to add a static routes for the subnet ranges. -Edit your /etc/sysconfig to add them at bootup. - -static_routes="foo" -route_foo="10.0.0.0 -netmask 0xf0000000 -interface 10.0.0.1" - - -_________________________________________________________ -6) Make sure that you have your interfaces configured. - -I have two Intel Ether Express Pro B cards. -One is on 208.8.0.1 The other is on 10.0.0.1 - -You need to configure these in the /etc/sysconfig - -network_interfaces="fxp0 fxp1" -ifconfig_fxp0="inet 208.8.0.1 netmask 255.255.255.0" -ifconfig_fxp1="inet 10.0.0.1 netmask 255.0.0.0" -_________________________________________________________ diff --git a/contrib/ipfilter/FWTK/Index b/contrib/ipfilter/FWTK/Index deleted file mode 100644 index f5d7043..0000000 --- a/contrib/ipfilter/FWTK/Index +++ /dev/null @@ -1,3 +0,0 @@ -README - Readme for ftp-gw.diff and fwtkp -README.ipfilter - README for fwtk_transparent.diff -fwtk_transparent.diff - patches for 2.0beta diff --git a/contrib/ipfilter/FWTK/README b/contrib/ipfilter/FWTK/README deleted file mode 100644 index 3ed0e2f..0000000 --- a/contrib/ipfilter/FWTK/README +++ /dev/null @@ -1,18 +0,0 @@ - -There are two patch files in this directory, each allowing for the Firewall -Toolkit to be used in a transparent proxy configuration. - -ftp-gw.diff - A patch written by myself for use only with IP Filter and - ftp-gw from the Firewall Toolkit. You need to copy ip_nat.h, - ip_fil.h and ip_compat.h to the ftp-gw directory to compile - once this patch has been applied. - -fwtkp - A set of patches written by James B. Croall (jcroall@foo.org) - for use with both IP Filter and ipfwadm (for Linux) and more - of the various FWTK gateway plugins, including: - ftp-gw http-gw plug-gw rlogin-gw tn-gw - -Both patches when applied to the Firewall toolkit require the same -configuration for IP Filter. - -Darren diff --git a/contrib/ipfilter/FWTK/README.ipfilter b/contrib/ipfilter/FWTK/README.ipfilter deleted file mode 100644 index fd461cc..0000000 --- a/contrib/ipfilter/FWTK/README.ipfilter +++ /dev/null @@ -1,20 +0,0 @@ - -there was a patch for fwtk with ip_filter 3.1.5 from James B. Croall -(thanx for his work) which I put onto fwtk 2.0beta. - -Now, if you decide to do transparent proxying with ip-filter you -have to put -DUSE_IP_FILTER to COPTS in Makefile.config. -With Solaris 2.x you have to correctly replace the path to your -ip_filter sources. (lib/hnam.c needs ip_nat.h) - -I also patched plug-gw to be configured to accept not only one -destination with the parameter "-all-destinations" in netperm-table. -Perhaps this is a security hole... - -The patched fwtk worked fine for me with linux (kernel 2.0.28 and ipfadm 2.1) -and Solaris 2.5 (ip_filter 3.1.5). - -If you try to enhance the transparent proxy features for other -architectures, see lib/hnam.c (getdsthost). - -Michael Kutzner, Michael.Kutzner@paderlinx.de diff --git a/contrib/ipfilter/FWTK/ftp-gw.diff b/contrib/ipfilter/FWTK/ftp-gw.diff deleted file mode 100644 index a47eba0..0000000 --- a/contrib/ipfilter/FWTK/ftp-gw.diff +++ /dev/null @@ -1,232 +0,0 @@ -*** ftp-gw.c.orig Sun Jun 22 16:27:42 1997 ---- ftp-gw.c Sun Jun 22 17:02:16 1997 -*************** -*** 11,31 **** ---- 11,41 ---- - */ - static char RcsId[] = "$Header$"; - -+ /* -+ * Patches for IP Filter NAT extensions written by Darren Reed, 7/7/96 -+ * darrenr@cyber.com.au -+ */ -+ static char vIpFilter[] = "v3.1.11"; - - #include <stdio.h> - #include <ctype.h> - #include <syslog.h> -+ #include <unistd.h> -+ #include <fcntl.h> - #include <sys/signal.h> - #include <sys/ioctl.h> - #include <sys/errno.h> - extern int errno; -+ #ifdef sun - extern char *sys_errlist[]; -+ #endif - #include <arpa/ftp.h> - #include <arpa/telnet.h> - #include <sys/time.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> -+ #include <net/if.h> - - extern char *rindex(); - extern char *index(); -*************** -*** 36,41 **** ---- 46,54 ---- - - #include "firewall.h" - -+ #include "ip_compat.h" -+ #include "ip_fil.h" -+ #include "ip_nat.h" - - #ifndef BSIZ - #define BSIZ 2048 -*************** -*** 83,88 **** ---- 96,103 ---- - static int cmd_noop(); - static int cmd_abor(); - static int cmd_passthru(); -+ static int nat_destination(); -+ static int connectdest(); - static void saveline(); - static void flushsaved(); - static void trap_sigurg(); -*************** -*** 317,323 **** - if(authallflg) - if(say(0,"220-Proxy first requires authentication")) - exit(1); -! sprintf(xuf,"220 %s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); - if(say(0,xuf)) - exit(1); - } ---- 332,341 ---- - if(authallflg) - if(say(0,"220-Proxy first requires authentication")) - exit(1); -! sprintf(xuf,"220-%s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); -! if(say(0,xuf)) -! exit(1); -! sprintf(xuf,"220-%s TIS ftp-gw with IP Filter %s NAT extensions",huf,vIpFilter); - if(say(0,xuf)) - exit(1); - } -*************** -*** 338,343 **** ---- 356,363 ---- - exit(1); - } - -+ nat_destination(0); -+ - /* main loop */ - while(1) { - FD_ZERO(&rdy); -*************** -*** 608,619 **** - static char narg[] = "501 Missing or extra username"; - static char noad[] = "501 Use user@site to connect via proxy"; - char buf[1024]; -- char mbuf[512]; - char *p; - char *dest; - char *user; - int x; -- int msg_int; - short port = FTPPORT; - - /* kludgy but effective. if authorizing everything call auth instead */ ---- 628,637 ---- -*************** -*** 643,648 **** ---- 661,687 ---- - return(sayn(0,noad,sizeof(noad))); - } - -+ if((rfd == -1) && (x = connectdest(dest,port))) -+ return x; -+ sprintf(buf,"USER %s",user); -+ if(say(rfd,buf)) -+ return(1); -+ x = getresp(rfd,buf,sizeof(buf),1); -+ if(sendsaved(0,x)) -+ return(1); -+ return(say(0,buf)); -+ } -+ -+ static int -+ connectdest(dest,port) -+ char *dest; -+ short port; -+ { -+ char buf[1024]; -+ char mbuf[512]; -+ int msg_int; -+ int x; -+ - if(*dest == '\0') - dest = "localhost"; - -*************** -*** 685,693 **** - char ebuf[512]; - - strcpy(ebuf,buf); -! sprintf(buf,"521 %s: %s",dest,ebuf); - return(say(0,buf)); - } - sprintf(buf,"----GATEWAY CONNECTED TO %s----",dest); - saveline(buf); - ---- 724,733 ---- - char ebuf[512]; - - strcpy(ebuf,buf); -! sprintf(buf,"521 %s,%d: %s",dest,ntohs(port),ebuf); - return(say(0,buf)); - } -+ - sprintf(buf,"----GATEWAY CONNECTED TO %s----",dest); - saveline(buf); - -*************** -*** 698,711 **** - return(say(0,buf)); - } - saveline(buf); -! -! sprintf(buf,"USER %s",user); -! if(say(rfd,buf)) -! return(1); -! x = getresp(rfd,buf,sizeof(buf),1); -! if(sendsaved(0,x)) -! return(1); -! return(say(0,buf)); - } - - ---- 738,745 ---- - return(say(0,buf)); - } - saveline(buf); -! sendsaved(0,-1); -! return 0; - } - - -*************** -*** 1591,1593 **** ---- 1625,1671 ---- - dup(nread); - } - #endif -+ -+ -+ static int -+ nat_destination(fd) -+ int fd; -+ { -+ struct sockaddr_in laddr, faddr; -+ struct natlookup natlookup; -+ char *dest; -+ int slen, natfd; -+ -+ bzero((char *)&laddr, sizeof(laddr)); -+ bzero((char *)&faddr, sizeof(faddr)); -+ slen = sizeof(laddr); -+ if(getsockname(fd,(struct sockaddr *)&laddr,&slen) < 0) { -+ perror("getsockname"); -+ exit(1); -+ } -+ slen = sizeof(faddr); -+ if(getpeername(fd,(struct sockaddr *)&faddr,&slen) < 0) { -+ perror("getsockname"); -+ exit(1); -+ } -+ -+ natlookup.nl_inport = laddr.sin_port; -+ natlookup.nl_outport = faddr.sin_port; -+ natlookup.nl_inip = laddr.sin_addr; -+ natlookup.nl_outip = faddr.sin_addr; -+ natlookup.nl_flags = IPN_TCP; -+ if((natfd = open(IPL_NAT, O_RDONLY)) < 0) { -+ perror("open"); -+ exit(1); -+ } -+ if(ioctl(natfd, SIOCGNATL, &natlookup) == -1) { -+ syslog(LOG_ERR, "SIOCGNATL failed: %m\n"); -+ close(natfd); -+ if(say(0,"220 Ready")) -+ exit(1); -+ return 0; -+ } -+ close(natfd); -+ return connectdest(inet_ntoa(natlookup.nl_realip), -+ ntohs(natlookup.nl_realport)); -+ } diff --git a/contrib/ipfilter/FWTK/fwtk_transparent.diff b/contrib/ipfilter/FWTK/fwtk_transparent.diff deleted file mode 100644 index 8f0aeb4..0000000 --- a/contrib/ipfilter/FWTK/fwtk_transparent.diff +++ /dev/null @@ -1,1025 +0,0 @@ -diff -cr ../TIS.orig/fwtk/Makefile.config.linux fwtk/Makefile.config.linux -*** ../TIS.orig/fwtk/Makefile.config.linux Sat Sep 7 05:58:21 1996 ---- fwtk/Makefile.config.linux Sun Feb 2 05:48:01 1997 -*************** -*** 13,19 **** - - - # Your C compiler (eg, "cc" or "gcc") -! CC= cc - - - # program to use for installation -- this may or may not preserve ---- 13,19 ---- - - - # Your C compiler (eg, "cc" or "gcc") -! CC= gcc - - - # program to use for installation -- this may or may not preserve -*************** -*** 24,37 **** - - # Defines for your operating system - # -! DEFINES=-DLINUX - #DEFINES=-DSYSV -DSOLARIS - - # Options for your compiler (eg, "-g" for debugging, "-O" for - # optimizing, or "-g -O" for both under GCC) - #COPT= -g -traditional $(DEFINES) -! COPT= -g $(DEFINES) -! #COPT= -O $(DEFINES) - - # Version of "make" you want to use - #MAKE= gnumake ---- 24,37 ---- - - # Defines for your operating system - # -! DEFINES=-DLINUX -DUSE_IP_FILTER - #DEFINES=-DSYSV -DSOLARIS - - # Options for your compiler (eg, "-g" for debugging, "-O" for - # optimizing, or "-g -O" for both under GCC) - #COPT= -g -traditional $(DEFINES) -! #COPT= -g $(DEFINES) -! COPT= -O $(DEFINES) - - # Version of "make" you want to use - #MAKE= gnumake -*************** -*** 44,50 **** - - - # Destination directory for installation of binaries -! DEST= /usr/local/etc - - - # Destination directory for installation of man pages ---- 44,50 ---- - - - # Destination directory for installation of binaries -! DEST= /usr/local/sbin - - - # Destination directory for installation of man pages -*************** -*** 72,78 **** - # or -Bstatic for static binaries under SunOS 4.1.x) - #LDFL= -Bstatic - #LDFL= -! LDFL= -g - - - # Location of the fwtk sources [For #include by any external tools needing it] ---- 72,79 ---- - # or -Bstatic for static binaries under SunOS 4.1.x) - #LDFL= -Bstatic - #LDFL= -! #LDFL= -g -! LDFL= -O - - - # Location of the fwtk sources [For #include by any external tools needing it] -*************** -*** 81,87 **** - - - # Location of X libraries for X-gw -! XLIBDIR=/usr/X11/lib - #XLIBDIR=/usr/local/X11R5/lib - - # X Libraries ---- 82,88 ---- - - - # Location of X libraries for X-gw -! XLIBDIR=/usr/X11R6/lib - #XLIBDIR=/usr/local/X11R5/lib - - # X Libraries -*************** -*** 96,102 **** - #XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 - - # Location of X include files -! XINCLUDE=/usr/X11/include - #XINCLUDE=/usr/local/X11R5/include - - # Objects to include in libfwall for SYSV ---- 97,103 ---- - #XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 - - # Location of X include files -! XINCLUDE=/usr/X11R6/include - #XINCLUDE=/usr/local/X11R5/include - - # Objects to include in libfwall for SYSV -diff -cr ../TIS.orig/fwtk/Makefile.config.solaris fwtk/Makefile.config.solaris -*** ../TIS.orig/fwtk/Makefile.config.solaris Sat Sep 7 06:14:13 1996 ---- fwtk/Makefile.config.solaris Sun Feb 2 06:09:19 1997 -*************** -*** 11,30 **** - # - # RcsId: "$Header$" - - - # Your C compiler (eg, "cc" or "gcc") -! CC= cc - - - # program to use for installation -- this may or may not preserve - # old versions (or whatever). assumes that it takes parameters: - # copy source dest -! CP= cp - - - # Defines for your operating system - # -! DEFINES=-DSYSV -DSOLARIS - - #DEFINES=-DSYSV -DSOLARIS -Dgethostbyname=res_gethostbyname \ - -Dgethostbyaddr=res_gethostbyaddr -Dgetnetbyname=res_getnetbyname \ ---- 11,34 ---- - # - # RcsId: "$Header$" - -+ # -+ # Path to sources of ip_filter (ip_nat.h required in lib/hnam.c) -+ # -+ IPFPATH=/src/unpacked/firewall/ip_fil3.1.5 - - # Your C compiler (eg, "cc" or "gcc") -! CC= gcc - - - # program to use for installation -- this may or may not preserve - # old versions (or whatever). assumes that it takes parameters: - # copy source dest -! CP= /usr/ucb/install -c -s - - - # Defines for your operating system - # -! DEFINES=-DSYSV -DSOLARIS -DUSE_IP_FILTER -I$(IPFPATH) - - #DEFINES=-DSYSV -DSOLARIS -Dgethostbyname=res_gethostbyname \ - -Dgethostbyaddr=res_gethostbyaddr -Dgetnetbyname=res_getnetbyname \ -*************** -*** 45,52 **** - - - # Your ranlib utility (use "touch" if you don't have ranlib) -! RANLIB= ranlib -! #RANLIB= touch - - - # Destination directory for installation of binaries ---- 49,56 ---- - - - # Your ranlib utility (use "touch" if you don't have ranlib) -! # RANLIB= ranlib -! RANLIB= touch - - - # Destination directory for installation of binaries -diff -cr ../TIS.orig/fwtk/firewall.h fwtk/firewall.h -*** ../TIS.orig/fwtk/firewall.h Sun Sep 8 05:55:26 1996 ---- fwtk/firewall.h Sun Feb 2 05:23:33 1997 -*************** -*** 47,53 **** - system. - */ - #ifndef PERMFILE -! #define PERMFILE "/usr/local/etc/netperm-table" - #endif - - /* ---- 47,53 ---- - system. - */ - #ifndef PERMFILE -! #define PERMFILE "/etc/fwtk/netperm-table" - #endif - - /* -*************** -*** 67,73 **** - - /* Choose a system logging facility for the firewall toolkit. */ - #ifndef LFAC -! #define LFAC LOG_DAEMON - #endif - - ---- 67,73 ---- - - /* Choose a system logging facility for the firewall toolkit. */ - #ifndef LFAC -! #define LFAC LOG_LOCAL5 - #endif - - -*************** -*** 215,220 **** - #define PERM_ALLOW 01 - #define PERM_DENY 02 - -! - #define _INCL_FWALL_H - #endif ---- 215,222 ---- - #define PERM_ALLOW 01 - #define PERM_DENY 02 - -! #ifdef USE_IP_FILTER -! extern char *getdsthost(int, int*); -! #endif - #define _INCL_FWALL_H - #endif -diff -cr ../TIS.orig/fwtk/ftp-gw/ftp-gw.c fwtk/ftp-gw/ftp-gw.c -*** ../TIS.orig/fwtk/ftp-gw/ftp-gw.c Fri Sep 6 18:55:05 1996 ---- fwtk/ftp-gw/ftp-gw.c Sat Feb 1 06:49:13 1997 -*************** -*** 50,55 **** ---- 50,59 ---- - #ifndef FTPPORT - #define FTPPORT 21 - #endif -+ #ifdef USE_IP_FILTER -+ static int do_transparent=0; -+ static int connectdest(); -+ #endif - - static Cfg *confp; - static char **validests = (char **)0; -*************** -*** 170,175 **** ---- 174,182 ---- - char xuf[1024]; - char huf[128]; - char *passuser = (char *)0; /* passed user as av */ -+ #ifdef USE_IP_FILTER -+ char *psychic, *hotline; -+ #endif - - #ifndef LOG_DAEMON - openlog("ftp-gw",LOG_PID); -*************** -*** 313,320 **** - } - } else - timeout = 60*60; - -- - /* display a welcome file or message */ - if(passuser == (char *)0) { - if((cf = cfg_get("welcome-msg",confp)) != (Cfg *)0) { ---- 320,330 ---- - } - } else - timeout = 60*60; -+ #ifdef USE_IP_FILTER -+ psychic=getdsthost(0,NULL); -+ if(psychic) { do_transparent++; } -+ #endif - - /* display a welcome file or message */ - if(passuser == (char *)0) { - if((cf = cfg_get("welcome-msg",confp)) != (Cfg *)0) { -*************** -*** 322,327 **** ---- 332,345 ---- - syslog(LLEV,"fwtkcfgerr: welcome-msg must have one parameter, line %d",cf->ln); - exit(1); - } -+ #ifdef USE_IP_FILTER -+ if(do_transparent) { -+ if(sayfile2(0,cf->argv[0],220)) { -+ syslog(LLEV,"fwtksyserr: cannot display welcome %s: %m",cf->argv[0]); -+ exit(1); -+ } -+ } else -+ #endif /* USE_IP_FILTER */ - if(sayfile(0,cf->argv[0],220)) { - syslog(LLEV,"fwtksyserr: cannot display welcome %s: %m",cf->argv[0]); - exit(1); -*************** -*** 332,338 **** - if(authallflg) - if(say(0,"220-Proxy first requires authentication")) - exit(1); -! sprintf(xuf,"220 %s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); - if(say(0,xuf)) - exit(1); - } ---- 350,361 ---- - if(authallflg) - if(say(0,"220-Proxy first requires authentication")) - exit(1); -! #ifdef USE_IP_FILTER -! if(do_transparent) -! sprintf(xuf,"220-%s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); -! else -! #endif -! sprintf(xuf,"220 %s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); - if(say(0,xuf)) - exit(1); - } -*************** -*** 352,358 **** - if(cmd_user(2,fakav,"user internal")) - exit(1); - } -! - /* main loop */ - while(1) { - FD_ZERO(&rdy); ---- 375,386 ---- - if(cmd_user(2,fakav,"user internal")) - exit(1); - } -! #ifdef USE_IP_FILTER -! if(do_transparent) { -! connectdest(psychic,21); -! } -! #endif -! - /* main loop */ - while(1) { - FD_ZERO(&rdy); -*************** -*** 676,681 **** ---- 704,719 ---- - return(sayn(0,noad,sizeof(noad)-1)); - } - -+ #ifdef USE_IP_FILTER -+ if(do_transparent) { -+ if((rfd==(-1)) && (x=connectdest(dest,port))) return x; -+ sprintf(buf,"USER %s",user); -+ if(say(rfd,buf)) return(1); -+ x=getresp(rfd,buf,sizeof(buf),1); -+ if(sendsaved(0,x)) return(1); -+ return(say(0,buf)); -+ } -+ #endif - if(*dest == '\0') - dest = "localhost"; - -*************** -*** 717,723 **** - char ebuf[512]; - - strcpy(ebuf,buf); -! sprintf(buf,"521 %s: %s",dest,ebuf); - rfd = -1; - return(say(0,buf)); - } ---- 755,766 ---- - char ebuf[512]; - - strcpy(ebuf,buf); -! #ifdef USE_IP_FILTER -! if(do_transparent) { -! sprintf(buf,"521 %s,%d: %s",dest,ntohs(port),ebuf); -! } else -! #endif -! sprintf(buf,"521 %s: %s",dest,ebuf); - rfd = -1; - return(say(0,buf)); - } -*************** -*** 1874,1876 **** ---- 1917,2036 ---- - dup(nread); - } - #endif -+ -+ #ifdef USE_IP_FILTER -+ static int connectdest(dest, port) -+ char *dest; -+ short port; -+ { -+ char buf[1024], mbuf[512]; -+ int msg_int, x; -+ -+ if(*dest == '\0') -+ dest = "localhost"; -+ -+ if(validests != (char **)0) { -+ char **xp; -+ int x; -+ -+ for(xp = validests; *xp != (char *)0; xp++) { -+ if(**xp == '!' && hostmatch(*xp + 1,dest)) { -+ return(baddest(0,dest)); -+ } else { -+ if(hostmatch(*xp,dest)) -+ break; -+ } -+ } -+ if(*xp == (char *)0) -+ return(baddest(0,dest)); -+ } -+ -+ /* Extended permissions processing goes in here for destination */ -+ if(extendperm) { -+ msg_int = auth_perm(confp, authuser, "ftp-gw", dest,(char *)0); -+ if(msg_int == 1) { -+ sprintf(mbuf,"Permission denied for user %s to connect to %s",authuser,dest); -+ syslog(LLEV,"deny host=%s/%s connect to %s user=%s",rladdr,riaddr,dest,authuser); -+ say(0,mbuf); -+ return(1); -+ } else { -+ if(msg_int == -1) { -+ sprintf(mbuf,"No match in netperm-table for %s to ftp to %s",authuser,dest); -+ say(0,mbuf); -+ return(1); -+ } -+ } -+ } -+ -+ syslog(LLEV,"permit host=%s/%s connect to %s",rladdr,riaddr,dest); -+ -+ if((rfd = conn_server(dest,port,0,buf)) < 0) { -+ char ebuf[512]; -+ -+ strcpy(ebuf,buf); -+ sprintf(buf,"521 %s: %s",dest,ebuf); -+ rfd = -1; -+ return(say(0,buf)); -+ } -+ if(!do_transparent) { -+ sprintf(buf,"----GATEWAY CONNECTED TO %s----",dest); -+ saveline(buf); -+ } -+ -+ /* we are now connected and need to try the autologin thing */ -+ x = getresp(rfd,buf,sizeof(buf),1); -+ if(x / 100 != COMPLETE) { -+ sendsaved(0,-1); -+ return(say(0,buf)); -+ } -+ saveline(buf); -+ -+ sendsaved(0,-1); -+ return 0; -+ } -+ -+ -+ /* ok, so i'm in a hurry. english paper due RSN. */ -+ sayfile2(fd,fn,code) -+ int fd; -+ char *fn; -+ int code; -+ { -+ FILE *f; -+ char buf[BUFSIZ]; -+ char yuf[BUFSIZ]; -+ char *c; -+ int x; -+ int saidsomething = 0; -+ -+ if((f = fopen(fn,"r")) == (FILE *)0) -+ return(1); -+ while(fgets(buf,sizeof(buf),f) != (char *)0) { -+ if((c = index(buf,'\n')) != (char *)0) -+ *c = '\0'; -+ x = fgetc(f); -+ if(feof(f)) -+ sprintf(yuf,"%3.3d-%s",code,buf); -+ else { -+ sprintf(yuf,"%3.3d-%s",code,buf); -+ ungetc(x,f); -+ } -+ if(say(fd,yuf)) { -+ fclose(f); -+ return(1); -+ } -+ saidsomething++; -+ } -+ fclose(f); -+ if (!saidsomething) { -+ syslog(LLEV,"fwtkcfgerr: sayfile for %d is empty",code); -+ sprintf(yuf, "%3.3d The file to display is empty",code); -+ if(say(fd,yuf)) { -+ fclose(f); -+ return(1); -+ } -+ } -+ return(0); -+ } -+ -+ #endif /* USE_IP_FILTER */ -diff -cr ../TIS.orig/fwtk/http-gw/http-gw.c fwtk/http-gw/http-gw.c -*** ../TIS.orig/fwtk/http-gw/http-gw.c Mon Sep 9 20:40:53 1996 ---- fwtk/http-gw/http-gw.c Sun Feb 2 06:41:18 1997 -*************** -*** 27,32 **** ---- 27,35 ---- - static char http_buffer[8192]; - static char reason[8192]; - static int checkBrowserType = 1; -+ #ifdef USE_IP_FILTER -+ static int do_transparent=0; -+ #endif - - static void do_logging() - { char *proto = "GOPHER"; -*************** -*** 422,427 **** ---- 425,441 ---- - /*(NOT A SPECIAL FORM)*/ - - if((rem_type & TYPE_LOCAL)== 0){ -+ #ifdef USE_IP_FILTER -+ char *psychic=getdsthost(sockfd,&def_port); -+ if(psychic) { -+ if(strlen(psychic)<=MAXHOSTNAMELEN) { -+ do_transparent++; -+ strncpy(def_httpd,psychic,strlen(psychic)); -+ strncpy(def_server,psychic,strlen(psychic)); -+ } -+ } -+ -+ #endif /* USE_IP_FILTER */ - /* See if it can be forwarded */ - - if( can_forward(buf)){ -*************** -*** 1513,1518 **** ---- 1527,1537 ---- - parse_vec[0], - parse_vec[1], - ourname, ourport); -+ } -+ #ifdef USE_IP_FILTER -+ else if(do_transparent) { -+ sprintf(new_reply,"%s\t%s\t%s\t%s",parse_vec[0],parse_vec[1],parse_vec[2],parse_vec[3]); -+ #endif /* USE_IP_FILTER */ - }else{ - sprintf(new_reply,"%s\tgopher://%s:%s/%c%s\t%s\t%u", - parse_vec[0], parse_vec[2], -diff -cr ../TIS.orig/fwtk/lib/hnam.c fwtk/lib/hnam.c -*** ../TIS.orig/fwtk/lib/hnam.c Sat Nov 5 00:30:19 1994 ---- fwtk/lib/hnam.c Sat Feb 1 08:17:46 1997 -*************** -*** 20,25 **** ---- 20,37 ---- - - extern char *inet_ntoa(); - -+ #if defined(USE_IP_FILTER) -+ #include <net/if.h> -+ #ifndef LINUX -+ #include "ip_nat.h" -+ #endif -+ #if defined(SOLARIS) -+ #include <sys/stat.h> -+ #include <fcntl.h> -+ #include <unistd.h> -+ #include <sys/ioccom.h> -+ #endif -+ #endif /* IP_FILTER */ - - #include "firewall.h" - -*************** -*** 45,47 **** ---- 57,158 ---- - bcopy(hp->h_addr,&sin.sin_addr,hp->h_length); - return(inet_ntoa(sin.sin_addr)); - } -+ -+ -+ -+ #ifdef USE_IP_FILTER -+ char *getdsthost(fd, ptr) -+ int fd; -+ int *ptr; -+ { -+ struct sockaddr_in sin; -+ struct hostent *hp; -+ int sl=sizeof(struct sockaddr_in), err=0, local_h=0, i=0; -+ static char buf[255], hostbuf[255]; -+ #if defined(__FreeBSD__) || defined(SOLARIS) -+ struct sockaddr_in rsin; -+ struct natlookup natlookup; -+ int natfd; -+ #endif -+ -+ #ifdef linux -+ /* This should also work for UDP. Unfortunately, it doesn't. -+ Maybe when the Linux UDP proxy code gets a little cleaner. -+ */ -+ if(!(err=getsockname(0,&sin,&sl))) { -+ if(ptr) *ptr=ntohs(sin.sin_port); -+ sprintf(buf,"%s",inet_ntoa(sin.sin_addr)); -+ gethostname(hostbuf,254); -+ hp=gethostbyname(hostbuf); -+ while(hp->h_addr_list[i]) { -+ bzero(&sin,&sl); -+ memcpy(&sin.sin_addr,hp->h_addr_list[i++],sizeof(hp->h_addr_list[i++])); -+ if(!strcmp(buf,inet_ntoa(sin.sin_addr))) local_h++; -+ } -+ if(local_h) { /* syslog(LLEV,"DEBUG: hnam.c: non-transparent."); */ return(NULL); } -+ else { return(buf); } -+ } -+ #endif -+ -+ #if defined(__FreeBSD__) -+ /* The basis for this block of code is Darren Reed's -+ patches to the TIS ftwk's ftp-gw. -+ */ -+ bzero((char*)&sin,sizeof(sin)); -+ bzero((char*)&rsin,sizeof(rsin)); -+ if(getsockname(fd,(struct sockaddr*)&sin,&sl)<0) { -+ return NULL; -+ } -+ sl=sizeof(rsin); -+ if(getpeername(fd,(struct sockaddr*)&rsin,&sl)<0) { -+ return NULL; -+ } -+ natlookup.nl_inport=sin.sin_port; -+ natlookup.nl_outport=rsin.sin_port; -+ natlookup.nl_inip=sin.sin_addr; -+ natlookup.nl_outip=rsin.sin_addr; -+ if((natfd=open("/dev/ipnat",O_RDONLY))<0) { -+ return(NULL); -+ } -+ if(ioctl(natfd,SIOCGNATL,&natlookup)==(-1)) { -+ return(NULL); -+ } -+ close(natfd); -+ if(ptr) *ptr=ntohs(natlookup.nl_realport); -+ sprintf(buf,"%s",inet_ntoa(natlookup.nl_realip)); -+ #endif -+ -+ #if defined(SOLARIS) /* for Solaris */ -+ /* The basis for this block of code is Darren Reed's -+ * patches to the TIS ftwk's ftp-gw. -+ * modified for Solaris from Michael Kutzner, Michael.Kutzner@paderlinx.de -+ */ -+ memset((char*)&sin, 0, sizeof(sin)); -+ memset((char*)&rsin, 0, sizeof(rsin)); -+ -+ if(getsockname(fd,(struct sockaddr*)&sin,&sl)<0) { -+ return NULL; -+ } -+ sl=sizeof(rsin); -+ if(getpeername(fd,(struct sockaddr*)&rsin,&sl)<0) { -+ return NULL; -+ } -+ natlookup.nl_inport=sin.sin_port; -+ natlookup.nl_outport=rsin.sin_port; -+ natlookup.nl_inip=sin.sin_addr; -+ natlookup.nl_outip=rsin.sin_addr; -+ if( (natfd=open(IPL_NAT,O_RDONLY)) < 0) { -+ return(NULL); -+ } -+ if(ioctl(natfd, SIOCGNATL, &natlookup) == -1) { -+ return(NULL); -+ } -+ close(natfd); -+ if(ptr) *ptr=ntohs(natlookup.nl_realport); -+ sprintf(buf,"%s",inet_ntoa(natlookup.nl_realip)); -+ #endif -+ -+ /* No transparent proxy support */ -+ return(NULL); -+ } -+ #endif /* USE_IP_FILTER */ -diff -cr ../TIS.orig/fwtk/plug-gw/plug-gw.c fwtk/plug-gw/plug-gw.c -*** ../TIS.orig/fwtk/plug-gw/plug-gw.c Thu Sep 5 21:36:33 1996 ---- fwtk/plug-gw/plug-gw.c Sun Feb 2 04:50:40 1997 -*************** -*** 38,44 **** - static int timeout = PROXY_TIMEOUT; - static char **validdests = (char **)0; - static Cfg *confp; -! - main(ac,av) - int ac; - char *av[]; ---- 38,46 ---- - static int timeout = PROXY_TIMEOUT; - static char **validdests = (char **)0; - static Cfg *confp; -! #ifdef USE_IP_FILTER -! static int do_transparent=0; -! #endif - main(ac,av) - int ac; - char *av[]; -*************** -*** 189,201 **** - static char buf[1024 * 4]; - void (*op)(); - char *dhost = NULL; - char hostport[1024 * 4]; - char *ptr; - int state = 0; - int ssl_plug = 0; -! - struct timeval timo; - - if(c->flags & PERM_DENY) { - if (p == -1) - syslog(LLEV,"deny host=%s/%s port=any",rhost,raddr); ---- 191,215 ---- - static char buf[1024 * 4]; - void (*op)(); - char *dhost = NULL; -+ char *transhost = NULL; - char hostport[1024 * 4]; - char *ptr; - int state = 0; - int ssl_plug = 0; -! #ifdef USE_IP_FILTER -! int pport; -! #endif - struct timeval timo; - -+ #ifdef USE_IP_FILTER -+ /* Transparent plug-gw is probably a bad idea, but hey .. */ -+ transhost=getdsthost(0,&pport); -+ if(transhost) { -+ do_transparent++; -+ portid=pport; -+ } -+ #endif -+ - if(c->flags & PERM_DENY) { - if (p == -1) - syslog(LLEV,"deny host=%s/%s port=any",rhost,raddr); -*************** -*** 223,229 **** - privport = 1; - continue; - } -! - if (!strcmp(av[x], "-port")) { - if (++x >= ac) { - syslog(LLEV,"fwtkcfgerr: -port takes an argument, line %d",c->ln); ---- 237,248 ---- - privport = 1; - continue; - } -! #ifdef USE_IP_FILTER -! if (!strcmp(av[x],"-all-destinations")) { -! dhost = transhost; -! continue; -! } -! #endif - if (!strcmp(av[x], "-port")) { - if (++x >= ac) { - syslog(LLEV,"fwtkcfgerr: -port takes an argument, line %d",c->ln); -diff -cr ../TIS.orig/fwtk/rlogin-gw/rlogin-gw.c fwtk/rlogin-gw/rlogin-gw.c -*** ../TIS.orig/fwtk/rlogin-gw/rlogin-gw.c Fri Sep 6 18:56:33 1996 ---- fwtk/rlogin-gw/rlogin-gw.c Sun Feb 2 06:26:04 1997 -*************** -*** 40,46 **** - - extern char *maphostname(); - -! - static int cmd_quit(); - static int cmd_help(); - static int cmd_connect(); ---- 40,48 ---- - - extern char *maphostname(); - -! #ifdef USE_IP_FILTER -! static int do_transparent=0; -! #endif - static int cmd_quit(); - static int cmd_help(); - static int cmd_connect(); -*************** -*** 120,125 **** ---- 122,130 ---- - static char *tokav[56]; - int tokac; - struct timeval timo; -+ #ifdef USE_IP_FILTER -+ char *psychic; -+ #endif - - #ifndef LOG_NDELAY - openlog("rlogin-gw",LOG_PID); -*************** -*** 186,192 **** - } - - -! - if((cf = cfg_get("directory",confp)) != (Cfg *)0) { - if(cf->argc != 1) { - syslog(LLEV,"fwtkcfgerr: chroot must have one parameter, line %d",cf->ln); ---- 191,204 ---- - } - - -! #ifdef USE_IP_FILTER -! psychic=getdsthost(0,NULL); -! if(psychic) { -! do_transparent++; -! strncpy(dest,psychic,511); -! dest[511]='\0'; -! } -! #endif /* USE_IP_FILTER */ - if((cf = cfg_get("directory",confp)) != (Cfg *)0) { - if(cf->argc != 1) { - syslog(LLEV,"fwtkcfgerr: chroot must have one parameter, line %d",cf->ln); -*************** -*** 260,269 **** - } - - /* if present a host name, chop and save username and hostname */ -- dest[0] = '\0'; - if((p = index(rusername,'@')) != (char *)0) { - char *namp; - - *p++ = '\0'; - if(*p == '\0') - p = "localhost"; ---- 272,281 ---- - } - - /* if present a host name, chop and save username and hostname */ - if((p = index(rusername,'@')) != (char *)0) { - char *namp; - -+ dest[0] = '\0'; - *p++ = '\0'; - if(*p == '\0') - p = "localhost"; -*************** -*** 532,539 **** ---- 544,557 ---- - sprintf(ebuf,"Trying %s@%s...",rusername,namp); - else - sprintf(ebuf,"Trying %s...",namp); -+ #ifdef USE_IP_FILTER -+ if(!do_transparent) { -+ #endif - if(say(0,ebuf)) - return(1); -+ #ifdef USE_IP_FILTER -+ } -+ #endif - } else - syslog(LLEV,"permit host=%s/%s connect to %s",rhost,raddr,av[1]); - if((serfd = conn_server(av[1],RLOGINPORT,1,buf)) < 0) { -diff -cr ../TIS.orig/fwtk/tn-gw/tn-gw.c fwtk/tn-gw/tn-gw.c -*** ../TIS.orig/fwtk/tn-gw/tn-gw.c Fri Sep 6 18:55:48 1996 ---- fwtk/tn-gw/tn-gw.c Sun Feb 2 06:06:33 1997 -*************** -*** 97,102 **** ---- 97,106 ---- - static int timeout = PROXY_TIMEOUT; - static char timed_out_msg[] = "\r\nConnection closed due to inactivity"; - -+ #ifdef USE_IP_FILTER -+ static int do_transparent=0; -+ #endif -+ - typedef struct { - char *name; - char *hmsg; -*************** -*** 140,145 **** ---- 144,153 ---- - char tokbuf[BSIZ]; - char *tokav[56]; - int tokac; -+ #ifdef USE_IP_FILTER -+ int port; -+ char *psychic; -+ #endif - - #ifndef LOG_DAEMON - openlog("tn-gw",LOG_PID); -*************** -*** 307,313 **** - exit(1); - } - } -! - while (argc > 1) { - argc--; - argv++; ---- 315,349 ---- - exit(1); - } - } -! #ifdef USE_IP_FILTER -! psychic=getdsthost(0,&port); -! if(psychic) { -! if((strlen(psychic) + 10) < 510) { -! do_transparent++; -! if(port) -! sprintf(dest,"%s:%d",psychic,port); -! else -! sprintf(dest,"%s",psychic); -! -! -! if(!welcomedone) -! if((cf = cfg_get("welcome-msg",confp)) != (Cfg *)0) { -! if(cf->argc != 1) { -! syslog(LLEV,"fwtkcfgerr: welcome-msg must have one parameter, line %d",cf->ln); -! exit(1); -! } -! if(sayfile(0,cf->argv[0])) { -! syslog(LLEV,"fwtksyserr: cannot display welcome %s:%m",cf->argv[0]); -! exit(1); -! } -! welcomedone = 1; -! } -! -! -! } -! } -! -! #endif /* USE_IP_FILTER */ - while (argc > 1) { - argc--; - argv++; -*************** -*** 870,877 **** - - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,namp); - sprintf(ebuf,"Trying %s port %d...",namp,port); -! if(say(0,ebuf)) -! return(1); - } else - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,av[1]); - ---- 906,920 ---- - - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,namp); - sprintf(ebuf,"Trying %s port %d...",namp,port); -! #ifdef USE_IP_FILTER -! if(!do_transparent) { -! sprintf(ebuf,"Trying %s port %d...",namp,port); -! #endif -! if(say(0,ebuf)) -! return(1); -! #ifdef USE_IP_FILTER -! } -! #endif - } else - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,av[1]); - -*************** -*** 903,910 **** - - syslog(LLEV,"connected host=%s/%s destination=%s",rladdr,riaddr,av[1]); - strncpy(dest,av[1], 511); -! sprintf(buf, "Connected to %s.", dest); - say(0, buf); - return(2); - } - ---- 946,959 ---- - - syslog(LLEV,"connected host=%s/%s destination=%s",rladdr,riaddr,av[1]); - strncpy(dest,av[1], 511); -! #ifdef USE_IP_FILTER -! if(!do_transparent) { -! sprintf(buf, "Connected to %s.", dest); -! say(0, buf); -! } -! #else - say(0, buf); -+ #endif - return(2); - } - -diff -cr ../TIS.orig/fwtk/x-gw/socket.c fwtk/x-gw/socket.c -*** ../TIS.orig/fwtk/x-gw/socket.c Sat Sep 7 05:16:35 1996 ---- fwtk/x-gw/socket.c Sun Feb 2 05:26:44 1997 -*************** -*** 212,218 **** - case AF_UNIX: un_name = (struct sockaddr_un *)addr; - len = sizeof(un_name->sun_family) + - sizeof(un_name->sun_path) -! #ifdef SCM_RIGHTS /* 4.3BSD Reno and later */ - + sizeof(un_name->sun_len) + 1 - #endif - ; ---- 212,218 ---- - case AF_UNIX: un_name = (struct sockaddr_un *)addr; - len = sizeof(un_name->sun_family) + - sizeof(un_name->sun_path) -! #if defined(SCM_RIGHTS) && !defined(LINUX)/* 4.3BSD Reno and later */ - + sizeof(un_name->sun_len) + 1 - #endif - ; -Only in fwtk/x-gw: socket.c.bak diff --git a/contrib/ipfilter/FWTK/fwtkp b/contrib/ipfilter/FWTK/fwtkp deleted file mode 100644 index aba869d..0000000 --- a/contrib/ipfilter/FWTK/fwtkp +++ /dev/null @@ -1,812 +0,0 @@ -diff -c -r ./ftp-gw/ftp-gw.c ../../NEW/fwtk/ftp-gw/ftp-gw.c -*** ./ftp-gw/ftp-gw.c Fri Sep 6 12:55:05 1996 ---- ../../NEW/fwtk/ftp-gw/ftp-gw.c Wed Oct 9 02:51:35 1996 -*************** -*** 40,47 **** - - extern char *optarg; - -! #include "firewall.h" - - - #ifndef BSIZ - #define BSIZ 2048 ---- 40,48 ---- - - extern char *optarg; - -! char *getdsthost(); - -+ #include "firewall.h" - - #ifndef BSIZ - #define BSIZ 2048 -*************** -*** 84,89 **** ---- 85,92 ---- - static int cmdcnt = 0; - static int timeout = PROXY_TIMEOUT; - -+ static int do_transparent=0; -+ - - static int cmd_user(); - static int cmd_authorize(); -*************** -*** 98,103 **** ---- 101,107 ---- - static void saveline(); - static void flushsaved(); - static void trap_sigurg(); -+ static int connectdest(); - - #define OP_CONN 001 /* only valid if connected */ - #define OP_WCON 002 /* writethrough if connected */ -*************** -*** 170,175 **** ---- 174,180 ---- - char xuf[1024]; - char huf[128]; - char *passuser = (char *)0; /* passed user as av */ -+ char *psychic, *hotline; - - #ifndef LOG_DAEMON - openlog("ftp-gw",LOG_PID); -*************** -*** 314,319 **** ---- 319,326 ---- - } else - timeout = 60*60; - -+ psychic=getdsthost(0,NULL); -+ if(psychic) { do_transparent++; } - - /* display a welcome file or message */ - if(passuser == (char *)0) { -*************** -*** 322,327 **** ---- 329,340 ---- - syslog(LLEV,"fwtkcfgerr: welcome-msg must have one parameter, line %d",cf->ln); - exit(1); - } -+ if(do_transparent) { -+ if(sayfile2(0,cf->argv[0],220)) { -+ syslog(LLEV,"fwtksyserr: cannot display welcome %s: %m",cf->argv[0]); -+ exit(1); -+ } -+ } else - if(sayfile(0,cf->argv[0],220)) { - syslog(LLEV,"fwtksyserr: cannot display welcome %s: %m",cf->argv[0]); - exit(1); -*************** -*** 332,338 **** - if(authallflg) - if(say(0,"220-Proxy first requires authentication")) - exit(1); -! sprintf(xuf,"220 %s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); - if(say(0,xuf)) - exit(1); - } ---- 345,357 ---- - if(authallflg) - if(say(0,"220-Proxy first requires authentication")) - exit(1); -! /* foo */ -! if(do_transparent) -! sprintf(xuf,"220-%s FTP proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); -! else -! sprintf(xuf,"220 %s FTP Proxy (Version %s) ready.",huf,FWTK_VERSION_MINOR); -! /* foo */ -! - if(say(0,xuf)) - exit(1); - } -*************** -*** 353,358 **** ---- 372,381 ---- - exit(1); - } - -+ if(do_transparent) { -+ connectdest(psychic,21); -+ } -+ - /* main loop */ - while(1) { - FD_ZERO(&rdy); -*************** -*** 676,681 **** ---- 699,713 ---- - return(sayn(0,noad,sizeof(noad)-1)); - } - -+ if(do_transparent) { -+ if((rfd==(-1)) && (x=connectdest(dest,port))) return x; -+ sprintf(buf,"USER %s",user); -+ if(say(rfd,buf)) return(1); -+ x=getresp(rfd,buf,sizeof(buf),1); -+ if(sendsaved(0,x)) return(1); -+ return(say(0,buf)); -+ } -+ - if(*dest == '\0') - dest = "localhost"; - -*************** -*** 701,708 **** - if(msg_int == 1) { - sprintf(mbuf,"Permission denied for user %s to connect to %s",authuser,dest); - syslog(LLEV,"deny host=%s/%s connect to %s user=%s",rladdr,riaddr,dest,authuser); -! say(0,mbuf); -! return(1); - } else { - if(msg_int == -1) { - sprintf(mbuf,"No match in netperm-table for %s to ftp to %s",authuser,dest); ---- 733,740 ---- - if(msg_int == 1) { - sprintf(mbuf,"Permission denied for user %s to connect to %s",authuser,dest); - syslog(LLEV,"deny host=%s/%s connect to %s user=%s",rladdr,riaddr,dest,authuser); -! say(0,mbuf); -! return(1); - } else { - if(msg_int == -1) { - sprintf(mbuf,"No match in netperm-table for %s to ftp to %s",authuser,dest); -*************** -*** 717,723 **** - char ebuf[512]; - - strcpy(ebuf,buf); -! sprintf(buf,"521 %s: %s",dest,ebuf); - rfd = -1; - return(say(0,buf)); - } ---- 749,759 ---- - char ebuf[512]; - - strcpy(ebuf,buf); -! if(do_transparent) { -! sprintf(buf,"521 %s,%d: %s",dest,ntohs(port),ebuf); -! } else { -! sprintf(buf,"521 %s: %s",dest,ebuf); -! } - rfd = -1; - return(say(0,buf)); - } -*************** -*** 732,737 **** ---- 768,778 ---- - } - saveline(buf); - -+ /* if(do_transparent) { -+ sendsaved(0,-1); -+ return(0); -+ } /* EEEk. I can't remember what this does. */ -+ - sprintf(buf,"USER %s",user); - if(say(rfd,buf)) - return(1); -*************** -*** 744,749 **** ---- 785,860 ---- - return 0; - } - -+ static int connectdest(dest, port) -+ char *dest; -+ short port; -+ { -+ char buf[1024], mbuf[512]; -+ int msg_int, x; -+ -+ if(*dest == '\0') -+ dest = "localhost"; -+ -+ if(validests != (char **)0) { -+ char **xp; -+ int x; -+ -+ for(xp = validests; *xp != (char *)0; xp++) { -+ if(**xp == '!' && hostmatch(*xp + 1,dest)) { -+ return(baddest(0,dest)); -+ } else { -+ if(hostmatch(*xp,dest)) -+ break; -+ } -+ } -+ if(*xp == (char *)0) -+ return(baddest(0,dest)); -+ } -+ -+ /* Extended permissions processing goes in here for destination */ -+ if(extendperm) { -+ msg_int = auth_perm(confp, authuser, "ftp-gw", dest,(char *)0); -+ if(msg_int == 1) { -+ sprintf(mbuf,"Permission denied for user %s to connect to %s",authuser,dest); -+ syslog(LLEV,"deny host=%s/%s connect to %s user=%s",rladdr,riaddr,dest,authuser); -+ say(0,mbuf); -+ return(1); -+ } else { -+ if(msg_int == -1) { -+ sprintf(mbuf,"No match in netperm-table for %s to ftp to %s",authuser,dest); -+ say(0,mbuf); -+ return(1); -+ } -+ } -+ } -+ -+ syslog(LLEV,"permit host=%s/%s connect to %s",rladdr,riaddr,dest); -+ -+ if((rfd = conn_server(dest,port,0,buf)) < 0) { -+ char ebuf[512]; -+ -+ strcpy(ebuf,buf); -+ sprintf(buf,"521 %s: %s",dest,ebuf); -+ rfd = -1; -+ return(say(0,buf)); -+ } -+ if(!do_transparent) { -+ sprintf(buf,"----GATEWAY CONNECTED TO %s----",dest); -+ saveline(buf); -+ } -+ -+ /* we are now connected and need to try the autologin thing */ -+ x = getresp(rfd,buf,sizeof(buf),1); -+ if(x / 100 != COMPLETE) { -+ sendsaved(0,-1); -+ return(say(0,buf)); -+ } -+ saveline(buf); -+ -+ sendsaved(0,-1); -+ return 0; -+ } -+ - - - static int -*************** -*** 1053,1058 **** ---- 1164,1171 ---- - static char nprn[] = "500 cannot get peername"; - char buf[512]; - -+ /* syslog(LLEV,"DEBUG: port cmd"); */ -+ - if(ac < 2) - return(sayn(0,narg,sizeof(narg)-1)); - -*************** -*** 1119,1124 **** ---- 1232,1238 ---- - #define UC(c) (((int)c) & 0xff) - sprintf(buf,"PORT %d,%d,%d,%d,%d,%d\r\n",UC(k[0]),UC(k[1]),UC(k[2]), - UC(k[3]),UC(l[0]),UC(l[1])); -+ /* syslog(LLEV,"DEBUG: %s",buf); */ - s = strlen(buf); - if (write(rfd, buf, s) != s) - return 1; -*************** -*** 1330,1335 **** ---- 1444,1450 ---- - callback() - { - /* if we haven't gotten a valid PORT scrub the connection */ -+ /* syslog(LLEV,"DEBUG: callback()."); */ - if((outgoing = accept(boundport,(struct sockaddr *)0,(int *)0)) < 0 || clntport.sin_port == 0) - goto bomb; - if(pasvport != -1) { /* incoming handled by PASVcallback */ -*************** -*** 1796,1801 **** ---- 1911,1960 ---- - } - return(0); - } -+ -+ /* ok, so i'm in a hurry. english paper due RSN. */ -+ sayfile2(fd,fn,code) -+ int fd; -+ char *fn; -+ int code; -+ { -+ FILE *f; -+ char buf[BUFSIZ]; -+ char yuf[BUFSIZ]; -+ char *c; -+ int x; -+ int saidsomething = 0; -+ -+ if((f = fopen(fn,"r")) == (FILE *)0) -+ return(1); -+ while(fgets(buf,sizeof(buf),f) != (char *)0) { -+ if((c = index(buf,'\n')) != (char *)0) -+ *c = '\0'; -+ x = fgetc(f); -+ if(feof(f)) -+ sprintf(yuf,"%3.3d-%s",code,buf); -+ else { -+ sprintf(yuf,"%3.3d-%s",code,buf); -+ ungetc(x,f); -+ } -+ if(say(fd,yuf)) { -+ fclose(f); -+ return(1); -+ } -+ saidsomething++; -+ } -+ fclose(f); -+ if (!saidsomething) { -+ syslog(LLEV,"fwtkcfgerr: sayfile for %d is empty",code); -+ sprintf(yuf, "%3.3d The file to display is empty",code); -+ if(say(fd,yuf)) { -+ fclose(f); -+ return(1); -+ } -+ } -+ return(0); -+ } -+ - - - porttoaddr(s,a) -diff -c -r ./http-gw/http-gw.c ../../NEW/fwtk/http-gw/http-gw.c -*** ./http-gw/http-gw.c Mon Sep 9 14:40:53 1996 ---- ../../NEW/fwtk/http-gw/http-gw.c Wed Oct 9 02:51:57 1996 -*************** -*** 27,32 **** ---- 27,37 ---- - static char http_buffer[8192]; - static char reason[8192]; - static int checkBrowserType = 1; -+ /* foo */ -+ static int do_transparent=0; -+ /* foo */ -+ -+ char *getdsthost(); - - static void do_logging() - { char *proto = "GOPHER"; -*************** -*** 422,427 **** ---- 427,443 ---- - /*(NOT A SPECIAL FORM)*/ - - if((rem_type & TYPE_LOCAL)== 0){ -+ /* foo */ -+ char *psychic=getdsthost(sockfd,&def_port); -+ if(psychic) { -+ if(strlen(psychic)<=MAXHOSTNAMELEN) { -+ do_transparent++; -+ strncpy(def_httpd,psychic,strlen(psychic)); -+ strncpy(def_server,psychic,strlen(psychic)); -+ } -+ } -+ -+ /* foo */ - /* See if it can be forwarded */ - - if( can_forward(buf)){ -*************** -*** 1513,1519 **** - parse_vec[0], - parse_vec[1], - ourname, ourport); -! }else{ - sprintf(new_reply,"%s\tgopher://%s:%s/%c%s\t%s\t%u", - parse_vec[0], parse_vec[2], - parse_vec[3], chk_type_ch, ---- 1529,1541 ---- - parse_vec[0], - parse_vec[1], - ourname, ourport); -! } -! /* FOO */ -! else if(do_transparent) { -! sprintf(new_reply,"%s\t%s\t%s\t%s",parse_vec[0],parse_vec[1],parse_vec[2],parse_vec[3]); -! } -! /* FOO */ -! else{ - sprintf(new_reply,"%s\tgopher://%s:%s/%c%s\t%s\t%u", - parse_vec[0], parse_vec[2], - parse_vec[3], chk_type_ch, -diff -c -r ./lib/hnam.c ../../NEW/fwtk/lib/hnam.c -*** ./lib/hnam.c Fri Nov 4 18:30:19 1994 ---- ../../NEW/fwtk/lib/hnam.c Wed Oct 9 02:34:13 1996 -*************** -*** 22,27 **** ---- 22,31 ---- - - - #include "firewall.h" -+ #ifdef __FreeBSD__ -+ #include <net/if.h> -+ #include "ip_nat.h" -+ #endif /* __FreeBSD__ */ - - - char * -*************** -*** 44,47 **** ---- 48,115 ---- - - bcopy(hp->h_addr,&sin.sin_addr,hp->h_length); - return(inet_ntoa(sin.sin_addr)); -+ } -+ -+ char *getdsthost(fd, ptr) -+ int fd; -+ int *ptr; -+ { -+ struct sockaddr_in sin; -+ struct hostent *hp; -+ int sl=sizeof(struct sockaddr_in), err=0, local_h=0, i=0; -+ char buf[255], hostbuf[255]; -+ #ifdef __FreeBSD__ -+ struct sockaddr_in rsin; -+ struct natlookup natlookup; -+ #endif -+ -+ #ifdef linux -+ /* This should also work for UDP. Unfortunately, it doesn't. -+ Maybe when the Linux UDP proxy code gets a little cleaner. -+ */ -+ if(!(err=getsockname(0,&sin,&sl))) { -+ if(ptr) *ptr=ntohs(sin.sin_port); -+ sprintf(buf,"%s",inet_ntoa(sin.sin_addr)); -+ gethostname(hostbuf,254); -+ hp=gethostbyname(hostbuf); -+ while(hp->h_addr_list[i]) { -+ bzero(&sin,&sl); -+ memcpy(&sin.sin_addr,hp->h_addr_list[i++],sizeof(hp->h_addr_list[i++])); -+ if(!strcmp(buf,inet_ntoa(sin.sin_addr))) local_h++; -+ } -+ if(local_h) { /* syslog(LLEV,"DEBUG: hnam.c: non-transparent."); */ return(NULL); } -+ else { return(buf); } -+ } -+ #endif -+ -+ #ifdef __FreeBSD__ -+ /* The basis for this block of code is Darren Reed's -+ patches to the TIS ftwk's ftp-gw. -+ */ -+ bzero((char*)&sin,sizeof(sin)); -+ bzero((char*)&rsin,sizeof(rsin)); -+ if(getsockname(fd,(struct sockaddr*)&sin,&sl)<0) { -+ return NULL; -+ } -+ sl=sizeof(rsin); -+ if(getpeername(fd,(struct sockaddr*)&rsin,&sl)<0) { -+ return NULL; -+ } -+ natlookup.nl_inport=sin.sin_port; -+ natlookup.nl_outport=rsin.sin_port; -+ natlookup.nl_inip=sin.sin_addr; -+ natlookup.nl_outip=rsin.sin_addr; -+ if((natfd=open(IPL_NAT,O_RDONLY))<0) { -+ return(NULL); -+ } -+ if(ioctl(natfd,SIOCGNATL,&natlookup)==(-1)) { -+ return(NULL); -+ } -+ close(natfd); -+ if(ptr) *ptr=ntohs(natlookup.nl_realport); -+ sprintf(buf,"%s",inet_ntoa(natlookup.nl_realip)); -+ #endif -+ -+ /* No transparent proxy support */ -+ return(NULL); - } -Only in ./lib: hnam.c.orig -diff -c -r ./plug-gw/plug-gw.c ../../NEW/fwtk/plug-gw/plug-gw.c -*** ./plug-gw/plug-gw.c Thu Sep 5 15:36:33 1996 ---- ../../NEW/fwtk/plug-gw/plug-gw.c Wed Oct 9 02:46:48 1996 -*************** -*** 39,44 **** ---- 39,48 ---- - static char **validdests = (char **)0; - static Cfg *confp; - -+ int do_transparent=0; -+ -+ char *getdsthost(); -+ - main(ac,av) - int ac; - char *av[]; -*************** -*** 193,201 **** ---- 197,213 ---- - char *ptr; - int state = 0; - int ssl_plug = 0; -+ int pport=0; - - struct timeval timo; - -+ /* Transparent plug-gw is probably a bad idea, but hey .. */ -+ dhost=getdsthost(0,&pport); -+ if(dhost) { -+ do_transparent++; -+ portid=pport; -+ } -+ - if(c->flags & PERM_DENY) { - if (p == -1) - syslog(LLEV,"deny host=%s/%s port=any",rhost,raddr); -*************** -*** 215,221 **** - syslog(LLEV,"fwtkcfgerr: -plug-to takes an argument, line %d",c->ln); - exit (1); - } -! dhost = av[x]; - continue; - } - ---- 227,234 ---- - syslog(LLEV,"fwtkcfgerr: -plug-to takes an argument, line %d",c->ln); - exit (1); - } -! if(!dhost) dhost = av[x]; -! /* syslog(LLEV,"DEBUG: dhost now is [%s]",dhost); */ - continue; - } - -diff -c -r ./rlogin-gw/rlogin-gw.c ../../NEW/fwtk/rlogin-gw/rlogin-gw.c -*** ./rlogin-gw/rlogin-gw.c Fri Sep 6 12:56:33 1996 ---- ../../NEW/fwtk/rlogin-gw/rlogin-gw.c Wed Oct 9 02:49:04 1996 -*************** -*** 39,45 **** ---- 39,47 ---- - - - extern char *maphostname(); -+ char *getdsthost(); - -+ int do_transparent=0; - - static int cmd_quit(); - static int cmd_help(); -*************** -*** 120,125 **** ---- 122,130 ---- - static char *tokav[56]; - int tokac; - struct timeval timo; -+ /* foo */ -+ char *psychic; -+ /* foo */ - - #ifndef LOG_NDELAY - openlog("rlogin-gw",LOG_PID); -*************** -*** 185,191 **** - xforwarder = cf->argv[0]; - } - -! - - if((cf = cfg_get("directory",confp)) != (Cfg *)0) { - if(cf->argc != 1) { ---- 190,203 ---- - xforwarder = cf->argv[0]; - } - -! /* foo */ -! psychic=getdsthost(0,NULL); -! if(psychic) { -! do_transparent++; -! strncpy(dest,psychic,511); -! dest[511]='\0'; -! } -! /* foo */ - - if((cf = cfg_get("directory",confp)) != (Cfg *)0) { - if(cf->argc != 1) { -*************** -*** 260,269 **** - } - - /* if present a host name, chop and save username and hostname */ -! dest[0] = '\0'; - if((p = index(rusername,'@')) != (char *)0) { - char *namp; - - *p++ = '\0'; - if(*p == '\0') - p = "localhost"; ---- 272,282 ---- - } - - /* if present a host name, chop and save username and hostname */ -! /* dest[0] = '\0'; */ - if((p = index(rusername,'@')) != (char *)0) { - char *namp; - -+ dest[0] = '\0'; - *p++ = '\0'; - if(*p == '\0') - p = "localhost"; -*************** -*** 293,300 **** ---- 306,326 ---- - goto leave; - } - -+ /* syslog(LLEV,"DEBUG: Uh-oh, $dest = %s\n",dest); */ -+ - if(dest[0] != '\0') { - /* Setup connection directly to remote machine */ -+ if((cf = cfg_get("welcome-msg",confp)) != (Cfg *)0) { -+ if(cf->argc != 1) { -+ syslog(LLEV,"fwtkcfgerr: welcome-msg must have one parameter, line %d",cf->ln); -+ exit(1); -+ } -+ if(sayfile(0,cf->argv[0])) { -+ syslog(LLEV,"fwtksyserr: cannot display welcome %s: %m",cf->argv[0]); -+ exit(1); -+ } -+ } -+ /* Does this cmd_connect thing feel like a kludge or what? */ - sprintf(buf,"connect %.1000s",dest); - tokac = enargv(buf, tokav, 56, tokbuf, sizeof(tokbuf)); - if (cmd_connect(tokac, tokav, buf) != 2) -*************** -*** 526,539 **** - char ebuf[512]; - - syslog(LLEV,"permit host=%s/%s connect to %s",rhost,raddr,namp); - if(strlen(namp) > 20) - namp[20] = '\0'; - if(rusername[0] != '\0') - sprintf(ebuf,"Trying %s@%s...",rusername,namp); - else - sprintf(ebuf,"Trying %s...",namp); -! if(say(0,ebuf)) -! return(1); - } else - syslog(LLEV,"permit host=%s/%s connect to %s",rhost,raddr,av[1]); - if((serfd = conn_server(av[1],RLOGINPORT,1,buf)) < 0) { ---- 552,567 ---- - char ebuf[512]; - - syslog(LLEV,"permit host=%s/%s connect to %s",rhost,raddr,namp); -+ if(!do_transparent) { - if(strlen(namp) > 20) - namp[20] = '\0'; - if(rusername[0] != '\0') - sprintf(ebuf,"Trying %s@%s...",rusername,namp); - else - sprintf(ebuf,"Trying %s...",namp); -! if(say(0,ebuf)) -! return(1); -! } - } else - syslog(LLEV,"permit host=%s/%s connect to %s",rhost,raddr,av[1]); - if((serfd = conn_server(av[1],RLOGINPORT,1,buf)) < 0) { -diff -c -r ./tn-gw/tn-gw.c ../../NEW/fwtk/tn-gw/tn-gw.c -*** ./tn-gw/tn-gw.c Fri Sep 6 12:55:48 1996 ---- ../../NEW/fwtk/tn-gw/tn-gw.c Wed Oct 9 02:50:17 1996 -*************** -*** 87,92 **** ---- 87,94 ---- - static int cmd_xforward(); - static int cmd_timeout(); - -+ char *getdsthost(); -+ - static int tn3270 = 1; /* don't do tn3270 stuff */ - static int doX; - -*************** -*** 97,102 **** ---- 99,106 ---- - static int timeout = PROXY_TIMEOUT; - static char timed_out_msg[] = "\r\nConnection closed due to inactivity"; - -+ int do_transparent=0; -+ - typedef struct { - char *name; - char *hmsg; -*************** -*** 140,145 **** ---- 144,151 ---- - char tokbuf[BSIZ]; - char *tokav[56]; - int tokac; -+ int port; -+ char *psychic; - - #ifndef LOG_DAEMON - openlog("tn-gw",LOG_PID); -*************** -*** 308,313 **** ---- 314,346 ---- - } - } - -+ psychic=getdsthost(0,&port); -+ if(psychic) { -+ if((strlen(psychic) + 10) < 510) { -+ do_transparent++; -+ if(port) -+ sprintf(dest,"%s:%d",psychic,port); -+ else -+ sprintf(dest,"%s",psychic); -+ -+ -+ if(!welcomedone) -+ if((cf = cfg_get("welcome-msg",confp)) != (Cfg *)0) { -+ if(cf->argc != 1) { -+ syslog(LLEV,"fwtkcfgerr: welcome-msg must have one parameter, line %d",cf->ln); -+ exit(1); -+ } -+ if(sayfile(0,cf->argv[0])) { -+ syslog(LLEV,"fwtksyserr: cannot display welcome %s:%m",cf->argv[0]); -+ exit(1); -+ } -+ welcomedone = 1; -+ } -+ -+ -+ } -+ } -+ - while (argc > 1) { - argc--; - argv++; -*************** -*** 864,877 **** - } - } - -- - if((namp = maphostname(av[1])) != (char *)0) { - char ebuf[512]; - - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,namp); -! sprintf(ebuf,"Trying %s port %d...",namp,port); -! if(say(0,ebuf)) -! return(1); - } else - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,av[1]); - ---- 897,911 ---- - } - } - - if((namp = maphostname(av[1])) != (char *)0) { - char ebuf[512]; - - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,namp); -! if(!do_transparent) { -! sprintf(ebuf,"Trying %s port %d...",namp,port); -! if(say(0,ebuf)) -! return(1); -! } - } else - syslog(LLEV,"permit host=%s/%s destination=%s",rladdr,riaddr,av[1]); - -*************** -*** 903,910 **** - - syslog(LLEV,"connected host=%s/%s destination=%s",rladdr,riaddr,av[1]); - strncpy(dest,av[1], 511); -! sprintf(buf, "Connected to %s.", dest); -! say(0, buf); - return(2); - } - ---- 937,946 ---- - - syslog(LLEV,"connected host=%s/%s destination=%s",rladdr,riaddr,av[1]); - strncpy(dest,av[1], 511); -! if(!do_transparent) { -! sprintf(buf, "Connected to %s.", dest); -! say(0, buf); -! } - return(2); - } - - - diff --git a/contrib/ipfilter/FreeBSD-2.2/files.diffs b/contrib/ipfilter/FreeBSD-2.2/files.diffs deleted file mode 100644 index 2ada3fa..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/files.diffs +++ /dev/null @@ -1,24 +0,0 @@ -*** files.orig Tue Sep 9 16:58:40 1997 ---- files Sat Apr 4 10:52:58 1998 -*************** -*** 222,227 **** ---- 222,240 ---- - netinet/tcp_timer.c optional inet - netinet/tcp_usrreq.c optional inet - netinet/udp_usrreq.c optional inet -+ netinet/ip_fil.c optional ipfilter inet -+ netinet/fil.c optional ipfilter inet -+ netinet/ip_nat.c optional ipfilter inet -+ netinet/ip_frag.c optional ipfilter inet -+ netinet/ip_state.c optional ipfilter inet -+ netinet/ip_proxy.c optional ipfilter inet -+ netinet/mlf_ipl.c optional ipfilter inet -+ netinet/ip_auth.c optional ipfilter inet -+ netinet/ip_log.c optional ipfilter inet -+ netinet/ip_scan.c optional ipfilter inet -+ netinet/ip_sync.c optional ipfilter inet -+ netinet/ip_pool.c optional ipfilter_pool inet -+ netinet/ip_rules.c optional ipfilter_compiled ipfilter inet - netipx/ipx.c optional ipx - netipx/ipx_cksum.c optional ipx - netipx/ipx_input.c optional ipx diff --git a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs b/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs deleted file mode 100644 index 82599f1..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs +++ /dev/null @@ -1,24 +0,0 @@ -*** files.newconf.orig Sun Jun 25 02:17:29 1995 ---- files.newconf Sun Jun 25 02:19:10 1995 -*************** -*** 161,166 **** ---- 161,179 ---- - file netinet/ip_input.c inet - file netinet/ip_mroute.c inet - file netinet/ip_output.c inet -+ file netinet/ip_fil.c ipfilter -+ file netinet/fil.c ipfilter -+ file netinet/ip_nat.c ipfilter -+ file netinet/ip_frag.c ipfilter -+ file netinet/ip_state.c ipfilter -+ file netinet/ip_proxy.c ipfilter -+ file netinet/ip_auth.c ipfilter -+ file netinet/ip_log.c ipfilter -+ file netinet/mlf_ipl.c ipfilter -+ file netinet/ip_scan.c ipfilter -+ file netinet/ip_sync.c ipfilter -+ file netinet/ip_pool.c ipfilter_pool -+ file netinet/ip_rules.c ipfilter_compiled - file netinet/raw_ip.c inet - file netinet/tcp_debug.c inet - file netinet/tcp_input.c inet diff --git a/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs b/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs deleted file mode 100644 index c2822d3..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs +++ /dev/null @@ -1,16 +0,0 @@ -*** /sys/netinet/in_proto.c.orig Sat May 24 13:42:26 1997 ---- /sys/netinet/in_proto.c Sat May 24 13:42:36 1997 -*************** -*** 89,94 **** ---- 89,99 ---- - void eoninput(), eonctlinput(), eonprotoinit(); - #endif /* EON */ - -+ #if defined(IPFILTER) && !defined(IPFILTER_LKM) -+ void iplinit(); -+ #define ip_init iplinit -+ #endif -+ - extern struct domain inetdomain; - - struct protosw inetsw[] = { diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs b/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs deleted file mode 100644 index c2b2b15..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs +++ /dev/null @@ -1,32 +0,0 @@ -*** /sys/netinet/ip_input.c.orig Sat May 24 13:37:16 1997 ---- /sys/netinet/ip_input.c Sat May 24 13:38:58 1997 -*************** -*** 74,79 **** ---- 74,82 ---- - #ifdef IPFIREWALL - #include <netinet/ip_fw.h> - #endif -+ #if defined(IPFILTER_LKM) || defined(IPFILTER) -+ int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ #endif - - int rsvp_on = 0; - static int ip_rsvp_on; -*************** -*** 310,315 **** ---- 313,327 ---- - * - Wrap: fake packet's addr/port <unimpl.> - * - Encapsulate: put it in another IP and send out. <unimp.> - */ -+ #if defined(IPFILTER_LKM) || defined(IPFILTER) -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1) -+ return; -+ ip = mtod(m = m1, struct ip *); -+ } -+ #endif - - #ifdef COMPAT_IPFW - if (ip_fw_chk_ptr) { diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs b/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs deleted file mode 100644 index ff5ae0a..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs +++ /dev/null @@ -1,67 +0,0 @@ -*** /sys/netinet/ip_output.c.orig Sat May 24 14:07:24 1997 ---- /sys/netinet/ip_output.c Sat May 24 15:00:29 1997 -*************** -*** 67,72 **** ---- 67,76 ---- - #else - #undef COMPAT_IPFW - #endif -+ #if defined(IPFILTER_LKM) || defined(IPFILTER) -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ #endif -+ - - u_short ip_id; - -*************** -*** 75,81 **** - __P((struct ifnet *, struct mbuf *, struct sockaddr_in *)); - static int ip_getmoptions - __P((int, struct ip_moptions *, struct mbuf **)); -! static int ip_optcopy __P((struct ip *, struct ip *)); - static int ip_pcbopts __P((struct mbuf **, struct mbuf *)); - static int ip_setmoptions - __P((int, struct ip_moptions **, struct mbuf *)); ---- 79,85 ---- - __P((struct ifnet *, struct mbuf *, struct sockaddr_in *)); - static int ip_getmoptions - __P((int, struct ip_moptions *, struct mbuf **)); -! int ip_optcopy __P((struct ip *, struct ip *)); - static int ip_pcbopts __P((struct mbuf **, struct mbuf *)); - static int ip_setmoptions - __P((int, struct ip_moptions **, struct mbuf *)); -*************** -*** 338,343 **** ---- 342,356 ---- - * - Wrap: fake packet's addr/port <unimpl.> - * - Encapsulate: put it in another IP and send out. <unimp.> - */ -+ #if defined(IPFILTER_LKM) || defined(IPFILTER) -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((error = (*fr_checkp)(ip, hlen, ifp, 1, &m1)) || !m1) -+ goto done; -+ ip = mtod(m = m1, struct ip *); -+ } -+ #endif - - #ifdef COMPAT_IPFW - if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, ifp, IP_NAT_OUT)) { -*************** -*** 559,565 **** - * Copy options from ip to jp, - * omitting those not copied during fragmentation. - */ -! static int - ip_optcopy(ip, jp) - struct ip *ip, *jp; - { ---- 574,580 ---- - * Copy options from ip to jp, - * omitting those not copied during fragmentation. - */ -! int - ip_optcopy(ip, jp) - struct ip *ip, *jp; - { diff --git a/contrib/ipfilter/FreeBSD-2.2/kinstall b/contrib/ipfilter/FreeBSD-2.2/kinstall deleted file mode 100755 index 421681f..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/kinstall +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo -n "Installing " -foreach i (ip_{auth,fil,frag,nat,pool,proxy,scan,state,sync}.[ch] fil.c \ - ip_*_pxy.c mlf_ipl.c ipl.h ip_compat.h ip_log.c) - echo -n "$i "; - cp $i /sys/netinet - chmod 644 /sys/netinet/$i - switch ($i) - case *.h: - /bin/cp $i /usr/include/netinet/$i - chmod 644 /usr/include/netinet/$i - breaksw - endsw -end -echo "" -echo "Copying /usr/include/osreldate.h to /sys/sys" -cp /usr/include/osreldate.h /sys/sys -echo "Patching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs | \ -(cd /sys/netinet; patch) - -if ( -f /sys/conf/files.newconf ) then - echo "Patching /sys/conf/files.newconf" - cat FreeBSD-2.2/files.newconf.diffs | (cd /sys/conf; patch) - echo "Patching /sys/conf/files" - cat FreeBSD-2.2/files.diffs | (cd /sys/conf; patch) -endif -if ( -f /sys/conf/files.oldconf ) then - echo "Patching /sys/conf/files.oldconf" - cat FreeBSD-2.2/files.oldconf.diffs | (cd /sys/conf; patch) - echo "Patching /sys/conf/files" - cat FreeBSD-2.2/filez.diffs | (cd /sys/conf; patch) -endif - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -echo "Re-config'ing $newconfig..." -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -awk '{print $0;if($2=="INET"){print"options IPFILTER"}}' \ - $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD-2.2/minstall b/contrib/ipfilter/FreeBSD-2.2/minstall deleted file mode 100755 index 832b68e..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/minstall +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD-2.2 ) cd .. -echo "Patching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs | \ -(cd /sys/netinet; patch) - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -echo "Re-config'ing $newconfig..." -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}${bak} ) - set bak=".bak."$dot - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}$bak -endif -awk '{print $0;if($2=="INET"){print"options IPFILTER_LKM\noptions IPFILTER_LOG"}}' \ - $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD-2.2/unkinstall b/contrib/ipfilter/FreeBSD-2.2/unkinstall deleted file mode 100755 index 1955f5c..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/unkinstall +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo -n "Uninstalling " -foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_auth.[ch] ip_proxy.[ch] ip_ftp_pxy.c ip_compat.h ip_log.c \ - mlf_ipl.c ipl.h) - echo -n "$i "; - /bin/rm -f /sys/netinet/$i -end -echo "" -echo "Unpatching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs | \ -(cd /sys/netinet; patch -R) - -if ( -f /sys/conf/files.newconf ) then - echo "Unpatching /sys/conf/files.newconf" - cat FreeBSD-2.2/files.newconf.diffs | (cd /sys/conf; patch -R) - echo "Unpatching /sys/conf/files" - cat FreeBSD-2.2/files.diffs | (cd /sys/conf; patch -R) -endif -if ( -f /sys/conf/files.oldconf ) then - echo "Unpatching /sys/conf/files.oldconf" - cat FreeBSD-2.2/files.oldconf.diffs | (cd /sys/conf; patch -R) - echo "Unpatching /sys/conf/files" - cat FreeBSD-2.2/filez.diffs | (cd /sys/conf; patch -R) -endif - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -egrep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD-2.2/unminstall b/contrib/ipfilter/FreeBSD-2.2/unminstall deleted file mode 100755 index 07aaac0..0000000 --- a/contrib/ipfilter/FreeBSD-2.2/unminstall +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo "Unpatching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs | \ -(cd /sys/netinet; patch -R) - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.$bak -endif -grep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 b/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 deleted file mode 100644 index 5b9de7c..0000000 --- a/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 +++ /dev/null @@ -1,26 +0,0 @@ -To build a kernel with the IP filter, follow these seven steps: - - 1. do "make freebsd3" - - 2. do "make install-bsd" - (probably has to be done as root) - - 3. run "FreeBSD-3/kinstall" as root - - 4. build a new kernel - - 5. install the new kernel - - 6. If not using DEVFS, create devices for IP Filter as follows: - mknod /dev/ipl c 79 0 - mknod /dev/ipnat c 79 1 - mknod /dev/ipstate c 79 2 - mknod /dev/ipauth c 79 3 - mknod /dev/ipsync c 79 4 - mknod /dev/ipscan c 79 5 - - 7. reboot - - -Darren Reed -darrenr@pobox.com diff --git a/contrib/ipfilter/FreeBSD-3/kinstall b/contrib/ipfilter/FreeBSD-3/kinstall deleted file mode 100755 index 294e795..0000000 --- a/contrib/ipfilter/FreeBSD-3/kinstall +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo -n "Installing " -foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c mlf_ipl.c ipl.h \ - ip_compat.h ip_auth.[ch] ip_log.c) - echo -n "$i "; - cp $i /sys/netinet - chmod 644 /sys/netinet/$i - switch ($i) - case *.h: - /bin/cp $i /usr/include/netinet/$i - chmod 644 /usr/include/netinet/$i - breaksw - endsw -end -echo "" -echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" -ln -s /usr/include/osreldate.h /sys/sys/osreldate.h - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -echo "Rewriting $newconfig..." -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -awk '{print $0;if($2=="INET"){print"options IPFILTER\noptions IPFILTER_LOG"}}'\ - $confdir/$newconfig.bak > $confdir/$newconfig -echo "You will now need to run config on $newconfig and build a new kernel." -exit 0 diff --git a/contrib/ipfilter/FreeBSD-3/unkinstall b/contrib/ipfilter/FreeBSD-3/unkinstall deleted file mode 100755 index 687ebc6..0000000 --- a/contrib/ipfilter/FreeBSD-3/unkinstall +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/csh -f -# -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo -n "Uninstalling " -foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_auth.[ch] ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c ip_compat.h \ - ip_log.c mlf_ipl.c ipl.h) - echo -n "$i "; - /bin/rm -f /sys/netinet/$i -end -echo "" - -echo "Removing link from /usr/include/osreldate.h to /sys/sys/osreldate.h" -rm /sys/sys/osreldate.h - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -egrep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch deleted file mode 100644 index c232b2c..0000000 --- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch +++ /dev/null @@ -1,61 +0,0 @@ -*** ip6_input.c.orig Sun Feb 13 14:32:01 2000 ---- ip6_input.c Wed Apr 26 22:31:34 2000 -*************** -*** 121,126 **** ---- 121,127 ---- - - extern struct domain inet6domain; - extern struct ip6protosw inet6sw[]; -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); - - u_char ip6_protox[IPPROTO_MAX]; - static int ip6qmaxlen = IFQ_MAXLEN; -*************** -*** 302,307 **** ---- 303,317 ---- - ip6stat.ip6s_badvers++; - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); - goto bad; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((*fr_checkp)(ip6, sizeof(*ip6), m->m_pkthdr.rcvif, -+ 0, &m1) || !m1) -+ return; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - ip6stat.ip6s_nxthist[ip6->ip6_nxt]++; -*** ip6_output.c.orig Fri Mar 10 01:57:16 2000 ---- ip6_output.c Wed Apr 26 22:34:34 2000 -*************** -*** 108,113 **** ---- 108,115 ---- - #include <netinet6/ip6_fw.h> - #endif - -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ - static MALLOC_DEFINE(M_IPMOPTS, "ip6_moptions", "internet multicast options"); - - struct ip6_exthdrs { -*************** -*** 754,759 **** ---- 756,770 ---- - ip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] = 0; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((error = (*fr_checkp)(ip6, sizeof(*ip6), ifp, 1, &m1)) || -+ !m1) -+ goto done; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - #ifdef IPV6FIREWALL diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 deleted file mode 100644 index 1495801..0000000 --- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 +++ /dev/null @@ -1,63 +0,0 @@ -.\" $FreeBSD$ -.\" -*** ip6_input.c.orig Sun Feb 13 14:32:01 2000 ---- ip6_input.c Wed Apr 26 22:31:34 2000 -*************** -*** 121,126 **** ---- 121,127 ---- - - extern struct domain inet6domain; - extern struct ip6protosw inet6sw[]; -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); - - u_char ip6_protox[IPPROTO_MAX]; - static int ip6qmaxlen = IFQ_MAXLEN; -*************** -*** 302,307 **** ---- 303,317 ---- - ip6stat.ip6s_badvers++; - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); - goto bad; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((*fr_checkp)(ip6, sizeof(*ip6), m->m_pkthdr.rcvif, -+ 0, &m1) || !m1) -+ return; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - ip6stat.ip6s_nxthist[ip6->ip6_nxt]++; -*** ip6_output.c.orig Fri Mar 10 01:57:16 2000 ---- ip6_output.c Wed Apr 26 22:34:34 2000 -*************** -*** 108,113 **** ---- 108,115 ---- - #include <netinet6/ip6_fw.h> - #endif - -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ - static MALLOC_DEFINE(M_IPMOPTS, "ip6_moptions", "internet multicast options"); - - struct ip6_exthdrs { -*************** -*** 754,759 **** ---- 756,770 ---- - ip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] = 0; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((error = (*fr_checkp)(ip6, sizeof(*ip6), ifp, 1, &m1)) || -+ !m1) -+ goto done; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - #ifdef IPV6FIREWALL diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 deleted file mode 100644 index 2e1d7e8..0000000 --- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 +++ /dev/null @@ -1,65 +0,0 @@ -.\" $FreeBSD$ -.\" -*** ip6_input.c.orig Sat Jul 15 07:14:34 2000 ---- ip6_input.c Thu Oct 19 17:14:37 2000 -*************** -*** 120,125 **** ---- 120,127 ---- - - extern struct domain inet6domain; - extern struct ip6protosw inet6sw[]; -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, -+ struct mbuf **)); - - u_char ip6_protox[IPPROTO_MAX]; - static int ip6qmaxlen = IFQ_MAXLEN; -*************** -*** 289,294 **** ---- 291,305 ---- - ip6stat.ip6s_badvers++; - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); - goto bad; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((*fr_checkp)(ip6, sizeof(*ip6), m->m_pkthdr.rcvif, -+ 0, &m1) || !m1) -+ return; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - ip6stat.ip6s_nxthist[ip6->ip6_nxt]++; - -*** ip6_output.c.orig Sat Jul 15 07:14:35 2000 ---- ip6_output.c Thu Oct 19 17:13:53 2000 -*************** -*** 106,111 **** ---- 106,113 ---- - #include <netinet6/ip6_fw.h> - #endif - -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ - static MALLOC_DEFINE(M_IPMOPTS, "ip6_moptions", "internet multicast options"); - - struct ip6_exthdrs { -*************** -*** 787,792 **** ---- 789,803 ---- - ip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] = 0; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((error = (*fr_checkp)(ip6, sizeof(*ip6), ifp, 1, &m1)) || -+ !m1) -+ goto done; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - #ifdef IPV6FIREWALL diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 b/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 deleted file mode 100644 index 2e1d7e8..0000000 --- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 +++ /dev/null @@ -1,65 +0,0 @@ -.\" $FreeBSD$ -.\" -*** ip6_input.c.orig Sat Jul 15 07:14:34 2000 ---- ip6_input.c Thu Oct 19 17:14:37 2000 -*************** -*** 120,125 **** ---- 120,127 ---- - - extern struct domain inet6domain; - extern struct ip6protosw inet6sw[]; -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, -+ struct mbuf **)); - - u_char ip6_protox[IPPROTO_MAX]; - static int ip6qmaxlen = IFQ_MAXLEN; -*************** -*** 289,294 **** ---- 291,305 ---- - ip6stat.ip6s_badvers++; - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); - goto bad; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((*fr_checkp)(ip6, sizeof(*ip6), m->m_pkthdr.rcvif, -+ 0, &m1) || !m1) -+ return; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - ip6stat.ip6s_nxthist[ip6->ip6_nxt]++; - -*** ip6_output.c.orig Sat Jul 15 07:14:35 2000 ---- ip6_output.c Thu Oct 19 17:13:53 2000 -*************** -*** 106,111 **** ---- 106,113 ---- - #include <netinet6/ip6_fw.h> - #endif - -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ - static MALLOC_DEFINE(M_IPMOPTS, "ip6_moptions", "internet multicast options"); - - struct ip6_exthdrs { -*************** -*** 787,792 **** ---- 789,803 ---- - ip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] = 0; -+ } -+ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((error = (*fr_checkp)(ip6, sizeof(*ip6), ifp, 1, &m1)) || -+ !m1) -+ goto done; -+ ip6 = mtod(m = m1, struct ip6_hdr *); - } - - #ifdef IPV6FIREWALL diff --git a/contrib/ipfilter/FreeBSD-4.0/kinstall b/contrib/ipfilter/FreeBSD-4.0/kinstall deleted file mode 100755 index 9233199..0000000 --- a/contrib/ipfilter/FreeBSD-4.0/kinstall +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -set ipfdir=/sys/netinet -set krev=`uname -r|sed -e 's/\([0-9\.]*\)-.*/\1/'` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -if ( -d /sys/contrib/ipfilter ) set ipfdir=/sys/contrib/ipfilter/netinet -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo -n "Installing " -foreach i (ip_{auth,fil,nat,pool,proxy,scan,state,sync}.[ch] fil.c \ - ip_*_pxy.c mlfk_ipl.c ipl.h ip_compat.h ip_log.c ) - echo -n "$i "; - cp $i /sys/netinet - chmod 644 /sys/netinet/$i - switch ($i) - case *.h: - /bin/cp $i /usr/include/netinet/$i - chmod 644 /usr/include/netinet/$i - breaksw - endsw -end -echo "" -echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" -ln -s /usr/include/osreldate.h /sys/sys/osreldate.h - -echo "" -echo "Patching ip6_input.c and ip6_output.c" -cat FreeBSD-4.0/ipv6-patch-$krev | (cd /sys/netinet6; patch -N) - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -grep -q IPFILTER $confdir/$newconfig -if ($status == 0) then - echo "IPFilter already configured in kernel config file" - exit 0 -endif -echo "Rewriting $newconfig..." -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -awk '{print $0;if($2=="INET"){print"options IPFILTER\noptions IPFILTER_LOG"}}'\ - $confdir/$newconfig.bak > $confdir/$newconfig -echo "You will now need to run config on $newconfig and build a new kernel." -exit 0 diff --git a/contrib/ipfilter/FreeBSD-4.0/unkinstall b/contrib/ipfilter/FreeBSD-4.0/unkinstall deleted file mode 100755 index 4e9caaa..0000000 --- a/contrib/ipfilter/FreeBSD-4.0/unkinstall +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/csh -f -# -# -set dir=`pwd` -set karch=`uname -m` -set krev=`uname -r|sed -e 's/\([0-9\.]*\)-.*/\1/'` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD* ) cd .. -echo -n "Uninstalling " -foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_auth.[ch] ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c ip_compat.h \ - ip_log.c mlf_ipl.c ipl.h) - echo -n "$i "; - /bin/rm -f /sys/netinet/$i -end -echo "" - -echo "Removing link from /usr/include/osreldate.h to /sys/sys/osreldate.h" -rm /sys/sys/osreldate.h - -echo "Removing patch to ip6_input.c and ip6_output.c" -cat FreeBSD-4.0/ipv6-patch-$krev | (cd /sys/netinet6; patch -R) - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -egrep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD/conf.c.diffs b/contrib/ipfilter/FreeBSD/conf.c.diffs deleted file mode 100644 index afd2880..0000000 --- a/contrib/ipfilter/FreeBSD/conf.c.diffs +++ /dev/null @@ -1,46 +0,0 @@ -*** conf.c.orig Sun Jan 14 15:39:32 1996 ---- conf.c Sun Jan 14 15:48:21 1996 -*************** -*** 1128,1133 **** ---- 1128,1149 ---- - #define labpcioctl nxioctl - #endif - -+ #ifdef IPFILTER -+ d_open_t iplopen; -+ d_close_t iplclose; -+ d_ioctl_t iplioctl; -+ # ifdef IPFILTER_LOG -+ d_read_t iplread; -+ # else -+ #define iplread nxread -+ # endif -+ #else -+ #define iplopen nxopen -+ #define iplclose nxclose -+ #define iplioctl nxioctl -+ #define iplread nxread -+ #endif -+ - /* open, close, read, write, ioctl, stop, reset, ttys, select, mmap, strat */ - struct cdevsw cdevsw[] = - { -*************** -*** 1199,1206 **** - * Otherwise, simply use the one reserved for local use. - */ - /* character device 20 is reserved for local use */ -! { nxopen, nxclose, nxread, nxwrite, /*20*/ -! nxioctl, nxstop, nxreset, nxdevtotty,/* reserved */ - nxselect, nxmmap, NULL }, - { psmopen, psmclose, psmread, nowrite, /*21*/ - psmioctl, nostop, nullreset, nodevtotty,/* psm mice */ ---- 1215,1222 ---- - * Otherwise, simply use the one reserved for local use. - */ - /* character device 20 is reserved for local use */ -! { iplopen, iplclose, iplread, nxwrite, /*20*/ -! iplioctl, nxstop, nxreset, nxdevtotty,/* reserved */ - nxselect, nxmmap, NULL }, - { psmopen, psmclose, psmread, nowrite, /*21*/ - psmioctl, nostop, nullreset, nodevtotty,/* psm mice */ diff --git a/contrib/ipfilter/FreeBSD/files.diffs b/contrib/ipfilter/FreeBSD/files.diffs deleted file mode 100644 index 2f028e3..0000000 --- a/contrib/ipfilter/FreeBSD/files.diffs +++ /dev/null @@ -1,23 +0,0 @@ -*** files.orig Sat Sep 30 18:01:55 1995 ---- files Sun Jan 14 14:32:25 1996 -*************** -*** 208,213 **** ---- 208,225 ---- - netinet/tcp_timer.c optional inet - netinet/tcp_usrreq.c optional inet - netinet/udp_usrreq.c optional inet -+ netinet/ip_fil.c optional ipfilter inet -+ netinet/fil.c optional ipfilter inet -+ netinet/ip_nat.c optional ipfilter inet -+ netinet/ip_frag.c optional ipfilter inet -+ netinet/ip_state.c optional ipfilter inet -+ netinet/ip_auth.c optional ipfilter inet -+ netinet/ip_proxy.c optional ipfilter inet -+ netinet/ip_log.c optional ipfilter inet -+ netinet/ip_scan.c optional ipfilter inet -+ netinet/ip_sync.c optional ipfilter inet -+ netinet/ip_pool.c optional ipfilter_pool ipfilter inet -+ netinet/ip_rules.c optional ipfilter_compiled ipfilter inet - netiso/clnp_debug.c optional iso - netiso/clnp_er.c optional iso - netiso/clnp_frag.c optional iso diff --git a/contrib/ipfilter/FreeBSD/files.newconf.diffs b/contrib/ipfilter/FreeBSD/files.newconf.diffs deleted file mode 100644 index 29aea54..0000000 --- a/contrib/ipfilter/FreeBSD/files.newconf.diffs +++ /dev/null @@ -1,23 +0,0 @@ -*** files.newconf.orig Sun Jun 25 02:17:29 1995 ---- files.newconf Sun Jun 25 02:19:10 1995 -*************** -*** 161,166 **** ---- 161,178 ---- - file netinet/ip_input.c inet - file netinet/ip_mroute.c inet - file netinet/ip_output.c inet -+ file netinet/ip_fil.c ipfilter -+ file netinet/fil.c ipfilter -+ file netinet/ip_nat.c ipfilter -+ file netinet/ip_frag.c ipfilter -+ file netinet/ip_state.c ipfilter -+ file netinet/ip_proxy.c ipfilter -+ file netinet/ip_auth.c ipfilter -+ file netinet/ip_log.c ipfilter -+ file netinet/ip_scan.c ipfilter -+ file netinet/ip_sync.c ipfilter -+ file netinet/ip_pool.c ipfilter_pool -+ file netinet/ip_rules.c ipfilter_compiled - file netinet/raw_ip.c inet - file netinet/tcp_debug.c inet - file netinet/tcp_input.c inet diff --git a/contrib/ipfilter/FreeBSD/files.oldconf.diffs b/contrib/ipfilter/FreeBSD/files.oldconf.diffs deleted file mode 100644 index ed8aff9..0000000 --- a/contrib/ipfilter/FreeBSD/files.oldconf.diffs +++ /dev/null @@ -1,23 +0,0 @@ -*** files.oldconf.orig Sat Apr 29 19:59:31 1995 ---- files.oldconf Sun Apr 23 17:54:18 1995 -*************** -*** 180,185 **** ---- 180,197 ---- - netinet/tcp_timer.c optional inet - netinet/tcp_usrreq.c optional inet - netinet/udp_usrreq.c optional inet -+ netinet/ip_fil.c optional ipfilter requires inet -+ netinet/fil.c optional ipfilter requires inet -+ netinet/ip_nat.c optional ipfilter requires inet -+ netinet/ip_frag.c optional ipfilter requires inet -+ netinet/ip_state.c optional ipfilter requires inet -+ netinet/ip_proxy.c optional ipfilter requires inet -+ netinet/ip_auth.c optional ipfilter requires inet -+ netinet/ip_log.c optional ipfilter requires inet -+ netinet/ip_scan.c optional ipfilter requires inet -+ netinet/ip_sync.c optional ipfilter requires inet -+ netinet/ip_pool.c optional ipfilter_pool requires ipfilter -+ netinet/ip_rules.c optional ipfilter_compiled requires ipfilter - netiso/clnp_debug.c optional iso - netiso/clnp_er.c optional iso - netiso/clnp_frag.c optional iso diff --git a/contrib/ipfilter/FreeBSD/filez.diffs b/contrib/ipfilter/FreeBSD/filez.diffs deleted file mode 100644 index 9656006..0000000 --- a/contrib/ipfilter/FreeBSD/filez.diffs +++ /dev/null @@ -1,23 +0,0 @@ -*** files.orig Sat Apr 29 20:00:02 1995 ---- files Sun Apr 23 17:53:58 1995 -*************** -*** 222,227 **** ---- 222,235 ---- - file netinet/tcp_timer.c inet - file netinet/tcp_usrreq.c inet - file netinet/udp_usrreq.c inet -+ file netinet/ip_fil.c ipfilter -+ file netinet/fil.c ipfilter -+ file netinet/ip_nat.c ipfilter -+ file netinet/ip_frag.c ipfilter -+ file netinet/ip_state.c ipfilter -+ file netinet/ip_proxy.c ipfilter -+ file netinet/ip_auth.c ipfilter -+ file netinet/ip_log.c ipfilter -+ file netinet/ip_scan.c ipfilter -+ file netinet/ip_sync.c ipfilter -+ file netinet/ip_pool.c ipfilter_pool -+ file netinet/ip_rules.c ipfilter_compiled - file netiso/clnp_debug.c iso - file netiso/clnp_er.c iso - file netiso/clnp_frag.c iso diff --git a/contrib/ipfilter/FreeBSD/in_proto.c.diffs b/contrib/ipfilter/FreeBSD/in_proto.c.diffs deleted file mode 100644 index 052dd51..0000000 --- a/contrib/ipfilter/FreeBSD/in_proto.c.diffs +++ /dev/null @@ -1,16 +0,0 @@ -*** in_proto.c.orig Wed Sep 6 20:31:34 1995 ---- in_proto.c Mon Mar 11 22:40:03 1996 -*************** -*** 81,86 **** ---- 81,91 ---- - void eoninput(), eonctlinput(), eonprotoinit(); - #endif /* EON */ - -+ #ifdef IPFILTER -+ void iplinit(); -+ #define ip_init iplinit -+ #endif -+ - void rsvp_input(struct mbuf *, int); - void ipip_input(struct mbuf *, int); - diff --git a/contrib/ipfilter/FreeBSD/ip_input.c.diffs b/contrib/ipfilter/FreeBSD/ip_input.c.diffs deleted file mode 100644 index a70be89..0000000 --- a/contrib/ipfilter/FreeBSD/ip_input.c.diffs +++ /dev/null @@ -1,88 +0,0 @@ -*** /sys/netinet/ip_input.c.orig Thu Oct 24 22:27:27 1996 ---- /sys/netinet/ip_input.c Tue Feb 18 21:18:19 1997 -*************** -*** 93,98 **** ---- 93,102 ---- - int ipqmaxlen = IFQ_MAXLEN; - struct in_ifaddr *in_ifaddr; /* first inet address */ - struct ifqueue ipintrq; -+ #if defined(IPFILTER_LKM) || defined(IPFILTER) -+ int fr_check __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ #endif - - struct ipstat ipstat; - struct ipq ipq; -*************** -*** 219,226 **** - } - ip = mtod(m, struct ip *); - } -! ip->ip_sum = in_cksum(m, hlen); -! if (ip->ip_sum) { - ipstat.ips_badsum++; - goto bad; - } ---- 223,229 ---- - } - ip = mtod(m, struct ip *); - } -! if (in_cksum(m, hlen)) { - ipstat.ips_badsum++; - goto bad; - } -*************** -*** 267,272 **** ---- 270,288 ---- - goto next; - } - -+ #if defined(IPFILTER) || defined(IPFILTER_LKM) -+ /* -+ * Check if we want to allow this packet to be processed. -+ * Consider it to be bad if not. -+ */ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1) -+ goto next; -+ ip = mtod(m = m1, struct ip *); -+ } -+ #endif - /* - * Process options and, if not destined for us, - * ship it on. ip_dooptions returns 1 when an -*************** -*** 527,532 **** ---- 533,540 ---- - * if they are completely covered, dequeue them. - */ - while (q != (struct ipasfrag *)fp && ip->ip_off + ip->ip_len > q->ip_off) { -+ struct mbuf *m0; -+ - i = (ip->ip_off + ip->ip_len) - q->ip_off; - if (i < q->ip_len) { - q->ip_len -= i; -*************** -*** 526,534 **** - m_adj(dtom(q), i); - break; - } - q = q->ipf_next; -- m_freem(dtom(q->ipf_prev)); - ip_deq(q->ipf_prev); - } - - insert: ---- 542,551 ---- - m_adj(dtom(q), i); - break; - } -+ m0 = dtom(q); - q = q->ipf_next; - ip_deq(q->ipf_prev); -+ m_freem(m0); - } - - insert: diff --git a/contrib/ipfilter/FreeBSD/ip_output.c.diffs b/contrib/ipfilter/FreeBSD/ip_output.c.diffs deleted file mode 100644 index f1fe9ac..0000000 --- a/contrib/ipfilter/FreeBSD/ip_output.c.diffs +++ /dev/null @@ -1,36 +0,0 @@ -*** /sys/netinet/ip_output.c.orig Thu Oct 24 22:27:28 1996 ---- /sys/netinet/ip_output.c Tue Feb 18 21:38:23 1997 -*************** -*** 65,70 **** ---- 65,74 ---- - static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *)); - static void ip_mloopback - __P((struct ifnet *, struct mbuf *, struct sockaddr_in *)); -+ #if defined(IPFILTER_LKM) || defined(IPFILTER) -+ extern int fr_check __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -+ #endif - - /* - * IP output. The packet in mbuf chain m contains a skeletal IP -*************** -*** 330,335 **** ---- 334,351 ---- - m->m_flags &= ~M_BCAST; - - sendit: -+ #if defined(IPFILTER) || defined(IPFILTER_LKM) -+ /* -+ * looks like most checking has been done now...do a filter check -+ */ -+ if (fr_checkp) { -+ struct mbuf *m1 = m; -+ -+ if ((error = (*fr_checkp)(ip, hlen, ifp, 1, &m1)) || !m1) -+ goto done; -+ ip = mtod(m = m1, struct ip *); -+ } -+ #endif - /* - * Check with the firewall... - */ diff --git a/contrib/ipfilter/FreeBSD/kinstall b/contrib/ipfilter/FreeBSD/kinstall deleted file mode 100755 index 7d08503..0000000 --- a/contrib/ipfilter/FreeBSD/kinstall +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD ) cd .. -echo -n "Installing " -foreach i (ip_{auth,fil,frag,nat,pool,proxy,scan,state,sync}.[ch] fil.c \ - ip_*_pxy.c ip_compat.h ip_log.c ) - echo -n "$i "; - cp $i /sys/netinet - chmod 644 /sys/netinet/$i - switch ($i) - case *.h: - /bin/cp $i /usr/include/netinet/$i - chmod 644 /usr/include/netinet/$i - breaksw - endsw -end -echo "" -grep iplopen $archdir/$karch/conf.c >& /dev/null -if ( $status != 0 ) then - echo "Patching $archdir/$karch/conf.c" - cat FreeBSD/conf.c.diffs | (cd $archdir/$karch; patch) -endif -grep fr_checkp /sys/netinet/ip_input.c >& /dev/null -if ( $status != 0 ) then - echo "Patching ip_input.c, ip_output.c and in_proto.c" - cat FreeBSD/ip_{in,out}put.c.diffs FreeBSD/in_proto.c.diffs | \ - (cd /sys/netinet; patch) -endif -if ( -f /sys/conf/files.newconf ) then - echo "Patching /sys/conf/files.newconf" - cat FreeBSD/files.newconf.diffs | (cd /sys/conf; patch) - echo "Patching /sys/conf/files" - cat FreeBSD/files.diffs | (cd /sys/conf; patch) -endif -if ( -f /sys/conf/files.oldconf ) then - echo "Patching /sys/conf/files.oldconf" - cat FreeBSD/files.oldconf.diffs | (cd /sys/conf; patch) - echo "Patching /sys/conf/files" - cat FreeBSD/filez.diffs | (cd /sys/conf; patch) -endif - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -echo "Re-config'ing $newconfig..." -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -awk '{print $0;if($2=="INET"){print"options IPFILTER"}}' \ - $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD/minstall b/contrib/ipfilter/FreeBSD/minstall deleted file mode 100755 index 0cfe7c3..0000000 --- a/contrib/ipfilter/FreeBSD/minstall +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD ) cd .. -echo "Patching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD/ip_{in,out}put.c.diffs FreeBSD/in_proto.c.diffs | \ -(cd /sys/netinet; patch) - -if ( -f /sys/conf/files.newconf ) then - echo "Patching /sys/conf/files.newconf" - cat FreeBSD/files.newconf.diffs | (cd /sys/conf; patch) - echo "Patching /sys/conf/files" - cat FreeBSD/files.diffs | (cd /sys/conf; patch) -endif -if ( -f /sys/conf/files.oldconf ) then - echo "Patching /sys/conf/files.oldconf" - cat FreeBSD/files.oldconf.diffs | (cd /sys/conf; patch) - echo "Patching /sys/conf/files" - cat FreeBSD/filez.diffs | (cd /sys/conf; patch) -endif - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -echo "Re-config'ing $newconfig..." -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.$bak -endif -awk '{print $0;if($2=="INET"){print"options IPFILTER_LKM"}}' \ - $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD/unkinstall b/contrib/ipfilter/FreeBSD/unkinstall deleted file mode 100755 index 8547fcd..0000000 --- a/contrib/ipfilter/FreeBSD/unkinstall +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD ) cd .. -echo -n "Uninstalling " -foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_compat.h ip_auth.[ch] ip_proxy.[ch] ip_ftp_pxy.c ip_log.c) - echo -n "$i "; - /bin/rm -f /sys/netinet/$i -end -echo "" -echo "Unpatching $archdir/$karch/conf.c" -cat FreeBSD/conf.c.diffs | (cd $archdir/$karch; patch -R) -echo "Unpatching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD/ip_{in,out}put.c.diffs FreeBSD/in_proto.c.diffs | \ -(cd /sys/netinet; patch -R) - -if ( -f /sys/conf/files.newconf ) then - echo "Unpatching /sys/conf/files.newconf" - cat FreeBSD/files.newconf.diffs | (cd /sys/conf; patch -R) - echo "Unpatching /sys/conf/files" - cat FreeBSD/files.diffs | (cd /sys/conf; patch -R) -endif -if ( -f /sys/conf/files.oldconf ) then - echo "Unpatching /sys/conf/files.oldconf" - cat FreeBSD/files.oldconf.diffs | (cd /sys/conf; patch -R) - echo "Unpatching /sys/conf/files" - cat FreeBSD/filez.diffs | (cd /sys/conf; patch -R) -endif - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak} -endif -egrep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/FreeBSD/unminstall b/contrib/ipfilter/FreeBSD/unminstall deleted file mode 100755 index a25746c..0000000 --- a/contrib/ipfilter/FreeBSD/unminstall +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/csh -f -# -set dir=`pwd` -set karch=`uname -m` -if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" -if ( -d /sys/$karch ) set archdir="/sys/$karch" -set confdir="$archdir/conf" - -if ( $dir =~ */FreeBSD ) cd .. -echo "Unpatching ip_input.c, ip_output.c and in_proto.c" -cat FreeBSD/ip_{in,out}put.c.diffs FreeBSD/in_proto.c.diffs | \ -(cd /sys/netinet; patch -R) - -if ( -f /sys/conf/files.newconf ) then - echo "Unpatching /sys/conf/files.newconf" - cat FreeBSD/files.newconf.diffs | (cd /sys/conf; patch -R) - echo "Unpatching /sys/conf/files" - cat FreeBSD/files.diffs | (cd /sys/conf; patch -R) -endif -if ( -f /sys/conf/files.oldconf ) then - echo "Unpatching /sys/conf/files.oldconf" - cat FreeBSD/files.oldconf.diffs | (cd /sys/conf; patch -R) - echo "Unpatching /sys/conf/files" - cat FreeBSD/filez.diffs | (cd /sys/conf; patch -R) -endif - -set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` -echo -n "Kernel configuration to update [$config] " -set newconfig=$< -if ( "$newconfig" != "" ) then - set config="$confdir/$newconfig" -else - set newconfig=$config -endif -if ( -f $confdir/$newconfig ) then - mv $confdir/$newconfig $confdir/$newconfig.bak -endif -if ( -d $archdir/../compile/$newconfig ) then - set bak=".bak" - set dot=0 - while ( -d $archdir/../compile/${newconfig}.${bak} ) - set bak=".bak.$dot" - set dot=`expr 1 + $dot` - end - mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.$bak -endif -grep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig -echo 'You will now need to run "config" and build a new kernel.' -exit 0 diff --git a/contrib/ipfilter/IMPORTANT b/contrib/ipfilter/IMPORTANT deleted file mode 100644 index 0ef7a3d..0000000 --- a/contrib/ipfilter/IMPORTANT +++ /dev/null @@ -1,11 +0,0 @@ - **************************************** - IMPORTANT NOTICE - **************************************** -1) - -If you have BOTH GNU make and the normal make shipped with your system, -DO NOT use the GNU make to build this package. - -Darren -darrenr@pobox.com - **************************************** diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/contrib/ipfilter/INST.FreeBSD-2.2 deleted file mode 100644 index d668c39..0000000 --- a/contrib/ipfilter/INST.FreeBSD-2.2 +++ /dev/null @@ -1,62 +0,0 @@ -.\" $FreeBSD$ -.\" - -To build a kernel for use with the loadable kernel module, follow these -steps: - 1. In /sys/i386/conf, create a new kernel config file (to be used - with IPFILTER), i.e. FIREWALL and run config, i.e. "config FIREWALL" - - 2. build the object files, telling it the name of the kernel to be - used. "freebsd22" MUST be the target, so the command would be - something like this: "make freebsd22 IPFILKERN=FIREWALL" - - 3. do "make install-bsd" - (probably has to be done as root) - - 4. run "FreeBSD-2.2/minstall" as root - - 5. build a new kernel - - 6. install and reboot with the new kernel - - 7. use modload(8) to load the packet filter with: - modload if_ipl.o - - 8. do "modstat" to confirm that it has been loaded successfully. - -There is no need to use mknod to create the device in /dev; -- upon loading the module, it will create itself with the correct values, - under the name (IPL_NAME) from the Makefile. It will also remove itself - from /dev when it is modunload'd. - -To build a kernel with the IP filter, follow these steps: - -*** KERNEL INSTALL CURRENTLY UNSUPPORTED *** - 1. do "make freebsd22" - - 2. do "make install-bsd" - (probably has to be done as root) - - 3. run "FreeBSD-2.2/kinstall" as root - - 4. build a new kernel - - 5a) For FreeBSD 2.2 (or later) - create devices for IP Filter as follows: - mknod /dev/ipl c 79 0 - mknod /dev/ipnat c 79 1 - mknod /dev/ipstate c 79 2 - mknod /dev/ipauth c 79 3 - - 5b) For versions prior to FreeBSD 2.2: - create devices for IP Filter as follows (assuming it was - installed into the device table as char dev 20): - mknod /dev/ipl c 20 0 - mknod /dev/ipnat c 20 1 - mknod /dev/ipstate c 20 2 - mknod /dev/ipauth c 20 3 - - 6. install and reboot with the new kernel - -Darren Reed -darrenr@pobox.com diff --git a/contrib/ipfilter/INSTALL.FreeBSD b/contrib/ipfilter/INSTALL.FreeBSD deleted file mode 100644 index 2a16942..0000000 --- a/contrib/ipfilter/INSTALL.FreeBSD +++ /dev/null @@ -1,61 +0,0 @@ - -Thi file is for use with FreeBSD 4.x and 5.x only. - -To build a kernel for use with the loadable kernel module, follow these -steps: - 0. Run "config GENERIC" or similar in /sys/i386/conf or the - appropriate directory for your kernel. - - 1. For FreeBSD version: - 4.* do make freebsd4 - 5.* do make freebsd5 - - 2. do "make install-bsd" - (probably has to be done as root) - - 3. Run "BSD/kupgrade" - - 4. build a new kernel - - 5. install and reboot with the new kernel - - 6. use modload(8)/kldload(8) to load the packet filter with: - modload if_ipl.o - kldload ipf.ko - - 7. do "modstat" or "kldstat" to confirm that it has been loaded - successfully. - -There is no need to use mknod to create the device in /dev; -- upon loading the module, it will create itself with the correct values, - under the name (IPL_NAME) from the Makefile. It will also remove itself - from /dev when it is modunload'd. - -To build a kernel with the IP filter, follow these steps: - - 1. For FreeBSD version: - 4.* do make freebsd4 - 5.* do make freebsd5 - - 2. do "make install-bsd" - (probably has to be done as root) - - 3. run "FreeBSD/kinstall" as root - - 4. build a new kernel - - 5. - b) If you are using FreeBSD-3 or later: - create devices for IP Filter as follows (assuming it was - installed into the device table as char dev 20): - mknod /dev/ipl c 79 0 - mknod /dev/ipnat c 79 1 - mknod /dev/ipstate c 79 2 - mknod /dev/ipauth c 79 3 - mknod /dev/ipsync c 79 4 - mknod /dev/ipscan c 79 5 - - 6. install and reboot with the new kernel - -Darren Reed -darrenr@pobox.com diff --git a/contrib/ipfilter/INSTALL.xBSD b/contrib/ipfilter/INSTALL.xBSD deleted file mode 100644 index 2f933ff..0000000 --- a/contrib/ipfilter/INSTALL.xBSD +++ /dev/null @@ -1,45 +0,0 @@ -# $FreeBSD$ - -To build a kernel for use with the loadable kernel module, follow these -steps: - 1. do "make bsd" - - 2. cd to the "BSD" directory and type "make install" - - 3. run "4bsd/minstall" as root - - 4. build a new kernel - - 5. install and reboot with the new kernel - - 6. use modload(8) to load the packet filter with: - modload if_ipl.o - - 7. do "modstat" to confirm that it has been loaded successfully. - -There is no need to use mknod to create the device in /dev; -- upon loading the module, it will create itself with the correct values, - under the name (IPL_NAME) from the Makefile. It will also remove itself - from /dev when it is modunload'd. - -To build a kernel with the IP filter, follow these steps: - - 1. do "make bsd" - - 2. cd to the "BSD" directory and type "make install" - - 3. run "4bsd/kinstall" as root - - 4. build a new kernel - - 5. create devices for IP Filter as follows (assuming it was - installed into the device table as char dev 20): - mknod /dev/ipl c 20 0 - mknod /dev/ipnat c 20 1 - mknod /dev/ipstate c 20 2 - mknod /dev/ipauth c 20 3 - - 6. install and reboot with the new kernel - -Darren -darrenr@pobox.com diff --git a/contrib/ipfilter/IPF.KANJI b/contrib/ipfilter/IPF.KANJI deleted file mode 100644 index 85af5ce..0000000 --- a/contrib/ipfilter/IPF.KANJI +++ /dev/null @@ -1,465 +0,0 @@ -IP filter $B%7%g!<%H%,%$%I(B Dec, 1999 - -$B%[!<%`%Z!<%8(B: http://coombs.anu.edu.au/~avalon/ip-filter.html -FTP: ftp://coombs.anu.edu.au/pub/net/ip-filter/ - - $B30;3(B $B=c@8(B <sumio@is.s.u-tokyo.ac.jp> - $B;3K\(B $BBY1'(B <ymmt@is.s.u-tokyo.ac.jp> - ------ -$B$O$8$a$K(B - -IP filter $B$r(B gateway $B%^%7%s$K%$%s%9%H!<%k$9$k$3$H$G%Q%1%C%H%U%#(B -$B%k%?%j%s%0$r9T$&$3$H$,$G$-$^$9!#(B - -$B%$%s%9%H!<%k$NJ}K!$O!"(BINSTALL$B$K=q$$$F$"$k$N$G!"$=$A$i$r;2>H$7$F(B -$B$/$@$5$$!#(BIP filter $B$N%P!<%8%g%s(B 3.3.5 $B$O!"(B - Solaris/Solaris-x86 2.3 - 8 (early access) - SunOS 4.1.1 - 4.1.4 - NetBSD 1.0 - 1.4 - FreeBSD 2.0.0 - 2.2.8 - BSD/OS-1.1 - 4 - IRIX 6.2 -$B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#(B - -$B$J$*!"(B64 bit kernel $B$NAv$C$F$k(B Solaris7 $B%^%7%s$G$O!"(Bgcc $B$H$+$G%3(B -$B%s%Q%$%k$7$?(B kernel driver $B$OF0:n$7$^$;$s!#(B - -$B$=$N$h$&$J>l9g$K$O!"(Bprecompiled binary $B$r(B -ftp://coombs.anu.edu.au/pub/net/ip-filter/ip_fil3.3.2-sparcv9.pkg.gz -(1999$BG/(B12$B7n(B14$BF|8=:_!"$^$@(B3.3.5$B$O%Q%C%1!<%8$K$J$C$F$$$^$;$s(B) -$B$+$i<h$C$F$/$k$+!"(BWorkshop Compiler 5.0 $B$G%3%s%Q%$%k$7$F(B 64bit -driver $B$r:n$C$F$/$@$5$$!#(B - ------ -$B@_Dj%U%!%$%k$N5-=RJ}K!(B - -IP filter$B$N@_Dj$O!V$I$N%"%I%l%9!W$N!V$I$N%]!<%H!W$+$i!V$I$N%"%I(B -$B%l%9!W$N!V$I$N%]!<%H!W$X$N%Q%1%C%H$r(B block $B$9$k$+(B pass $B$9$k$+!"(B -$B$r;XDj$9$k$3$H$G9T$$$^$9!#(B - -$B0J2<$NNc$G$O!"2f!9$,4IM}$7$F$$$k%5%V%M%C%H$h$j30$+$iFb$N%"%/%;%9(B -$B$O!"0lIt$N%^%7%s$r=|$$$F$OA4$F%V%m%C%/$7!"Fb$+$i30$X$N%"%/%;%9$O!"(B -$B86B'$H$7$FA4$FAGDL$7$9$k%]%j%7!<$G5-=R$5$l$F$$$^$9!#(B - -$B0J2<!"4IM}$7$F$$$k%5%V%M%C%H$r(B - 123.45.1.0/24 -$B$H$7$FNc$r<($7$^$9!#(B24$B$O%5%V%M%C%H%^%9%/$G$9!#(B - -$B$^$?!"(Bgateway $B$O(B - 123.45.1.111 (hme0) -$B$,(B LAN$BB&$N%$%s%?!<%U%'!<%9!"(B - 123.45.2.10 (hme1) -$B$,30B&$N%$%s%?!<%U%'!<%9$H$7$^$9!#(B - - -===================== $B$3$3$+$i(B ==================== -########## quickly deny malicious packets -# -block in quick from any to any with short -block in log quick from any to any with ipopts -===================== $B$3$3$^$G(B ==================== - -$B$^$:$O$3$N%k!<%k$G!"IT@5$J%Q%1%C%H$r$O$M$^$9!#(Bblock $B$O(B block $B$9(B -$B$k0UL#$G!"H?BP$KDL$9>l9g$O(B pass $B$H$J$j$^$9!#(B - -log $B$H$$$&$N$O!"$3$N%k!<%k$K%^%C%A$9$k%Q%1%C%H$N%m%0$r<h$k;X<($G(B -$B$9!#%m%0$O(B /dev/ipl $B$H$$$&%G%P%$%9%U%!%$%k$+$i%"%/%;%9$G$-$^$9$,!"(B -$B$3$N%G%P%$%9$O(B bounded buffer $B$J$N$G!"$"$kDxEY0J>e$N%m%0$O>C$($F(B -$B$7$^$$$^$9!#(B - -/dev/ipl $B$NFbMF$rFI$_=P$9$K$O(B ipmon $B$H$$$&%W%m%0%i%`$r;H$$$^$9!#(B -ipmon $B$O(B stdout, syslog, $B$b$7$/$ODL>o$N%U%!%$%k$K%m%0$r=PNO$7$^(B -$B$9!#5/F0;~$K(B ipmon $B$rN)$A>e$2$k$J$i!"<!$N$h$&$J9T$r(B rc $B%U%!%$%k(B -$B$K=q$/$H$h$$$G$7$g$&!#(B - -ipmon -n -o I ${IPMONLOG} < /dev/null > /dev/null 2>&1 & - -${IPMONLOG} $B$OE,Ev$J%U%!%$%kL>$KCV49$7$F$/$@$5$$!#(Bsyslog $B$K=PNO(B -$B$9$k>l9g$O!"(B-s $B%*%W%7%g%s$rIU$1$^$9!#(Bsyslog $B$K=PNO$9$k>l9g!"(B -local0.info $B$r5-O?$9$k$h$&$K(B syslog.conf $B$rJT=8$7$F$/$@$5$$!#(B -$BNc$($P!"(B - -local0.info ifdef(`LOGHOST', /var/log/syslog, @loghost) - - -quick $B$H$$$&$N$O!"$3$N%k!<%k$K%^%C%A$7$?%Q%1%C%H$O0J9_$N%k!<%k$r(B -$BD4$Y$:$K!"%"%/%7%g%s(B(block or pass)$B$K=>$o$;$k$H$$$&$b$N$G$9!#$?(B -$B$@$7!"Nc30$,$"$j$^$9!#8e=R$7$^$9!#(B - - -===================== $B$3$3$+$i(B ==================== -########## group setup -# -block in on hme1 all head 100 -block out on hme1 all head 150 -pass in quick on hme0 all -pass out quick on hme0 all -===================== $B$3$3$^$G(B ==================== - -$B<!$K@)8f$r$+$1$k%$%s%?!<%U%'!<%9Kh$K%Q%1%C%H$KE,MQ$9$k%k!<%k$rJ,(B -$BN`$7$^$9!#(Bhme0 $B$O(B LAN $BB&$N%$%s%?!<%U%'!<%9$J$N$G!"B(:B$K5v2D(B -(pass quick)$B$7$F$$$^$9!#(B - -all $B$H$$$&$N$O!"(Bfrom any to any $B$N>JN,7A$G$9!#(B - -$B30It$H$N%$%s%?!<%U%'!<%9$G$"$k(B hme1 $B$O(B incoming $B$H(B outgoing $B$G!"(B -$B$=$l$>$l(B group 100 $BHV$H(B 150 $BHV$KJ,N`$7$^$9!#(Bhead $B$H$$$&$N$O!"$3(B -$B$N%k!<%k$K%^%C%A$7$?%Q%1%C%H$r<!$NHV9f$N%0%k!<%W$KJ,N`$9$k$H$$$&(B -$B0UL#$G$9!#(B - - -===================== $B$3$3$+$i(B ==================== -########## deny IP spoofing -# -block in log quick from 127.0.0.0/8 to any group 100 -block in log quick from 123.45.2.10/32 to any group 100 -block in log quick from 123.45.1.111/24 to any group 100 -# -########## deny reserved addresses -# -block in log quick from 10.0.0.0/8 to any group 100 -block in log quick from 192.168.0.0/16 to any group 100 -block in log quick from 172.16.0.0/12 to any group 100 -# -===================== $B$3$3$^$G(B ==================== - -IP $B%"%I%l%9$r2~cb$7$?%Q%1%C%H$rB(:B$K5qH]$7$F$$$^$9!#KvHx$N(B -group 100 $B$H$$$&$N$O(B head 100 $B$GJ,N`$5$l$?%Q%1%C%H$K$N$_%^%C%A$9(B -$B$k%k!<%k$H$$$&0UL#$G$9!#(B - ------ -$B$3$3$^$G$G!"4pK\E*$K(BLAN$BFb$NDL?.$OAGDL$7$@$,30It$H$NDL?.$O%G%U%)(B -$B%k%H$G0l@Z6X;_$H$$$&@_Dj$K$J$j$^$9!#0J9_$G$O!"$=$N%G%U%)%k%H$KBP(B -$B$9$kNc30$H$$$&7A$G!"DL$7$?$$%Q%1%C%H$r5-=R$7$F$$$-$^$9!#(B - -$B$^$:!"FbIt$+$i30It$X$N@\B3$K4X$9$k@_Dj$r$7$^$9!#(B -===================== $B$3$3$+$i(B ==================== -########## OUTGOING -# -## allow ping out -# -pass out quick proto icmp from any to any keep state group 150 -# -## allow all outgoing UDP packets except for netbios ports (137-139). -# -pass out quick proto udp from any to any keep state head 160 group 150 -block out log quick proto udp from any to any port 136 >< 140 group 160 -# -## pass all TCP connection setup packets except for netbios ports (137-139). -# -pass out quick proto tcp from any to any flags S/SAFR keep state head 170 group 150 -block out log quick proto tcp from any to any port 136 >< 140 group 170 -===================== $B$3$3$^$G(B ==================== - -$B$3$l$O4pK\E*$KA4$F$N%Q%1%C%H$r5v$9%k!<%k$G$9!#$7$+$7!"(Bnetbios -(137-139/udp, tcp)$B$N%]!<%H$@$1$O6X;_$7$F$$$^$9!#(Bnetbios$B$O(B Windows -$B$N%U%!%$%k6&M-$G;H$o$l$k%]!<%H$G!"$3$N%]!<%H$,3+$$$F$$$k$H!"(B -Windows$B$N@_Dj$K$h$C$F$O!"@$3&Cf$+$i%U%!%$%k$rFI$_=q$-$G$-$k(B -$B62$l$,$"$j$^$9!#(B - -$B$3$3$G!"4JC1$K=q<0$r8+$F$*$/$H!"(B -* $B:G=i$NC18l$G!"(Bblock$B$9$k$+(Bpass$B$9$k$+;XDj$9$k(B -* proto $B$N8e$NC18l$G!"(Bprotocol$B$r;XDj$9$k(B(udp, tcp, icmp, etc.)$B!#(B -* from A to B $B$G!"$I$3$+$i$I$3$X$N%Q%1%C%H$+$r;XDj$9$k(B -* head XXX$B$r;XDj$9$k$H!"$=$N9T$G;XDj$5$l$"$?%Q%1%C%H$O!"(Bgroup - XXX$B$H$7$F;2>H$G$-$k(B -* group$B$r;XDj$9$k$3$H$G!"5,B'$rE,MQ$9$k8uJd$r(B($BM=$a(Bhead$B$G@_Dj$7$?(B) - group$B$K8BDj$G$-$k!#(B - -$B$^$?!"(Bfrom A to B$B$N(BA$B$d(BB$B$O!"(BIP$B%"%I%l%9$H(Bport$B$r=q$/$3$H$,$G$-$^$9!#(B - from any to any port 136 >< 140 -$B$H$$$&$N$O!"(B - $B!VG$0U$N%]!<%H$NG$0U$N%"%I%l%9$+$i!"(B137$BHV$+$i(B139$BHV%]!<%H$NG$0U$N(B - $B%"%I%l%9$X$N%Q%1%C%H!W(B -$B;XDj$7$F$$$k$3$H$K$J$j$^$9!#$^$?!"HV9f$NBe$o$j$K(B/etc/service$B$K5-(B -$B=R$5$l$F$$$k%5!<%S%9L>$r5-=R$9$k$3$H$b$G$-$^$9!#(B -$B$?$H$($P(B - from any to any port = telnet -$B$H(B - from any to any port = 23 -$B$OF1$80UL#$H$J$j$^$9!#(B - -$B$5$F!"$3$3$G(B quick $B$NNc30$r@bL@$7$F$*$-$^$9!#(Bquick $B$NIU$$$?(B -rule $B$,(B head $B$G?7$?$J%0%k!<%W$r:n$k>l9g!"=hM}$O$^$@$3$N;~E@(B -$B$G$O3NDj$7$^$;$s!#0J9_!"!V(Bhead $B$G@k8@$5$l$?%0%k!<%W$N%k!<%k!W(B -$B$N$_=hM}$9$k$H$$$&0UL#$K$J$j$^$9!#$G$9$+$i>e$N!"(B - -pass out quick proto udp from any to any keep state head 160 group 150 -block out log quick proto udp from any to any port 136 >< 140 group 160 - -$B$O!"$^$:(B 150$BHV%0%k!<%W$K%^%C%A$9$k(B UDP $B%Q%1%C%H$OAGDL$7(B -$B$9$k!"$,!"0J2<$N(B 160$BHV$KB0$9$k%k!<%k$r$^$@=hM}$9$k!#(B -$B$=$7$F(B2$B9TL\$G(B 160$BHV%0%k!<%W$KBP$7$F(B netbios packet $B$r(B -block $B$7$F$$$kLu$G$9!#(B -$B0l9TL\$K%^%C%A$7$?%Q%1%C%H$O0J2<$K$b$7(B150$BHV$N%0%k!<%W$N(B -$B%k!<%k$,$"$C$?$H$7$F$b!"L5;k$9$k$3$H$KCm0U$7$F$/$@$5$$!#(B - ----------- -$B<!$K!"30It$+$iFbIt$X$N%"%/%;%9$N@_Dj$r$7$^$9!#(B - -* $B%k!<%F%#%s%0>pJs(B(RIP)$B$N%Q%1%C%H$O!"A4It5v$7$^$9!#(B -pass in quick proto udp from any to any port = 520 keep state group 100 - -* ICMP$B$N%Q%1%C%H$OA4It5v$7$^$9!#(B -pass in quick proto icmp from any to any group 100 - -* $BFbIt$+$i30It$X$N(Bftp$B$r5v$9$?$a$K!"(Bftp-data port$B$+$i0lHL%]!<%H$X(B - $B$NG$0U$N@\B3$r<u$1IU$1$^$9!#$3$l$O(Bpassive mode$B$G$J$$(BFTP$B$N5sF0(B - $B$G$9!#(B -pass in quick proto tcp from any port = ftp-data to any port > 1023 flags S/SA keep state group 100 - - $B$7$+$7!"$3$l$O0lHL$K8@$C$FB?>/4m81$J9T0Y$G$9!#@\B3$G$-$k$N$,(B - 1024$BHV0J9_$N0lHL%]!<%H$K8BDj$O$5$l$^$9$,!"$"$^$j$*4+$a$G$-$^$;$s!#(B - $B$3$N9T$r2C$($:$K!"(Bpassive mode (ftp $B$G(B pasv $B%3%^%s%I$GF~$l$k(B) - $B$G(B FTP $B$r$9$k$3$H$r4+$a$^$9!#$J$*!":G6a$N(B FTP client $B$O:G=i(B - $B$+$i(B passive mode $B$KL5>r7o$G$7$F$7$^$&$b$N$,B?$$$h$&$G$9!#(B - -* sendmail$B$d(Bftpd$B$K7R$0$H!"Aj<j$,(Bident$B%]!<%H$X%"%/%;%9$7$F$/$k$3(B - $B$H$,$"$k$N$G!"(Bident port$B$r3+$1$^$9!#(Bident $B$ODL>o$O5/F0$5$l$F$$(B - $B$J$$(B daemon $B$J$N$G!"AGDL$7$7$F$b%;%-%e%j%F%#%[!<%k$K$J$k$3$H$O$"(B - $B$j$^$;$s(B(connection refused$B$K$J$k$@$1$G$9(B)$B!#$3$l$r3+$1$J$$$H!"(B - $BAj<jB&$O(B timeout $B$9$k$^$G@h$K?J$^$J$$$N$G!"(BFTP $B$d(B mail $B$NAw?.(B - $B$,$d$?$i$KCY$/$J$k$3$H$,$"$j$^$9!#(B - $B$b$7(B 113 $BHV%]!<%H$K@\B3$G$-$k$h$&$J$i!"$=$N%5!<%S%9$OB(:B$K(B - $BDd;_$9$k$3$H$r4+$a$^$9!#(B -pass in quick proto tcp from any to any port = 113 flags S/SA keep state group 100 - ------- -$B<!$K!"30It$+$i(B firewall $B$X$N%"%/%;%9$r5v$9%5!<%S%9$r5-=R$7$F$$$-(B -$B$^$9!#$^$:$O!"30It$+$i$N@\B3$r5v$7$?$$%[%9%H$K$D$$$F!"%0%k!<%WHV(B -$B9f$r$D$1$^$9!#(B - -===================== $B$3$3$+$i(B ==================== -## grouping by host -block in log quick proto tcp from any to 123.45.1.X flags S/SA head 110 group 100 -block in log quick proto tcp from any to 123.45.1.Y flags S/SA head 111 group 100 -===================== $B$3$3$^$G(B ==================== - -$B$3$l$G!"(B - $B30It$+$i(B 123.45.1.X $B$X$N@\B3$O(B group 110 - $B30It$+$i(B 123.45.1.Y $B$X$N@\B3$O(B group 111 -$B$G;2>H$9$k$3$H$,$G$-$^$9!#(B - -$BB>$K$b5v$7$?$$%[%9%H$rA}$d$7$?$$$H$-$O!">e$HF1MM$K$7$F!"(Bhead$B$N8e(B -$B$K!"?7$7$$?t;z(B(112, 113$B$J$I(B)$B$r3d$jEv$F$F$/$@$5$$!#(B - -$B$b$&0lEYCm0U$7$F$*$-$^$9$,!"(Bquick $B$H(B head $B$,F1;~$K8=$l$k%k!<%k(B -$B0J9_$G$O!"(Bhead $B$G@k8@$5$l$?%0%k!<%W$N%k!<%k$7$+E,MQ$5$l$J$/$J$j(B -$B$^$9!#$G$9$+$i!">e$N(B ident $B$d(B ftp data-port $B$N$h$&$K!"FbIt$N(B -$BA4$F$N%[%9%H$K%^%C%A$9$k%k!<%k$O!"$3$N%[%9%H$K$h$k%0%k!<%WJ,$1(B -$B$NA0$KCV$/I,MW$,$"$j$^$9!#(B - - -X$B$X$O!"(Btelnet, ftp, ssh $B$r!"(BY$B$X$O!"(Bftp, http, smtp, pop $B$r5v$9$3(B -$B$H$K$7$^$9!#(B - -* X(group 110)$B$X$N(Btelnet$B$r5v$7$^$9(B -pass in quick proto tcp from any to any port = telnet keep state group 110 - -* X$B$X$N(Bftp$B$r5v$7$^$9!#(Bftp-data port $B$b3+$1$F$*$-$^$9!#(B - ($BI,MW$,$"$k$+$I$&$+3NG'$O$7$F$$$^$;$s$,!"3+$1$F$$$F$b0BA4$G$7$g$&(B)$B!#(B -pass in quick proto tcp from any to any port = ftp keep state group 110 -pass in quick proto tcp from any to any port = ftp-data keep state group 110 - -* X$B$X$N(Bssh$B$r5v$7$^$9!#(B -pass in quick proto tcp from any to any port = 22 keep state group 110 - -* Y$B$X$N(Bftp$B$r5v$7$^$9!#(B -pass in quick proto tcp from any to any port = ftp keep state group 111 -pass in quick proto tcp from any to any port = ftp-data keep state group 111 -pass in quick proto tcp from any to any port 2999 >< 3100 keep state group 111 - - Y$B$O(B anonoymous ftp $B%5!<%P$r1?1D$7$F$$$k$?$a(B wu-ftpd $B$r;H$C$F$$(B - $B$^$9!#(Bwu-ftpd $B$O(B passive mode $B$N(BFTP$B$K$bBP1~$7$F$$$^$9$N$G!"$I(B - $B$N%]!<%H$r(BPASV$BMQ$K;H$&$+!"(Bwu-ftpd $B$N@_Dj$K=q$$$F$*$/I,MW$,$"$j(B - $B$^$9!#$3$3$G$O(B3000$B$+$i(B3099$BHV%]!<%H$r;HMQ$9$k$h$&$K!"(Bwu-ftpd $B$r(B - $B@_Dj$7$F$$$^$9!#(B - - passive FTP $B$K$D$$$F2r@b$7$^$9!#(Bpassive FTP $B$O!"%/%i%$%"%s%H$,(B - $B%U%!%$%"%&%)!<%k$NFbB&$K$$$k>l9g$N$?$a$K3+H/$5$l$?%W%m%H%3%k$G(B - $B$9!#%G%U%)%k%H$G$O>e$G@bL@$7$?$h$&$K!"%G!<%?E>Aw$N$?$a!"%5!<%P(B - $B$N(B ftp-data port $B$+$i%/%i%$%"%s%H$K@\B3$,$$$-$^$9!#(B - - passive FTP $B$G$O!"%G!<%?E>Aw$b(B client $B$+$i%5!<%P$K@\B3$9$k$h$&(B - $B$K$J$j$^$9!#$=$N:]!"%5!<%P$OE,Ev$J%]!<%HHV9f$r3d$j?6$C$F!"$=$3(B - $B$K%/%i%$%"%s%H$,@\B3$9$k$h$&;X<($7$^$9!#(B - - $B$3$N$?$a!"%5!<%P$,%U%!%$%"%&%)!<%kFb$K$$$k>l9g!"E,Ev$J%]!<%HHV(B - $B9f$O%U%!%$%"%&%)!<%k$G$O$M$i$l$F$7$^$$$^$9!#$=$3$G!"(Bwu-ftpd $B$N(B - $B@_Dj$G!"3d$j?6$k%]!<%HHV9f$NHO0O$r8BDj$7$F!"$=$3$@$1%U%!%$%"(B - $B%&%)!<%k$K7j$r3+$1$F$$$k$o$1$G$9!#(Bwu-ftpd $B$N>l9g$O!"(Bftpaccess - $B$H$$$&%U%!%$%k$K(B - - # passive ports <cidr> <min> <max> - passive ports 0.0.0.0/0 3000 3099 - - $B$HDI2C$9$k$3$H$G@_Dj$G$-$^$9!#(Bftpaccess(5)$B$r;2>H$7$F$/$@$5$$!#(B - -* Y$B$X$N(Bhttp$B$r5v$7$^$9!#(B -pass in quick proto tcp from any to any port = 80 keep state group 111 - -* Y$B$X$N(Bsmtp$B$r5v$7$^$9!#(B -pass in quick proto tcp from any to any port = smtp keep state group 111 - -* Y$B$X$N(Bpop$B$r5v$7$^$9!#(B -pass in quick proto tcp from any to any port = 110 keep state group 111 - -$B0J>e$N@_Dj$K$h$j!"(BX, Y $B0J30$N%^%7%s$X$N!"30It$+$i$N@\B3$O!"0l@Z(B -$B9T$($J$/$J$j$^$9$N$G!"(Bremote exploit $BBP:v$O!"(BX, Y $B$K$N$_9T$($P$h(B -$B$/$J$j!"4IM}$N<j4V$,7Z8:$G$-$^$9!#(B - -$BB>$N%W%m%H%3%k$rDL$9>l9g$b!">e$r;29M$K$7$FDL$7$?$$%]!<%HHV9f$r=q(B -$B$/$@$1$G$9$,!"$$$/$D$+Cm0UE@$,$"$j$^$9!#0J2<$bL\$rDL$7$F$/$@$5$$!#(B - ------ -$B$=$NB>$NCm0U(B - -1) gateway $B%^%7%s$N$h$&$K!"J#?t$N(BIP$B%"%I%l%9$r;}$D%^%7%s$G%5!<%S(B -$B%9$rN)$A>e$2$k>l9g$O!"$=$l$>$l$N(BIP$B%"%I%l%9$KBP$7$F!"(Bport $B$r3+$/(B -$BI,MW$,$"$j$^$9!#Nc$($P(B X $B$,(B IP:a $B$H(B IP:b $B$r;}$D$J$i!"(Bgroup $B$O(B a, -b $B$=$l$>$lMQ0U$7$F!"N>J}$N%0%k!<%WMQ$K(B rule $B$rDI2C$9$kI,MW$,$"$j(B -$B$^$9!#0J2<$NNc$G$O!"%2!<%H%&%'%$%^%7%s(B(123.45.2.10$B$H(B123.45.1.111 -$B$N(BIP$B$r;}$D(B)$B$K(BNNTP$B%5!<%P$rN)$F$F$$$^$9!#(B - -($BNc(B) -#### grouping by host -block in log quick proto tcp from any to 123.45.2.10 flags S/SA head 112 group 100 -block in log quick proto tcp from any to 123.45.1.111 flags S/SA head 113 group 100 -#### allow NNTP -pass in quick proto tcp from any to any port = nntp keep state group 112 -pass in quick proto tcp from any to any port = nntp keep state group 113 - -gateway $B$,(B2$B$D0J>e$"$k%M%C%H%o!<%/$G$O!"N>J}$N(B gateway $B$K(B IP -filter $B$,I,MW$K$J$j!"@_Dj$O99$KJ#;($K$J$j$^$9!#$=$N$h$&$J4D6-$N(B -$B>l9g$K$O!"%^%K%e%"%k$rFI$s$G8!F$$7$F$/$@$5$$!#(B - -2) NFS$B$H(Brsh$B$O%W%m%H%3%k$N4X78>e!"(Bfirewall$BD6$($OIT2DG=$G$9!#(B - NFS$B$NBeBX$K$D$$$F$OITL@$G$9$,!"(Brsh$B$NBeBX$H$7$F$O(Bssh$B$,;H$($^$9!#(B - -3) $B30It$N(BX client $B$r!"%U%!%$%"%&%)!<%kFb$N(BX$B%5!<%P$K@\B3$5$;$?$$!"(B - $B$H$$$&$N$O(B FAQ $B$N0l$D$G$9!#$*4+$a$N2r7h:v$O!"(Bssh $B$N(B X forwarding - $B5!9=$r;H$&$3$H$G$9!#(Bssh$B$G@\B3$G$-$k$J$i$P!"$3$l$O40A4$K(B secure - $B$GHFMQE*$JJ}K!$G$9!#(B - -$B$=$l$,=PMh$J$$>l9g$O!"2f!9$O@\B3$5$;$?$$%[%9%H$N%Z%"$r%f!<%6$KJs(B -$B9p$7$F$b$i$C$F!"0J2<$N$h$&$J%k!<%k$rDI2C$7$F$$$^$9!#(B -# X:0 $B$O(B tcp:6000 $BHV$K$J$j$^$9!#(B - -# 123.45.1.Z:0 (server) <-> A.B.C.D (client) -pass in quick proto tcp from A.B.C.D port > 1023 to 123.45.1.Z port = 6000 flags S/SA keep state group 100 - ------ -$B:G8e$K!";D$k%Q%1%C%H$OA4$F%V%m%C%/$5$l$kLu$G$9$,!"$=$l$K$D$$$F$N(B -$BA4$F$N%m%0$r;D$9$3$H$r4uK>$9$k>l9g!"<!$N%k!<%k$r!VI,$::G8e$K!W2C(B -$B$($^$9!#(B - -## log blocked packets -block in log quick from any to 123.45.1.111/24 group 100 -block in log quick from any to 123.45.2.10 group 100 - ------- -$B:#Kx$N@_Dj$r$R$H$D$K$^$H$a$?%U%!%$%k$r:G8e$KE:IU$7$^$9!#(B - -===================== $B$3$3$+$i(B ==================== -########## Packet Filtering Rules for 123.45.1. ########## -# -# The following routes should be configured, if not already: -# -# route add 123.45.1.111 localhost 0 (hme0) (LAN) -# route add 123.45.2.10 localhost 0 (hme1) (upstream) -# -########## quickly deny malicious packets -# -block in quick from any to any with short -block in log quick from any to any with ipopts -# -########## group setup -# -block in on hme1 all head 100 -block out on hme1 all head 150 -pass in quick on hme0 all -pass out quick on hme0 all -# -########## deny IP spoofing -# -block in log quick from 127.0.0.0/8 to any group 100 -block in log quick from 123.45.2.10/32 to any group 100 -block in log quick from 123.45.1.111/24 to any group 100 -# -########## deny reserved addresses -# -block in log quick from 10.0.0.0/8 to any group 100 -block in log quick from 192.168.0.0/16 to any group 100 -block in log quick from 172.16.0.0/12 to any group 100 -# -########## OUTGOING -# -## allow ping out -pass out quick proto icmp from any to any keep state group 150 -# -## allow all outgoing UDP packets except for netbios ports (137-139). -# -pass out quick proto udp from any to any keep state head 160 group 150 -block out log quick proto udp from any to any port 136 >< 140 group 160 -# -## pass all TCP connection setup packets except for netbios ports (137-139). -# -pass out quick proto tcp from any to any flags S/SAFR keep state head 170 group 150 -block out log quick proto tcp from any to any port 136 >< 140 group 170 -# -######### INCOMING -## ICMP -pass in quick proto icmp from any to any group 100 -## RIP -pass in quick proto udp from any to any port = 520 keep state group 100 -## FTP -pass in quick proto tcp from any port = ftp-data to any port > 1023 flags S/SA keep state group 100 -## IDENT -pass in quick proto tcp from any to any port = 113 flags S/SA keep state group 100 -# -## grouping by host (112 & 113 is the gateway address) -block in log quick proto tcp from any to 123.45.1.X flags S/SA head 110 group 100 -block in log quick proto tcp from any to 123.45.1.Y flags S/SA head 111 group 100 -block in log quick proto tcp from any to 123.45.2.10 flags S/SA head 112 group 100 -block in log quick proto tcp from any to 123.45.1.111 flags S/SA head 113 group 100 -# -## telnet, ftp, ssh, www, smtp, pop -pass in quick proto tcp from any to any port = telnet keep state group 110 -pass in quick proto tcp from any to any port = ftp keep state group 110 -pass in quick proto tcp from any to any port = ftp-data keep state group 110 -pass in quick proto tcp from any to any port = 22 keep state group 110 -pass in quick proto tcp from any to any port = ftp keep state group 111 -pass in quick proto tcp from any to any port = ftp-data keep state group 111 -pass in quick proto tcp from any to any port 2999 >< 3100 keep state group 111 -pass in quick proto tcp from any to any port = 80 keep state group 111 -pass in quick proto tcp from any to any port = smtp keep state group 111 -pass in quick proto tcp from any to any port = 110 keep state -group 111 -# -## allow NNTP on the gateway -pass in quick proto tcp from any to any port = nntp keep state group 112 -pass in quick proto tcp from any to any port = nntp keep state group 113 -# -## X connections -# 123.45.1.Z:0 (server) <-> A.B.C.D (client) -pass in quick proto tcp from A.B.C.D port > 1023 to 123.45.1.Z port = 6000 flags S/SA keep state group 100 -# -## log blocked packets -## THIS MUST BE THE LAST RULE! -block in log quick from any to 123.45.1.111/24 group 100 -block in log quick from any to 123.45.2.10 group 100 -===================== $B$3$3$^$G(B ==================== - ----- -$B$3$NJ8=q$N<h$j07$$$K$D$$$F(B -Copyright (C) 1999 TOYAMA Sumio <sumio@is.s.u-tokyo.ac.jp> - and YAMAMOTO Hirotaka <ymmt@is.s.u-tokyo.ac.jp> - -THIS DOCUMENT IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. - -Permission to modify this document and to distribute it is hereby -granted, as long as above notices and copyright notice are retained. diff --git a/contrib/ipfilter/WhatsNew40.txt b/contrib/ipfilter/WhatsNew40.txt deleted file mode 100644 index e5b8294..0000000 --- a/contrib/ipfilter/WhatsNew40.txt +++ /dev/null @@ -1,90 +0,0 @@ -What's new in IPFilter 4.1 -========================== -(Well, compared to 3.*, anyway) -In no particular order, except headline alphabetical: - -Administration: - - Run-time support for modifying ipf table size parameters. - - Run-time support for tuning other ipfilter parameters. - -Content Scanning: - - Simple matching of content for TCP session startup. - -Firewall Synchronising: - - Master/slave programs available. - -General: - - All input files allow simple 'marco' definitions and expansion, - including nesting. - - Code has been rototilled to make maintenance and enhancements - eaiser for me and you. - - More configuration files and binaries. - - Takes up more memory. - - Probably slower. - - Versioned API to support changes in the ABI without breaking - existing binaries (4.0 onward only.) - - IP-Filter framework in place for handling multiple different - types of packet matching for firewalling. - - IP Id number rewriting available. - - Verification of checksums for recognised packet types. - - Optionally enable/disable IP forwarding when enabled/disabled. - -IPF: - - BPF syntax available for matching packets in ipf rules (1). - - Can convert IPv4 ipf rules into C code and either: - * load them as an LKM o; - * compile them statically into the kernel (where possible.) - - Address pools allow for simpler rules covering large numbers of - addresses/networks (IPv4 only). - - Lookup functions available to map an IPv4 address to a group. - - Groups can be referenced by multiple heads for subroutine-like use. - - NAT/ipf rules can refer to each other via a tag, creating an implied - join that forms part of the packet matching. - - Extra packet attributes available for filter rules: - * source address/routing interface mismatch; - * multicast (3); - * broadcast (2,3); - * state lookup partially failed; - * out of the TCP window for a state connection; - * NAT lookup partially failed. - - PPS (packets per second) matching available for ipf rules. - - Rule collections (cf FreeBSD numbering) supported for ipf rules. - - Groups can now be names rather than just numbers - -IPV6: - - understands extension headers. - - can filter on extension headers. - -Logging: - - ipmon now comes with a configuration file for more advanced logging - behaviour. - - Can append arbitrary logging tags with ipf rules for easy matching. - -NAT: - - "sticky" mapping available to ensure an address translation on - a per-address basis is always the same (while known) for a set - IP address. - -Operating System Support: - - HP-UX 11 added. - - Tru64 5.1a added. - - Solaris/HP-UX now use pfil STREAMS module. - - Linux 2.4 on the way. - -Proxies: - - PPTP proxy added. - - IRC proxy added. - - RPCBIND proxy added. - - FTP proxy support for EPSV (IPv4 only.) - -Stateful Inspection: - - Can insist that all TCP data arrives in order. - - Can insist that all fragments pass through in order. - - The number of states created per-rule can be set where the total - across all rules may exceed the maximum allowed. - - Can elect not to automatically match ICMP error packets. - - TCP sequence number rewriting supported. - -(1) - Requires libpcap for rule parsing -(2) - On Solaris/HP-UX, broadcast packets are seen as multicast packets. -(3) - Not supported on SunOS4 diff --git a/contrib/ipfilter/bsdinstall b/contrib/ipfilter/bsdinstall deleted file mode 100755 index 7689a21..0000000 --- a/contrib/ipfilter/bsdinstall +++ /dev/null @@ -1,88 +0,0 @@ -#! /bin/sh -# -# @(#)install.sh 4.5 (Berkeley) 10/12/83 -# -cmd=/bin/mv -strip="" -chmod="chmod 755" -if [ "`uname -s`" = "HP-UX" ] ; then - chown="chown root" - chgrp="chgrp bin" -else - chown="chown -f root" - chgrp="chgrp -f bin" -fi -while true ; do - case $1 in - -s ) strip="strip" - shift - ;; - -c ) cmd="cp" - shift - ;; - -m ) chmod="chmod $2" - shift - shift - ;; - -o ) chown="chown -f $2" - shift - shift - ;; - -g ) chgrp="chgrp -f $2" - shift - shift - ;; - -d ) cmd="mkdir" - shift - ;; - * ) break - ;; - esac -done - -if [ ! ${2-""} ] -then echo "install: no destination specified" - exit 1 -fi -if [ ${3-""} ] -then echo "install: too many files specified -> $*" - exit 1 -fi -if [ $1 = $2 -o $2 = . ] -then echo "install: can't move $1 onto itself" - exit 1 -fi -case $cmd in -/bin/mkdir ) - file=$2/$1 - ;; -* ) - if [ '!' -f $1 ] - then echo "install: can't open $1" - exit 1 - fi - if [ -d $2 ] - then file=$2/$1 - else file=$2 - fi - /bin/rm -f $file - ;; -esac - -case $cmd in -/bin/mkdir ) - if [ ! -d "$file" ] - then $cmd $file - fi - ;; -* ) - $cmd $1 $file - if [ $strip ] - then $strip $file - fi - ;; -esac - -$chown $file -$chgrp $file -$chmod $file diff --git a/contrib/ipfilter/etc/protocols b/contrib/ipfilter/etc/protocols deleted file mode 100644 index dec8fb9..0000000 --- a/contrib/ipfilter/etc/protocols +++ /dev/null @@ -1,104 +0,0 @@ -icmp 1 ICMP # Internet Control Message -igmp 2 IGMP # Internet Group Management -ggp 3 GGP # Gateway-to-Gateway -ip 4 IP # IP in IP (encasulation) -st 5 ST # Stream -tcp 6 TCP # Transmission Control -ucl 7 UCL # UCL -egp 8 EGP # Exterior Gateway Protocol -igp 9 IGP # any private interior gateway -bbn-rcc-mon 10 BBN-RCC-MON # BBN RCC Monitoring -nvp-ii 11 NVP-II # Network Voice Protocol -pup 12 PUP # PUP -argus 13 ARGUS # ARGUS -emcon 14 EMCON # EMCON -xnet 15 XNET # Cross Net Debugger -chaos 16 CHAOS # Chaos -udp 17 UDP # User Datagram -mux 18 MUX # Multiplexing -dcn-meas 19 DCN-MEAS # DCN Measurement Subsystems -hmp 20 HMP # Host Monitoring -prm 21 PRM # Packet Radio Measurement -xns-idp 22 XNS-IDP # XEROX NS IDP -trunk-1 23 TRUNK-1 # Trunk-1 -trunk-2 24 TRUNK-2 # Trunk-2 -leaf-1 25 LEAF-1 # Leaf-1 -leaf-2 26 LEAF-2 # Leaf-2 -rdp 27 RDP # Reliable Data Protocol -irtp 28 IRTP # Internet Reliable Transaction -iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4 -netblt 30 NETBLT # Bulk Data Transfer Protocol -mfe-nsp 31 MFE-NSP # MFE Network Services Protocol -merit-inp 32 MERIT-INP # MERIT Internodal Protocol -sep 33 SEP # Sequential Exchange Protocol -3pc 34 3PC # Third Party Connect Protocol -idpr 35 IDPR # Inter-Domain Policy Routing Protocol -xtp 36 XTP # XTP -ddp 37 DDP # Datagram Delivery Protocol -idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto -tp++ 39 TP++ # TP++ Transport Protocol -il 40 IL # IL Transport Protocol -ipv6 41 IPv6 # Internet Protocol, version 6 -sip 41 SIP # Simple Internet Protocol -sdrp 42 SDRP # Source Demand Routing Protocol -ipv6-route 43 IPv6-Route # Routing Header for IPv6 -sip-sr 43 SIP-SR # SIP Source Route -ipv6-frag 44 IPv6-Frag # Fragment Hedaer for IPv6 -sip-frag 44 SIP-FRAG # SIP Fragment -idrp 45 IDRP # Inter-Domain Routing Protocol -rsvp 46 RSVP # Reservation Protocol -gre 47 GRE # General Routing Encapsulation -mhrp 48 MHRP # Mobile Host Routing Protocol -bna 49 BNA # BNA -esp 50 esp # Encap Security Payload -ah 51 AH # Authentication Header -i-nlsp 52 I-NLSP # Integrated Net Layer Security TUBA -swipe 53 SWIPE # IP with Encryption -nhrp 54 NHRP # NBMA Next Hop Resolution Protocol -mobile 55 MOBILE # IP Mobility (IP tunneling) -ipv6-icmp 58 icmpv6 IPv6-ICMP ICMPv6 # ICMP version 6 -ipv6-nonxt 59 IPv6-Nonxt # No Next Header for IPv6 -ipv6-opts 60 IPv6-Opts # Destination Options for IPv6 -any 61 any # host internal protocol -cftp 62 CFTP # CFTP -any 63 any # local network -sat-expak 64 SAT-EXPAK # SATNET and Backroom EXPAK -kryptolan 65 KRYPTOLAN # Kryptolan -rvd 66 RVD # MIT Remote Virtual Disk Protocol -ippc 67 IPPC # Internet Pluribus Packet Core -any 68 any # distributed file system -sat-mon 69 SAT-MON # SATNET Monitoring -visa 70 VISA # VISA Protocol -ipcv 71 IPCV # Internet Packet Core Utility -cpnx 72 CPNX # Computer Protocol Network Executive -cphb 73 CPHB # Computer Protocol Heart Beat -wsn 74 WSN # Wang Span Network -pvp 75 PVP # Packet Video Protocol -br-sat-mon 76 BR-SAT-MON # Backroom SATNET Monitoring -sun-nd 77 SUN-ND # SUN ND PROTOCOL-Temporary -wb-mon 78 WB-MON # WIDEBAND Monitoring -wb-expak 79 WB-EXPAK # WIDEBAND EXPAK -iso-ip 80 ISO-IP # ISO Internet Protocol -vmtp 81 VMTP # VMTP -secure-vmtp 82 SECURE-VMTP # SECURE-VMTP -vines 83 VINES # VINES -ttp 84 TTP # TTP -nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP -dgp 86 DGP # Dissimilar Gateway Protocol -tcf 87 TCF # TCF -igrp 88 IGRP # IGRP -ospfigp 89 OSPFIGP # OSPFIGP -sprite-rpc 90 Sprite-RPC # Sprite RPC Protocol -larp 91 LARP # Locus Address Resolution Protocol -mtp 92 MTP # Multicast Transport Protocol -ax.25 93 AX.25 # AX.25 Frames -ipip 94 IPIP # IP-within-IP Encapsulation Protocol -micp 95 MICP # Mobile Internetworking Control Pro. -scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro. -etherip 97 ETHERIP # Ethernet-within-IP Encapsulation -encap 98 ENCAP # Encapsulation Header -any 99 any # private encryption scheme -gmtp 100 GMTP # GMTP -pim 103 PIM # Protocol Independant Multicast -ipcomp 108 IPCOMP # IP Payload Compression Protocol -reserved 255 Reserved # diff --git a/contrib/ipfilter/etc/services b/contrib/ipfilter/etc/services deleted file mode 100644 index ad83348..0000000 --- a/contrib/ipfilter/etc/services +++ /dev/null @@ -1,2536 +0,0 @@ -tcpmux 1/tcp # TCP Port Service Multiplexer -tcpmux 1/udp # TCP Port Service Multiplexer -compressnet 2/tcp # Management Utility -compressnet 2/udp # Management Utility -compressnet 3/tcp # Compression Process -compressnet 3/udp # Compression Process -rje 5/tcp # Remote Job Entry -rje 5/udp # Remote Job Entry -echo 7/tcp # Echo -echo 7/udp # Echo -discard 9/tcp # Discard -discard 9/udp # Discard -systat 11/tcp # Active Users -systat 11/udp # Active Users -daytime 13/tcp # Daytime (RFC 867) -daytime 13/udp # Daytime (RFC 867) -qotd 17/tcp # Quote of the Day -qotd 17/udp # Quote of the Day -msp 18/tcp # Message Send Protocol -msp 18/udp # Message Send Protocol -chargen 19/tcp # Character Generator -chargen 19/udp # Character Generator -ftp 21/tcp # File Transfer [Control] -ftp 21/udp # File Transfer [Control] -ssh 22/tcp # SSH Remote Login Protocol -ssh 22/udp # SSH Remote Login Protocol -telnet 23/tcp # Telnet -telnet 23/udp # Telnet -smtp 25/tcp # Simple Mail Transfer -smtp 25/udp # Simple Mail Transfer -dsp 33/tcp # Display Support Protocol -dsp 33/udp # Display Support Protocol -time 37/tcp # Time -time 37/udp # Time -rap 38/tcp # Route Access Protocol -rap 38/udp # Route Access Protocol -rlp 39/tcp # Resource Location Protocol -rlp 39/udp # Resource Location Protocol -graphics 41/tcp # Graphics -graphics 41/udp # Graphics -name 42/tcp # Host Name Server -name 42/udp # Host Name Server -nameserver 42/tcp # Host Name Server -nameserver 42/udp # Host Name Server -nicname 43/tcp # Who Is -nicname 43/udp # Who Is -mpm 45/tcp # Message Processing Module [recv] -mpm 45/udp # Message Processing Module [recv] -auditd 48/tcp # Digital Audit Daemon -auditd 48/udp # Digital Audit Daemon -tacacs 49/tcp # Login Host Protocol (TACACS) -tacacs 49/udp # Login Host Protocol (TACACS) -domain 53/tcp # Domain Name Server -domain 53/udp # Domain Name Server -acas 62/tcp # ACA Services -acas 62/udp # ACA Services -covia 64/tcp # Communications Integrator (CI) -covia 64/udp # Communications Integrator (CI) -sql*net 66/tcp # Oracle SQL*NET -sql*net 66/udp # Oracle SQL*NET -bootps 67/tcp # Bootstrap Protocol Server -bootps 67/udp # Bootstrap Protocol Server -bootpc 68/tcp # Bootstrap Protocol Client -bootpc 68/udp # Bootstrap Protocol Client -tftp 69/tcp # Trivial File Transfer -tftp 69/udp # Trivial File Transfer -gopher 70/tcp # Gopher -gopher 70/udp # Gopher -deos 76/tcp # Distributed External Object Store -deos 76/udp # Distributed External Object Store -vettcp 78/tcp # vettcp -vettcp 78/udp # vettcp -finger 79/tcp # Finger -finger 79/udp # Finger -http 80/tcp # World Wide Web HTTP -http 80/udp # World Wide Web HTTP -www 80/tcp # World Wide Web HTTP -www 80/udp # World Wide Web HTTP -xfer 82/tcp # XFER Utility -xfer 82/udp # XFER Utility -ctf 84/tcp # Common Trace Facility -ctf 84/udp # Common Trace Facility -mfcobol 86/tcp # Micro Focus Cobol -mfcobol 86/udp # Micro Focus Cobol -kerberos 88/tcp # Kerberos -kerberos 88/udp # Kerberos -dnsix 90/tcp # DNSIX Securit Attribute Token Map -dnsix 90/udp # DNSIX Securit Attribute Token Map -npp 92/tcp # Network Printing Protocol -npp 92/udp # Network Printing Protocol -dcp 93/tcp # Device Control Protocol -dcp 93/udp # Device Control Protocol -objcall 94/tcp # Tivoli Object Dispatcher -objcall 94/udp # Tivoli Object Dispatcher -supdup 95/tcp # SUPDUP -supdup 95/udp # SUPDUP -dixie 96/tcp # DIXIE Protocol Specification -dixie 96/udp # DIXIE Protocol Specification -tacnews 98/tcp # TAC News -tacnews 98/udp # TAC News -metagram 99/tcp # Metagram Relay -metagram 99/udp # Metagram Relay -newacct 100/tcp [unauthorized use] -hostname 101/tcp # NIC Host Name Server -hostname 101/udp # NIC Host Name Server -gppitnp 103/tcp # Genesis Point-to-Point Trans Net -gppitnp 103/udp # Genesis Point-to-Point Trans Net -cso 105/tcp # CCSO name server protocol -cso 105/udp # CCSO name server protocol -rtelnet 107/tcp # Remote Telnet Service -rtelnet 107/udp # Remote Telnet Service -snagas 108/tcp # SNA Gateway Access Server -snagas 108/udp # SNA Gateway Access Server -pop2 109/tcp # Post Office Protocol - Version 2 -pop2 109/udp # Post Office Protocol - Version 2 -pop3 110/tcp # Post Office Protocol - Version 3 -pop3 110/udp # Post Office Protocol - Version 3 -sunrpc 111/tcp # SUN Remote Procedure Call -sunrpc 111/udp # SUN Remote Procedure Call -mcidas 112/tcp # McIDAS Data Transmission Protocol -mcidas 112/udp # McIDAS Data Transmission Protocol -ident 113/tcp -auth 113/tcp # Authentication Service -auth 113/udp # Authentication Service -audionews 114/tcp # Audio News Multicast -audionews 114/udp # Audio News Multicast -sftp 115/tcp # Simple File Transfer Protocol -sftp 115/udp # Simple File Transfer Protocol -ansanotify 116/tcp # ANSA REX Notify -ansanotify 116/udp # ANSA REX Notify -sqlserv 118/tcp # SQL Services -sqlserv 118/udp # SQL Services -nntp 119/tcp # Network News Transfer Protocol -nntp 119/udp # Network News Transfer Protocol -cfdptkt 120/tcp # CFDPTKT -cfdptkt 120/udp # CFDPTKT -erpc 121/tcp # Encore Expedited Remote Pro.Call -erpc 121/udp # Encore Expedited Remote Pro.Call -smakynet 122/tcp # SMAKYNET -smakynet 122/udp # SMAKYNET -ntp 123/tcp # Network Time Protocol -ntp 123/udp # Network Time Protocol -ansatrader 124/tcp # ANSA REX Trader -ansatrader 124/udp # ANSA REX Trader -nxedit 126/tcp # NXEdit -nxedit 126/udp # NXEdit -pwdgen 129/tcp # Password Generator Protocol -pwdgen 129/udp # Password Generator Protocol -statsrv 133/tcp # Statistics Service -statsrv 133/udp # Statistics Service -epmap 135/tcp # DCE endpoint resolution -epmap 135/udp # DCE endpoint resolution -profile 136/tcp # PROFILE Naming System -profile 136/udp # PROFILE Naming System -imap 143/tcp # Internet Message Access Protocol -imap 143/udp # Internet Message Access Protocol -uma 144/tcp # Universal Management Architecture -uma 144/udp # Universal Management Architecture -uaac 145/tcp # UAAC Protocol -uaac 145/udp # UAAC Protocol -jargon 148/tcp # Jargon -jargon 148/udp # Jargon -hems 151/tcp # HEMS -hems 151/udp # HEMS -bftp 152/tcp # Background File Transfer Program -bftp 152/udp # Background File Transfer Program -sgmp 153/tcp # SGMP -sgmp 153/udp # SGMP -sqlsrv 156/tcp # SQL Service -sqlsrv 156/udp # SQL Service -snmp 161/tcp # SNMP -snmp 161/udp # SNMP -snmptrap 162/tcp # SNMPTRAP -snmptrap 162/udp # SNMPTRAP -namp 167/tcp # NAMP -namp 167/udp # NAMP -rsvd 168/tcp # RSVD -rsvd 168/udp # RSVD -send 169/tcp # SEND -send 169/udp # SEND -multiplex 171/tcp # Network Innovations Multiplex -multiplex 171/udp # Network Innovations Multiplex -cl/1 172/tcp # Network Innovations CL/1 -cl/1 172/udp # Network Innovations CL/1 -mailq 174/tcp # MAILQ -mailq 174/udp # MAILQ -vmnet 175/tcp # VMNET -vmnet 175/udp # VMNET -xdmcp 177/tcp # X Display Manager Control Protocol -xdmcp 177/udp # X Display Manager Control Protocol -nextstep 178/tcp # NextStep Window Server -nextstep 178/udp # NextStep Window Server -bgp 179/tcp # Border Gateway Protocol -bgp 179/udp # Border Gateway Protocol -ris 180/tcp # Intergraph -ris 180/udp # Intergraph -unify 181/tcp # Unify -unify 181/udp # Unify -audit 182/tcp # Unisys Audit SITP -audit 182/udp # Unisys Audit SITP -ocbinder 183/tcp # OCBinder -ocbinder 183/udp # OCBinder -ocserver 184/tcp # OCServer -ocserver 184/udp # OCServer -kis 186/tcp # KIS Protocol -kis 186/udp # KIS Protocol -aci 187/tcp # Application Communication Interface -aci 187/udp # Application Communication Interface -mumps 188/tcp # Plus Five's MUMPS -mumps 188/udp # Plus Five's MUMPS -qft 189/tcp # Queued File Transport -qft 189/udp # Queued File Transport -gacp 190/tcp # Gateway Access Control Protocol -gacp 190/udp # Gateway Access Control Protocol -prospero 191/tcp # Prospero Directory Service -prospero 191/udp # Prospero Directory Service -srmp 193/tcp # Spider Remote Monitoring Protocol -srmp 193/udp # Spider Remote Monitoring Protocol -irc 194/tcp # Internet Relay Chat Protocol -irc 194/udp # Internet Relay Chat Protocol -dls 197/tcp # Directory Location Service -dls 197/udp # Directory Location Service -smux 199/tcp # SMUX -smux 199/udp # SMUX -src 200/tcp # IBM System Resource Controller -src 200/udp # IBM System Resource Controller -qmtp 209/tcp # The Quick Mail Transfer Protocol -qmtp 209/udp # The Quick Mail Transfer Protocol -anet 212/tcp # ATEXSSTR -anet 212/udp # ATEXSSTR -ipx 213/tcp # IPX -ipx 213/udp # IPX -vmpwscs 214/tcp # VM PWSCS -vmpwscs 214/udp # VM PWSCS -softpc 215/tcp # Insignia Solutions -softpc 215/udp # Insignia Solutions -dbase 217/tcp # dBASE Unix -dbase 217/udp # dBASE Unix -mpp 218/tcp # Netix Message Posting Protocol -mpp 218/udp # Netix Message Posting Protocol -uarps 219/tcp # Unisys ARPs -uarps 219/udp # Unisys ARPs -imap3 220/tcp # Interactive Mail Access Protocol v3 -imap3 220/udp # Interactive Mail Access Protocol v3 -cdc 223/tcp # Certificate Distribution Center -cdc 223/udp # Certificate Distribution Center -masqdialer 224/tcp # masqdialer -masqdialer 224/udp # masqdialer -direct 242/tcp # Direct -direct 242/udp # Direct -dayna 244/tcp # Dayna -dayna 244/udp # Dayna -link 245/tcp # LINK -link 245/udp # LINK -dsp3270 246/tcp # Display Systems Protocol -dsp3270 246/udp # Display Systems Protocol -bhfhs 248/tcp # bhfhs -bhfhs 248/udp # bhfhs -rap 256/tcp # RAP -rap 256/udp # RAP -set 257/tcp # Secure Electronic Transaction -set 257/udp # Secure Electronic Transaction -openport 260/tcp # Openport -openport 260/udp # Openport -nsiiops 261/tcp # IIOP Name Service over TLS/SSL -nsiiops 261/udp # IIOP Name Service over TLS/SSL -arcisdms 262/tcp # Arcisdms -arcisdms 262/udp Arcisdms -hdap 263/tcp # HDAP -hdap 263/udp # HDAP -bgmp 264/tcp # BGMP -bgmp 264/udp # BGMP -rescap 283/tcp # rescap -rescap 283/udp # rescap -novastorbakcup 308/tcp # Novastor Backup -novastorbakcup 308/udp # Novastor Backup -entrusttime 309/tcp # EntrustTime -entrusttime 309/udp # EntrustTime -bhmds 310/tcp # bhmds -bhmds 310/udp # bhmds -vslmp 312/tcp # VSLMP -vslmp 312/udp # VSLMP -dpsi 315/tcp # DPSI -dpsi 315/udp # DPSI -decauth 316/tcp # decAuth -decauth 316/udp # decAuth -zannet 317/tcp # Zannet -zannet 317/udp # Zannet -pip 321/tcp # PIP -pip 321/udp # PIP -rtsps 322/tcp # RTSPS -rtsps 322/udp # RTSPS -pdap 344/tcp # Prospero Data Access Protocol -pdap 344/udp # Prospero Data Access Protocol -pawserv 345/tcp # Perf Analysis Workbench -pawserv 345/udp # Perf Analysis Workbench -zserv 346/tcp # Zebra server -zserv 346/udp # Zebra server -fatserv 347/tcp # Fatmen Server -fatserv 347/udp # Fatmen Server -mftp 349/tcp # mftp -mftp 349/udp # mftp -bhoetty 351/tcp bhoetty (added 5/21/97) -bhoetty 351/udp # bhoetty -bhoedap4 352/tcp # bhoedap4 (added 5/21/97) -bhoedap4 352/udp # bhoedap4 -ndsauth 353/tcp # NDSAUTH -ndsauth 353/udp # NDSAUTH -bh611 354/tcp bh611 -bh611 354/udp # bh611 -bhevent 357/tcp bhevent -bhevent 357/udp # bhevent -shrinkwrap 358/tcp # Shrinkwrap -shrinkwrap 358/udp # Shrinkwrap -scoi2odialog 360/tcp # scoi2odialog -scoi2odialog 360/udp # scoi2odialog -semantix 361/tcp # Semantix -semantix 361/udp # Semantix -srssend 362/tcp # SRS Send -srssend 362/udp # SRS Send -dtk 365/tcp # DTK -dtk 365/udp # DTK -odmr 366/tcp # ODMR -odmr 366/udp # ODMR -mortgageware 367/tcp # MortgageWare -mortgageware 367/udp # MortgageWare -qbikgdp 368/tcp # QbikGDP -qbikgdp 368/udp # QbikGDP -rpc2portmap 369/tcp # rpc2portmap -rpc2portmap 369/udp # rpc2portmap -codaauth2 370/tcp # codaauth2 -codaauth2 370/udp # codaauth2 -clearcase 371/tcp # Clearcase -clearcase 371/udp # Clearcase -ulistproc 372/tcp # ListProcessor -ulistproc 372/udp # ListProcessor -hassle 375/tcp # Hassle -hassle 375/udp # Hassle -nip 376/tcp # Amiga Envoy Network Inquiry Proto -nip 376/udp # Amiga Envoy Network Inquiry Proto -tnETOS 377/tcp # NEC Corporation -tnETOS 377/udp # NEC Corporation -dsETOS 378/tcp # NEC Corporation -dsETOS 378/udp # NEC Corporation -is99c 379/tcp # TIA/EIA/IS-99 modem client -is99c 379/udp # TIA/EIA/IS-99 modem client -is99s 380/tcp # TIA/EIA/IS-99 modem server -is99s 380/udp # TIA/EIA/IS-99 modem server -arns 384/tcp # A Remote Network Server System -arns 384/udp # A Remote Network Server System -asa 386/tcp # ASA Message Router Object Def. -asa 386/udp # ASA Message Router Object Def. -aurp 387/tcp # Appletalk Update-Based Routing Pro. -aurp 387/udp # Appletalk Update-Based Routing Pro. -ldap 389/tcp # Lightweight Directory Access Protocol -ldap 389/udp # Lightweight Directory Access Protocol -uis 390/tcp # UIS -uis 390/udp # UIS -dis 393/tcp # Data Interpretation System -dis 393/udp # Data Interpretation System -netcp 395/tcp # NETscout Control Protocol -netcp 395/udp # NETscout Control Protocol -mptn 397/tcp # Multi Protocol Trans. Net. -mptn 397/udp # Multi Protocol Trans. Net. -kryptolan 398/tcp # Kryptolan -kryptolan 398/udp # Kryptolan -ups 401/tcp # Uninterruptible Power Supply -ups 401/udp # Uninterruptible Power Supply -genie 402/tcp # Genie Protocol -genie 402/udp # Genie Protocol -decap 403/tcp # decap -decap 403/udp # decap -nced 404/tcp # nced -nced 404/udp # nced -ncld 405/tcp # ncld -ncld 405/udp # ncld -imsp 406/tcp # Interactive Mail Support Protocol -imsp 406/udp # Interactive Mail Support Protocol -timbuktu 407/tcp # Timbuktu -timbuktu 407/udp # Timbuktu -decladebug 410/tcp # DECLadebug Remote Debug Protocol -decladebug 410/udp # DECLadebug Remote Debug Protocol -rmt 411/tcp # Remote MT Protocol -rmt 411/udp # Remote MT Protocol -smsp 413/tcp # SMSP -smsp 413/udp # SMSP -infoseek 414/tcp # InfoSeek -infoseek 414/udp # InfoSeek -bnet 415/tcp # BNet -bnet 415/udp # BNet -silverplatter 416/tcp # Silverplatter -silverplatter 416/udp # Silverplatter -onmux 417/tcp # Onmux -onmux 417/udp # Onmux -ariel1 419/tcp # Ariel -ariel1 419/udp # Ariel -smpte 420/tcp # SMPTE -smpte 420/udp # SMPTE -ariel2 421/tcp # Ariel -ariel2 421/udp # Ariel -ariel3 422/tcp # Ariel -ariel3 422/udp # Ariel -smartsdp 426/tcp # smartsdp -smartsdp 426/udp # smartsdp -svrloc 427/tcp # Server Location -svrloc 427/udp # Server Location -utmpsd 430/tcp # UTMPSD -utmpsd 430/udp # UTMPSD -utmpcd 431/tcp # UTMPCD -utmpcd 431/udp # UTMPCD -iasd 432/tcp # IASD -iasd 432/udp # IASD -nnsp 433/tcp # NNSP -nnsp 433/udp # NNSP -comscm 437/tcp # comscm -comscm 437/udp # comscm -dsfgw 438/tcp # dsfgw -dsfgw 438/udp # dsfgw -dasp 439/tcp # dasp Thomas Obermair -dasp 439/udp # dasp tommy@inlab.m.eunet.de -sgcp 440/tcp # sgcp -sgcp 440/udp # sgcp -https 443/tcp # http protocol over TLS/SSL -https 443/udp # http protocol over TLS/SSL -snpp 444/tcp # Simple Network Paging Protocol -snpp 444/udp # Simple Network Paging Protocol -tserver 450/tcp # TServer -tserver 450/udp # TServer -creativeserver 453/tcp # CreativeServer -creativeserver 453/udp # CreativeServer -contentserver 454/tcp # ContentServer -contentserver 454/udp # ContentServer -creativepartnr 455/tcp # CreativePartnr -creativepartnr 455/udp # CreativePartnr -scohelp 457/tcp # scohelp -scohelp 457/udp # scohelp -appleqtc 458/tcp # apple quick time -appleqtc 458/udp # apple quick time -skronk 460/tcp # skronk -skronk 460/udp # skronk -datasurfsrv 461/tcp # DataRampSrv -datasurfsrv 461/udp # DataRampSrv -datasurfsrvsec 462/tcp # DataRampSrvSec -datasurfsrvsec 462/udp # DataRampSrvSec -alpes 463/tcp # alpes -alpes 463/udp # alpes -kpasswd 464/tcp # kpasswd -kpasswd 464/udp # kpasswd -photuris 468/tcp # proturis -photuris 468/udp # proturis -rcp 469/tcp # Radio Control Protocol -rcp 469/udp # Radio Control Protocol -mondex 471/tcp # Mondex -mondex 471/udp # Mondex -tcp # nethaspsrv 475/tcp # tcpnethaspsrv -tcp # nethaspsrv 475/udp # tcp # nethaspsrv -ss7ns 477/tcp # ss7ns -ss7ns 477/udp # ss7ns -spsc 478/tcp # spsc -spsc 478/udp # spsc -iafserver 479/tcp # iafserver -iafserver 479/udp # iafserver -iafdbase 480/tcp # iafdbase -iafdbase 480/udp # iafdbase -ph 481/tcp # Ph service -ph 481/udp # Ph service -ulpnet 483/tcp # ulpnet -ulpnet 483/udp # ulpnet -powerburst 485/tcp # Air Soft Power Burst -powerburst 485/udp # Air Soft Power Burst -avian 486/tcp # avian -avian 486/udp # avian -saft 487/tcp # saft Simple Asynchronous File Transfer -saft 487/udp # saft Simple Asynchronous File Transfer -intecourier 495/tcp # intecourier -intecourier 495/udp # intecourier -dantz 497/tcp # dantz -dantz 497/udp # dantz -siam 498/tcp # siam -siam 498/udp # siam -isakmp 500/tcp # isakmp -isakmp 500/udp # isakmp -stmf 501/tcp # STMF -stmf 501/udp # STMF -intrinsa 503/tcp # Intrinsa -intrinsa 503/udp # Intrinsa -citadel 504/tcp # citadel -citadel 504/udp # citadel -ohimsrv 506/tcp # ohimsrv -ohimsrv 506/udp # ohimsrv -crs 507/tcp # crs -crs 507/udp # crs -xvttp 508/tcp # xvttp -xvttp 508/udp # xvttp -snare 509/tcp # snare -snare 509/udp # snare -fcp 510/tcp # FirstClass Protocol -fcp 510/udp # FirstClass Protocol -passgo 511/tcp # PassGo -passgo 511/udp # PassGo -exec 512/tcp # remote process execution; -comsat 512/udp -biff 512/udp # used by mail system to notify users -login 513/tcp # remote login a la telnet; -who 513/udp # maintains data bases showing who's -shell 514/tcp # cmd -syslog 514/udp -printer 515/tcp # spooler -printer 515/udp # spooler -videotex 516/tcp # videotex -videotex 516/udp # videotex -talk 517/tcp # like tenex link, but across -talk 517/udp # like tenex link, but across -ntalk 518/tcp -ntalk 518/udp -utime 519/tcp # unixtime -utime 519/udp # unixtime -efs 520/tcp # extended file name server -router 520/udp # local routing process (on site); -ripng 521/tcp # ripng -ripng 521/udp # ripng -ulp 522/tcp # ULP -ulp 522/udp # ULP -ncp 524/tcp # NCP -ncp 524/udp # NCP -timed 525/tcp # timeserver -timed 525/udp # timeserver -tempo 526/tcp # newdate -tempo 526/udp # newdate -stx 527/tcp # Stock IXChange -stx 527/udp # Stock IXChange -custix 528/tcp # Customer IXChange -custix 528/udp # Customer IXChange -courier 530/tcp # rpc -courier 530/udp # rpc -conference 531/tcp # chat -conference 531/udp # chat -netnews 532/tcp # readnews -netnews 532/udp # readnews -netwall 533/tcp # for emergency broadcasts -netwall 533/udp # for emergency broadcasts -iiop 535/tcp # iiop -iiop 535/udp # iiop -nmsp 537/tcp # Networked Media Streaming Protocol -nmsp 537/udp # Networked Media Streaming Protocol -gdomap 538/tcp # gdomap -gdomap 538/udp # gdomap -uucp 540/tcp # uucpd -uucp 540/udp # uucpd -commerce 542/tcp # commerce -commerce 542/udp # commerce -klogin 543/tcp -klogin 543/udp -kshell 544/tcp # krcmd -kshell 544/udp # krcmd -appleqtcsrvr 545/tcp # appleqtcsrvr -appleqtcsrvr 545/udp # appleqtcsrvr -afpovertcp 548/tcp # AFP over TCP -afpovertcp 548/udp # AFP over TCP -idfp 549/tcp # IDFP -idfp 549/udp # IDFP -cybercash 551/tcp # cybercash -cybercash 551/udp # cybercash -deviceshare 552/tcp # deviceshare -deviceshare 552/udp # deviceshare -pirp 553/tcp # pirp -pirp 553/udp # pirp -rtsp 554/tcp # Real Time Stream Control Protocol -rtsp 554/udp # Real Time Stream Control Protocol -dsf 555/tcp -dsf 555/udp -remotefs 556/tcp # rfs server -remotefs 556/udp # rfs server -sdnskmp 558/tcp # SDNSKMP -sdnskmp 558/udp # SDNSKMP -teedtap 559/tcp # TEEDTAP -teedtap 559/udp # TEEDTAP -rmonitor 560/tcp # rmonitord -rmonitor 560/udp # rmonitord -monitor 561/tcp -monitor 561/udp -chshell 562/tcp # chcmd -chshell 562/udp # chcmd -nntps 563/tcp # nntp protocol over TLS/SSL (was snntp) -nntps 563/udp # nntp protocol over TLS/SSL (was snntp) -whoami 565/tcp # whoami -whoami 565/udp # whoami -streettalk 566/tcp # streettalk -streettalk 566/udp # streettalk -meter 570/tcp # demon -meter 570/udp # demon -meter 571/tcp # udemon -meter 571/udp # udemon -sonar 572/tcp # sonar -sonar 572/udp # sonar -vemmi 575/tcp # VEMMI -vemmi 575/udp # VEMMI -ipcd 576/tcp # ipcd -ipcd 576/udp # ipcd -vnas 577/tcp # vnas -vnas 577/udp # vnas -ipdd 578/tcp # ipdd -ipdd 578/udp # ipdd -decbsrv 579/tcp # decbsrv -decbsrv 579/udp # decbsrv -bdp 581/tcp # Bundle Discovery Protocol -bdp 581/udp # Bundle Discovery Protocol -keyserver 584/tcp # Key Server -keyserver 584/udp # Key Server -submission 587/tcp # Submission -submission 587/udp # Submission -cal 588/tcp # CAL -cal 588/udp # CAL -eyelink 589/tcp # EyeLink -eyelink 589/udp # EyeLink -tpip 594/tcp # TPIP -tpip 594/udp # TPIP -smsd 596/tcp # SMSD -smsd 596/udp # SMSD -ptcnameservice 597/tcp # PTC Name Service -ptcnameservice 597/udp # PTC Name Service -acp 599/tcp # Aeolon Core Protocol -acp 599/udp # Aeolon Core Protocol -ipcserver 600/tcp # Sun IPC server -ipcserver 600/udp # Sun IPC server -urm 606/tcp # Cray Unified Resource Manager -urm 606/udp # Cray Unified Resource Manager -nqs 607/tcp # nqs -nqs 607/udp # nqs -sshell 614/tcp # SSLshell -sshell 614/udp # SSLshell -collaborator 622/tcp # Collaborator -collaborator 622/udp # Collaborator -cryptoadmin 624/tcp # Crypto Admin -cryptoadmin 624/udp # Crypto Admin -asia 626/tcp # ASIA -asia 626/udp # ASIA -qmqp 628/tcp # QMQP -qmqp 628/udp # QMQP -rda 630/tcp # RDA -rda 630/udp # RDA -ipp 631/tcp # IPP (Internet Printing Protocol) -ipp 631/udp # IPP (Internet Printing Protocol) -bmpp 632/tcp # bmpp -bmpp 632/udp # bmpp -servstat 633/tcp # Service Status update (Sterling Software) -servstat 633/udp # Service Status update (Sterling Software) -ginad 634/tcp # ginad -ginad 634/udp # ginad -rlzdbase 635/tcp # RLZ DBase -rlzdbase 635/udp # RLZ DBase -ldaps 636/tcp # ldap protocol over TLS/SSL (was sldap) -ldaps 636/udp # ldap protocol over TLS/SSL (was sldap) -lanserver 637/tcp # lanserver -lanserver 637/udp # lanserver -msdp 639/tcp # MSDP -msdp 639/udp # MSDP -repcmd 641/tcp # repcmd -repcmd 641/udp # repcmd -sanity 643/tcp # SANity -sanity 643/udp # SANity -dwr 644/tcp # dwr -dwr 644/udp # dwr -pssc 645/tcp # PSSC -pssc 645/udp # PSSC -ldp 646/tcp # LDP -ldp 646/udp # LDP -rrp 648/tcp # Registry Registrar Protocol (RRP) -rrp 648/udp # Registry Registrar Protocol (RRP) -aminet 649/tcp # Aminet -aminet 649/udp # Aminet -obex 650/tcp # OBEX -obex 650/udp # OBEX -repscmd 653/tcp # RepCmd -repscmd 653/udp # RepCmd -aodv 654/tcp # AODV -aodv 654/udp # AODV -tinc 655/tcp # TINC -tinc 655/udp # TINC -spmp 656/tcp # SPMP -spmp 656/udp # SPMP -mdqs 666/tcp -mdqs 666/udp -doom 666/tcp # doom Id Software -doom 666/udp # doom Id Software -disclose 667/tcp # campaign contribution disclosures - SDR Technologies -disclose 667/udp # campaign contribution disclosures - SDR Technologies -mecomm 668/tcp # MeComm -mecomm 668/udp # MeComm -meregister 669/tcp # MeRegister -meregister 669/udp # MeRegister -cimplex 673/tcp # CIMPLEX -cimplex 673/udp # CIMPLEX -acap 674/tcp # ACAP -acap 674/udp # ACAP -dctp 675/tcp # DCTP -dctp 675/udp # DCTP -vpp 677/tcp # Virtual Presence Protocol -vpp 677/udp # Virtual Presence Protocol -mrm 679/tcp # MRM -mrm 679/udp # MRM -xfr 682/tcp # XFR -xfr 682/udp # XFR -asipregistry 687/tcp # asipregistry -asipregistry 687/udp # asipregistry -elcsd 704/tcp # errlog copy/server daemon -elcsd 704/udp # errlog copy/server daemon -agentx 705/tcp # AgentX -agentx 705/udp # AgentX -netviewdm1 729/tcp # IBM NetView DM/6000 Server/Client -netviewdm1 729/udp # IBM NetView DM/6000 Server/Client -netviewdm2 730/tcp # IBM NetView DM/6000 send/tcp -netviewdm2 730/udp # IBM NetView DM/6000 send/tcp -netviewdm3 731/tcp # IBM NetView DM/6000 receive/tcp -netviewdm3 731/udp # IBM NetView DM/6000 receive/tcp -netgw 741/tcp # netGW -netgw 741/udp # netGW -netrcs 742/tcp # Network based Rev. Cont. Sys. -netrcs 742/udp # Network based Rev. Cont. Sys. -flexlm 744/tcp # Flexible License Manager -flexlm 744/udp # Flexible License Manager -rfile 750/tcp -loadav 750/udp -pump 751/tcp -pump 751/udp -qrh 752/tcp -qrh 752/udp -rrh 753/tcp -rrh 753/udp -tell 754/tcp send -tell 754/udp send -nlogin 758/tcp -nlogin 758/udp -con 759/tcp -con 759/udp -ns 760/tcp -ns 760/udp -rxe 761/tcp -rxe 761/udp -quotad 762/tcp -quotad 762/udp -cycleserv 763/tcp -cycleserv 763/udp -omserv 764/tcp -omserv 764/udp -webster 765/tcp -webster 765/udp -phonebook 767/tcp phone -phonebook 767/udp phone -vid 769/tcp -vid 769/udp -cadlock 770/tcp -cadlock 770/udp -rtip 771/tcp -rtip 771/udp -cycleserv2 772/tcp -cycleserv2 772/udp -submit 773/tcp -notify 773/udp -rpasswd 774/tcp -entomb 775/tcp -wpages 776/tcp -wpages 776/udp -wpgs 780/tcp -wpgs 780/udp -concert 786/tcp # Concert -concert 786/udp # Concert -qsc 787/tcp # QSC -qsc 787/udp # QSC -device 801/tcp -device 801/udp -rsync 873/tcp # rsync -rsync 873/udp # rsync -accessbuilder 888/tcp # AccessBuilder -accessbuilder 888/udp # AccessBuilder -cddbp 888/tcp # CD Database Protocol -omginitialrefs 900/tcp # OMG Initial Refs -omginitialrefs 900/udp # OMG Initial Refs -ftps 990/tcp # ftp protocol, control, over TLS/SSL -ftps 990/udp # ftp protocol, control, over TLS/SSL -nas 991/tcp # Netnews Administration System -nas 991/udp # Netnews Administration System -telnets 992/tcp # telnet protocol over TLS/SSL -telnets 992/udp # telnet protocol over TLS/SSL -imaps 993/tcp # imap4 protocol over TLS/SSL -imaps 993/udp # imap4 protocol over TLS/SSL -ircs 994/tcp # irc protocol over TLS/SSL -ircs 994/udp # irc protocol over TLS/SSL -pop3s 995/tcp # pop3 protocol over TLS/SSL (was spop3) -pop3s 995/udp # pop3 protocol over TLS/SSL (was spop3) -vsinet 996/tcp # vsinet -vsinet 996/udp # vsinet -maitrd 997/tcp -maitrd 997/udp -busboy 998/tcp -puparp 998/udp -garcon 999/tcp -applix 999/udp # Applix ac -puprouter 999/tcp -puprouter 999/udp -cadlock 1000/tcp -ock 1000/udp -surf 1010/tcp # surf -surf 1010/udp # surf -blackjack 1025/tcp # network blackjack -blackjack 1025/udp # network blackjack -iad1 1030/tcp # BBN IAD -iad1 1030/udp # BBN IAD -iad2 1031/tcp # BBN IAD -iad2 1031/udp # BBN IAD -iad3 1032/tcp # BBN IAD -iad3 1032/udp # BBN IAD -neod1 1047/tcp # Sun's NEO Object Request Broker -neod1 1047/udp # Sun's NEO Object Request Broker -neod2 1048/tcp # Sun's NEO Object Request Broker -neod2 1048/udp # Sun's NEO Object Request Broker -nim 1058/tcp # nim -nim 1058/udp # nim -nimreg 1059/tcp # nimreg -nimreg 1059/udp # nimreg -socks 1080/tcp # Socks -socks 1080/udp # Socks -sunclustermgr 1097/tcp # Sun Cluster Manager -sunclustermgr 1097/udp # Sun Cluster Manager -rmiactivation 1098/tcp # RMI Activation -rmiactivation 1098/udp # RMI Activation -rmiregistry 1099/tcp # RMI Registry -rmiregistry 1099/udp # RMI Registry -lmsocialserver 1111/tcp # LM Social Server -lmsocialserver 1111/udp # LM Social Server -murray 1123/tcp # Murray -murray 1123/udp # Murray -nfa 1155/tcp # Network File Access -nfa 1155/udp # Network File Access -caiccipc 1202/tcp # caiccipc -caiccipc 1202/udp # caiccipc -lupa 1212/tcp # lupa -lupa 1212/udp # lupa -nerv 1222/tcp # SNI R&D network -nerv 1222/udp # SNI R&D network -nmsd 1239/tcp # NMSD -nmsd 1239/udp # NMSD -hermes 1248/tcp -hermes 1248/udp -h323hostcallsc 1300/tcp # H323 Host Call Secure -h323hostcallsc 1300/udp # H323 Host Call Secure -husky 1310/tcp # Husky -husky 1310/udp # Husky -rxmon 1311/tcp # RxMon -rxmon 1311/udp # RxMon -pdps 1314/tcp # Photoscript Distributed Printing System -pdps 1314/udp # Photoscript Distributed Printing System -pip 1321/tcp # PIP -pip 1321/udp # PIP -vpjp 1345/tcp # VPJP -vpjp 1345/udp # VPJP -sbook 1349/tcp # Registration Network Protocol -sbook 1349/udp # Registration Network Protocol -editbench 1350/tcp # Registration Network Protocol -editbench 1350/udp # Registration Network Protocol -equationbuilder 1351/tcp # Digital Tool Works (MIT) -equationbuilder 1351/udp # Digital Tool Works (MIT) -lotusnote 1352/tcp # Lotus Note -lotusnote 1352/udp # Lotus Note -relief 1353/tcp # Relief Consulting -relief 1353/udp # Relief Consulting -rightbrain 1354/tcp # RightBrain Software -rightbrain 1354/udp # RightBrain Software -cuillamartin 1356/tcp # CuillaMartin Company -cuillamartin 1356/udp # CuillaMartin Company -pegboard 1357/tcp # Electronic PegBoard -pegboard 1357/udp # Electronic PegBoard -connlcli 1358/tcp # CONNLCLI -connlcli 1358/udp # CONNLCLI -ftsrv 1359/tcp # FTSRV -ftsrv 1359/udp # FTSRV -mimer 1360/tcp # MIMER -mimer 1360/udp # MIMER -linx 1361/tcp # LinX -linx 1361/udp # LinX -timeflies 1362/tcp # TimeFlies -timeflies 1362/udp # TimeFlies -dcs 1367/tcp # DCS -dcs 1367/udp # DCS -screencast 1368/tcp # ScreenCast -screencast 1368/udp # ScreenCast -chromagrafx 1373/tcp # Chromagrafx -chromagrafx 1373/udp # Chromagrafx -molly 1374/tcp # EPI Software Systems -molly 1374/udp # EPI Software Systems -bytex 1375/tcp # Bytex -bytex 1375/udp # Bytex -cichlid 1377/tcp # Cichlid License Manager -cichlid 1377/udp # Cichlid License Manager -elan 1378/tcp # Elan License Manager -elan 1378/udp # Elan License Manager -dbreporter 1379/tcp # Integrity Solutions -dbreporter 1379/udp # Integrity Solutions -gwha 1383/tcp # GW Hannaway Network License Manager -gwha 1383/udp # GW Hannaway Network License Manager -checksum 1386/tcp # CheckSum License Manager -checksum 1386/udp # CheckSum License Manager -hiq 1410/tcp # HiQ License Manager -hiq 1410/udp # HiQ License Manager -af 1411/tcp # AudioFile -af 1411/udp # AudioFile -innosys 1412/tcp # InnoSys -innosys 1412/udp # InnoSys -dbstar 1415/tcp # DBStar -dbstar 1415/udp # DBStar -essbase 1423/tcp # Essbase Arbor Software -essbase 1423/udp # Essbase Arbor Software -hybrid 1424/tcp # Hybrid Encryption Protocol -hybrid 1424/udp # Hybrid Encryption Protocol -sais 1426/tcp # Satellite-data Acquisition System 1 -sais 1426/udp # Satellite-data Acquisition System 1 -mloadd 1427/tcp # mloadd monitoring tool -mloadd 1427/udp # mloadd monitoring tool -nms 1429/tcp # Hypercom NMS -nms 1429/udp # Hypercom NMS -tpdu 1430/tcp # Hypercom TPDU -tpdu 1430/udp # Hypercom TPDU -rgtp 1431/tcp # Reverse Gossip Transport -rgtp 1431/udp # Reverse Gossip Transport -saism 1436/tcp # Satellite-data Acquisition System 2 -saism 1436/udp # Satellite-data Acquisition System 2 -tabula 1437/tcp # Tabula -tabula 1437/udp # Tabula -peport 1449/tcp # PEport -peport 1449/udp # PEport -dwf 1450/tcp # Tandem Distributed Workbench Facility -dwf 1450/udp # Tandem Distributed Workbench Facility -infoman 1451/tcp # IBM Information Management -infoman 1451/udp # IBM Information Management -dca 1456/tcp # DCA -dca 1456/udp # DCA -proshare1 1459/tcp # Proshare Notebook Application -proshare1 1459/udp # Proshare Notebook Application -proshare2 1460/tcp # Proshare Notebook Application -proshare2 1460/udp # Proshare Notebook Application -nucleus 1463/tcp # Nucleus -nucleus 1463/udp # Nucleus -pipes 1465/tcp # Pipes Platform -pipes 1465/udp # Pipes Platform mfarlin@peerlogic.com -csdmbase 1467/tcp # CSDMBASE -csdmbase 1467/udp # CSDMBASE -csdm 1468/tcp # CSDM -csdm 1468/udp # CSDM -uaiact 1470/tcp # Universal Analytics -uaiact 1470/udp # Universal Analytics -csdmbase 1471/tcp # csdmbase -csdmbase 1471/udp # csdmbase -csdm 1472/tcp # csdm -csdm 1472/udp # csdm -openmath 1473/tcp # OpenMath -openmath 1473/udp # OpenMath -telefinder 1474/tcp # Telefinder -telefinder 1474/udp # Telefinder -dberegister 1479/tcp # dberegister -dberegister 1479/udp # dberegister -pacerforum 1480/tcp # PacerForum -pacerforum 1480/udp # PacerForum -airs 1481/tcp # AIRS -airs 1481/udp # AIRS -afs 1483/tcp # AFS License Manager -afs 1483/udp # AFS License Manager -confluent 1484/tcp # Confluent License Manager -confluent 1484/udp # Confluent License Manager -lansource 1485/tcp # LANSource -lansource 1485/udp # LANSource -localinfosrvr 1487/tcp # LocalInfoSrvr -localinfosrvr 1487/udp # LocalInfoSrvr -docstor 1488/tcp # DocStor -docstor 1488/udp # DocStor -dmdocbroker 1489/tcp # dmdocbroker -dmdocbroker 1489/udp # dmdocbroker -anynetgateway 1491/tcp # anynetgateway -anynetgateway 1491/udp # anynetgateway -ica 1494/tcp # ica -ica 1494/udp # ica -cvc 1495/tcp # cvc -cvc 1495/udp # cvc -fhc 1499/tcp # Federico Heinz Consultora -fhc 1499/udp # Federico Heinz Consultora -saiscm 1501/tcp # Satellite-data Acquisition System 3 -saiscm 1501/udp # Satellite-data Acquisition System 3 -shivadiscovery 1502/tcp # Shiva -shivadiscovery 1502/udp # Shiva -funkproxy 1505/tcp # Funk Software, Inc. -funkproxy 1505/udp # Funk Software, Inc. -utcd 1506/tcp # Universal Time daemon (utcd) -utcd 1506/udp # Universal Time daemon (utcd) -symplex 1507/tcp # symplex -symplex 1507/udp # symplex -diagmond 1508/tcp # diagmond -diagmond 1508/udp # diagmond -wins 1512/tcp # Microsoft's Windows Internet Name Service -wins 1512/udp # Microsoft's Windows Internet Name Service -vpad 1516/tcp # Virtual Places Audio data -vpad 1516/udp # Virtual Places Audio data -vpac 1517/tcp # Virtual Places Audio control -vpac 1517/udp # Virtual Places Audio control -vpvd 1518/tcp # Virtual Places Video data -vpvd 1518/udp # Virtual Places Video data -vpvc 1519/tcp # Virtual Places Video control -vpvc 1519/udp # Virtual Places Video control -ingreslock 1524/tcp # ingres -ingreslock 1524/udp # ingres -orasrv 1525/tcp # oracle -orasrv 1525/udp # oracle -tlisrv 1527/tcp # oracle -tlisrv 1527/udp # oracle -mciautoreg 1528/tcp # micautoreg -mciautoreg 1528/udp # micautoreg -coauthor 1529/tcp # oracle -coauthor 1529/udp # oracle -miroconnect 1532/tcp # miroconnect -miroconnect 1532/udp # miroconnect -rds 1540/tcp # rds -rds 1540/udp # rds -rds2 1541/tcp # rds2 -rds2 1541/udp # rds2 -aspeclmd 1544/tcp # aspeclmd -aspeclmd 1544/udp # aspeclmd -abbaccuray 1546/tcp # abbaccuray -abbaccuray 1546/udp # abbaccuray -laplink 1547/tcp # laplink -laplink 1547/udp # laplink -shivahose 1549/tcp # Shiva Hose -shivasound 1549/udp # Shiva Sound -pciarray 1552/tcp # pciarray -pciarray 1552/udp # pciarray -livelan 1555/tcp # livelan -livelan 1555/udp # livelan -ashwin 1556/tcp # AshWin CI Tecnologies -ashwin 1556/udp # AshWin CI Tecnologies -xingmpeg 1558/tcp # xingmpeg -xingmpeg 1558/udp # xingmpeg -web2host 1559/tcp # web2host -web2host 1559/udp # web2host -facilityview 1561/tcp # facilityview -facilityview 1561/udp # facilityview -pconnectmgr 1562/tcp # pconnectmgr -pconnectmgr 1562/udp # pconnectmgr -winddlb 1565/tcp # WinDD -winddlb 1565/udp # WinDD -corelvideo 1566/tcp # CORELVIDEO -corelvideo 1566/udp # CORELVIDEO -jlicelmd 1567/tcp # jlicelmd -jlicelmd 1567/udp # jlicelmd -tsspmap 1568/tcp # tsspmap -tsspmap 1568/udp # tsspmap -ets 1569/tcp # ets -ets 1569/udp # ets -orbixd 1570/tcp # orbixd -orbixd 1570/udp # orbixd -oraclenames 1575/tcp # oraclenames -oraclenames 1575/udp # oraclenames -msims 1582/tcp # MSIMS -msims 1582/udp # MSIMS -simbaexpress 1583/tcp # simbaexpress -simbaexpress 1583/udp # simbaexpress -intv 1585/tcp # intv -intv 1585/udp # intv -vqp 1589/tcp # VQP -vqp 1589/udp # VQP -commonspace 1592/tcp # commonspace -commonspace 1592/udp # commonspace -sixtrak 1594/tcp # sixtrak -sixtrak 1594/udp # sixtrak -radio 1595/tcp # radio -radio 1595/udp # radio -picknfs 1598/tcp # picknfs -picknfs 1598/udp # picknfs -simbaservices 1599/tcp # simbaservices -simbaservices 1599/udp # simbaservices -issd 1600/tcp -issd 1600/udp -aas 1601/tcp # aas -aas 1601/udp # aas -inspect 1602/tcp # inspect -inspect 1602/udp # inspect -picodbc 1603/tcp # pickodbc -picodbc 1603/udp # pickodbc -icabrowser 1604/tcp # icabrowser -icabrowser 1604/udp # icabrowser -slp 1605/tcp # Salutation Manager (Salutation Protocol) -slp 1605/udp # Salutation Manager (Salutation Protocol) -stt 1607/tcp # stt -stt 1607/udp # stt -ill 1611/tcp # Inter Library Loan -ill 1611/udp # Inter Library Loan -skytelnet 1618/tcp # skytelnet -skytelnet 1618/udp # skytelnet -faxportwinport 1620/tcp # faxportwinport -faxportwinport 1620/udp # faxportwinport -softdataphone 1621/tcp # softdataphone -softdataphone 1621/udp # softdataphone -ontime 1622/tcp # ontime -ontime 1622/udp # ontime -jaleosnd 1623/tcp # jaleosnd -jaleosnd 1623/udp # jaleosnd -shockwave 1626/tcp # Shockwave -shockwave 1626/udp # Shockwave -oraclenet8cman 1630/tcp # Oracle Net8 Cman -oraclenet8cman 1630/udp # Oracle Net8 Cman -visitview 1631/tcp # Visit view -visitview 1631/udp # Visit view -pammratc 1632/tcp # PAMMRATC -pammratc 1632/udp # PAMMRATC -pammrpc 1633/tcp # PAMMRPC -pammrpc 1633/udp # PAMMRPC -loaprobe 1634/tcp # Log On America Probe -loaprobe 1634/udp # Log On America Probe -cncp 1636/tcp # CableNet Control Protocol -cncp 1636/udp # CableNet Control Protocol -cnap 1637/tcp # CableNet Admin Protocol -cnap 1637/udp # CableNet Admin Protocol -cnip 1638/tcp # CableNet Info Protocol -cnip 1638/udp # CableNet Info Protocol -invision 1641/tcp # InVision -invision 1641/udp # InVision -saiseh 1644/tcp # Satellite-data Acquisition System 4 -datametrics 1645/tcp # datametrics -datametrics 1645/udp # datametrics -rsap 1647/tcp # rsap -rsap 1647/udp # rsap -kermit 1649/tcp # kermit -kermit 1649/udp # kermit -nkd 1650/tcp # nkd -nkd 1650/udp # nkd -xnmp 1652/tcp # xnmp -xnmp 1652/udp # xnmp -stargatealerts 1654/tcp # stargatealerts -stargatealerts 1654/udp # stargatealerts -sixnetudr 1658/tcp # sixnetudr -sixnetudr 1658/udp # sixnetudr -pdp 1675/tcp # Pacific Data Products -pdp 1675/udp # Pacific Data Products -netcomm1 1676/tcp # netcomm1 -netcomm2 1676/udp # netcomm2 -groupwise 1677/tcp # groupwise -groupwise 1677/udp # groupwise -prolink 1678/tcp # prolink -prolink 1678/udp # prolink -snaresecure 1684/tcp # SnareSecure -snaresecure 1684/udp # SnareSecure -n2nremote 1685/tcp # n2nremote -n2nremote 1685/udp # n2nremote -cvmon 1686/tcp # cvmon -cvmon 1686/udp # cvmon -firefox 1689/tcp # firefox -firefox 1689/udp # firefox -rrirtr 1693/tcp # rrirtr -rrirtr 1693/udp # rrirtr -rrimwm 1694/tcp # rrimwm -rrimwm 1694/udp # rrimwm -rrilwm 1695/tcp # rrilwm -rrilwm 1695/udp # rrilwm -rrifmm 1696/tcp # rrifmm -rrifmm 1696/udp # rrifmm -rrisat 1697/tcp # rrisat -rrisat 1697/udp # rrisat -l2f 1701/tcp # l2f -l2f 1701/udp # l2f -l2tp 1701/tcp # l2tp -l2tp 1701/udp # l2tp -deskshare 1702/tcp # deskshare -deskshare 1702/udp # deskshare -slingshot 1705/tcp # slingshot -slingshot 1705/udp # slingshot -jetform 1706/tcp # jetform -jetform 1706/udp # jetform -vdmplay 1707/tcp # vdmplay -vdmplay 1707/udp # vdmplay -centra 1709/tcp # centra -centra 1709/udp # centra -impera 1710/tcp # impera -impera 1710/udp # impera -pptconference 1711/tcp # pptconference -pptconference 1711/udp # pptconference -registrar 1712/tcp # resource monitoring service -registrar 1712/udp # resource monitoring service -conferencetalk 1713/tcp # ConferenceTalk -conferencetalk 1713/udp # ConferenceTalk -xmsg 1716/tcp # xmsg -xmsg 1716/udp # xmsg -h323gatedisc 1718/tcp # h323gatedisc -h323gatedisc 1718/udp # h323gatedisc -h323gatestat 1719/tcp # h323gatestat -h323gatestat 1719/udp # h323gatestat -h323hostcall 1720/tcp # h323hostcall -h323hostcall 1720/udp # h323hostcall -caicci 1721/tcp # caicci -caicci 1721/udp # caicci -pptp 1723/tcp # pptp -pptp 1723/udp # pptp -csbphonemaster 1724/tcp # csbphonemaster -csbphonemaster 1724/udp # csbphonemaster -iberiagames 1726/tcp # IBERIAGAMES -iberiagames 1726/udp # IBERIAGAMES -winddx 1727/tcp # winddx -winddx 1727/udp # winddx -telindus 1728/tcp # TELINDUS -telindus 1728/udp # TELINDUS -citynl 1729/tcp # CityNL License Management -citynl 1729/udp # CityNL License Management -roketz 1730/tcp # roketz -roketz 1730/udp # roketz -msiccp 1731/tcp # MSICCP -msiccp 1731/udp # MSICCP -proxim 1732/tcp # proxim -proxim 1732/udp # proxim -siipat 1733/tcp # SIMS - SIIPAT Protocol for Alarm Transmission -siipat 1733/udp # SIMS - SIIPAT Protocol for Alarm Transmission -privatechat 1735/tcp # PrivateChat -privatechat 1735/udp # PrivateChat -ultimad 1737/tcp # ultimad -ultimad 1737/udp # ultimad -gamegen1 1738/tcp # GameGen1 -gamegen1 1738/udp # GameGen1 -webaccess 1739/tcp # webaccess -webaccess 1739/udp # webaccess -encore 1740/tcp # encore -encore 1740/udp # encore -sslp 1750/tcp # Simple Socket Library's PortMaster -sslp 1750/udp # Simple Socket Library's PortMaster -swiftnet 1751/tcp # SwiftNet -swiftnet 1751/udp # SwiftNet -cnhrp 1757/tcp # cnhrp -cnhrp 1757/udp # cnhrp -vaultbase 1771/tcp # vaultbase -vaultbase 1771/udp # vaultbase -kmscontrol 1773/tcp # KMSControl -kmscontrol 1773/udp # KMSControl -femis 1776/tcp # Federal Emergency Management Information System -femis 1776/udp # Federal Emergency Management Information System -powerguardian 1777/tcp # powerguardian -powerguardian 1777/udp # powerguardian -pharmasoft 1779/tcp # pharmasoft -pharmasoft 1779/udp # pharmasoft -dpkeyserv 1780/tcp # dpkeyserv -dpkeyserv 1780/udp # dpkeyserv -fjris 1783/tcp # Fujitsu Remote Install Service -fjris 1783/udp # Fujitsu Remote Install Service -windlm 1785/tcp # Wind River Systems License Manager -windlm 1785/udp # Wind River Systems License Manager -psmond 1788/tcp # psmond -psmond 1788/udp # psmond -hello 1789/tcp # hello -hello 1789/udp # hello -nmsp 1790/tcp # Narrative Media Streaming Protocol -nmsp 1790/udp # Narrative Media Streaming Protocol -ea1 1791/tcp # EA1 -ea1 1791/udp # EA1 -uma 1797/tcp # UMA -uma 1797/udp # UMA -etp 1798/tcp # Event Transfer Protocol -etp 1798/udp # Event Transfer Protocol -netrisk 1799/tcp # NETRISK -netrisk 1799/udp # NETRISK -msmq 1801/tcp # Microsoft Message Que -msmq 1801/udp # Microsoft Message Que -concomp1 1802/tcp # ConComp1 -concomp1 1802/udp # ConComp1 -enl 1804/tcp # ENL -enl 1804/udp # ENL -musiconline 1806/tcp # Musiconline -musiconline 1806/udp # Musiconline -fhsp 1807/tcp # Fujitsu Hot Standby Protocol -fhsp 1807/udp # Fujitsu Hot Standby Protocol -radius 1812/tcp # RADIUS -radius 1812/udp # RADIUS -mmpft 1815/tcp # MMPFT -mmpft 1815/udp # MMPFT -harp 1816/tcp # HARP -harp 1816/udp # HARP -etftp 1818/tcp # Enhanced Trivial File Transfer Protocol -etftp 1818/udp # Enhanced Trivial File Transfer Protocol -mcagent 1820/tcp # mcagent -mcagent 1820/udp # mcagent -donnyworld 1821/tcp # donnyworld -donnyworld 1821/udp # donnyworld -ardt 1826/tcp # ARDT -ardt 1826/udp # ARDT -asi 1827/tcp # ASI -asi 1827/udp # ASI -myrtle 1831/tcp # Myrtle -myrtle 1831/udp # Myrtle -udp # radio 1833/tcp # udp # radio -udp # radio 1833/udp # udpradio -ardusuni 1834/tcp # ARDUS Unicast -ardusuni 1834/udp # ARDUS Unicast -ardusmul 1835/tcp # ARDUS Multicast -ardusmul 1835/udp # ARDUS Multicast -csoft1 1837/tcp # csoft1 -csoft1 1837/udp # csoft1 -talnet 1838/tcp # TALNET -talnet 1838/udp # TALNET -gsi 1850/tcp # GSI -gsi 1850/udp # GSI -ctcd 1851/tcp # ctcd -ctcd 1851/udp # ctcd -msnp 1863/tcp # MSNP -msnp 1863/udp # MSNP -entp 1865/tcp # ENTP -entp 1865/udp # ENTP -canocentral0 1871/tcp # Cano Central 0 -canocentral0 1871/udp # Cano Central 0 -canocentral1 1872/tcp # Cano Central 1 -canocentral1 1872/udp # Cano Central 1 -fjmpjps 1873/tcp # Fjmpjps -fjmpjps 1873/udp # Fjmpjps -fjswapsnp 1874/tcp # Fjswapsnp -fjswapsnp 1874/udp # Fjswapsnp -mc2studios 1899/tcp # MC2Studios -mc2studios 1899/udp # MC2Studios -linkname 1903/tcp # Local Link Name Resolution -linkname 1903/udp # Local Link Name Resolution -sugp 1905/tcp # Secure UP.Link Gateway Protocol -sugp 1905/udp # Secure UP.Link Gateway Protocol -tpmd 1906/tcp # TPortMapperReq -tpmd 1906/udp # TPortMapperReq -intrastar 1907/tcp # IntraSTAR -intrastar 1907/udp # IntraSTAR -dawn 1908/tcp # Dawn -dawn 1908/udp # Dawn -ultrabac 1910/tcp # ultrabac -ultrabac 1910/udp # ultrabac -mtp 1911/tcp # Starlight Networks Multimedia Transport Protocol -mtp 1911/udp # Starlight Networks Multimedia Transport Protocol -armadp 1913/tcp # armadp -armadp 1913/udp # armadp -facelink 1915/tcp # FACELINK -facelink 1915/udp # FACELINK -persona 1916/tcp # Persoft Persona -persona 1916/udp # Persoft Persona -noagent 1917/tcp # nOAgent -noagent 1917/udp # nOAgent -noadmin 1921/tcp # NoAdmin -noadmin 1921/udp # NoAdmin -tapestry 1922/tcp # Tapestry -tapestry 1922/udp # Tapestry -spice 1923/tcp # SPICE -spice 1923/udp # SPICE -xiip 1924/tcp # XIIP -xiip 1924/udp # XIIP -tekpls 1946/tcp # tekpls -tekpls 1946/udp # tekpls -hlserver 1947/tcp # hlserver -hlserver 1947/udp # hlserver -eye2eye 1948/tcp # eye2eye -eye2eye 1948/udp # eye2eye -ismaeasdaqlive 1949/tcp # ISMA Easdaq Live -ismaeasdaqlive 1949/udp # ISMA Easdaq Live -ismaeasdaqtest 1950/tcp # ISMA Easdaq Test -ismaeasdaqtest 1950/udp # ISMA Easdaq Test -mpnjsc 1952/tcp # mpnjsc -mpnjsc 1952/udp # mpnjsc -rapidbase 1953/tcp # Rapid Base -rapidbase 1953/udp # Rapid Base -dlsrap 1973/tcp # Data Link Switching Remote Access Protocol -dlsrap 1973/udp # Data Link Switching Remote Access Protocol -bb 1984/tcp # BB -bb 1984/udp # BB -hsrp 1985/tcp # Hot Standby Router Protocol -hsrp 1985/udp # Hot Standby Router Protocol -licensedaemon 1986/tcp # cisco license management -licensedaemon 1986/udp # cisco license management -mshnet 1989/tcp # MHSnet system -mshnet 1989/udp # MHSnet system -ipsendmsg 1992/tcp # IPsendmsg -ipsendmsg 1992/udp # IPsendmsg -callbook 2000/tcp -callbook 2000/udp -dc 2001/tcp -wizard 2001/udp # curry -globe 2002/tcp -globe 2002/udp -mailbox 2004/tcp -emce 2004/udp # CCWS mm conf -berknet 2005/tcp -oracle 2005/udp -invokator 2006/tcp -dectalk 2007/tcp -conf 2008/tcp -terminaldb 2008/udp -news 2009/tcp -whosockami 2009/udp -search 2010/tcp -servserv 2011/udp -ttyinfo 2012/tcp -troff 2014/tcp -cypress 2015/tcp -bootserver 2016/tcp -bootserver 2016/udp -bootclient 2017/udp -terminaldb 2018/tcp -rellpack 2018/udp -whosockami 2019/tcp -about 2019/udp -xinupageserver 2020/tcp -xinupageserver 2020/udp -servexec 2021/tcp -xinuexpansion1 2021/udp -down 2022/tcp -xinuexpansion2 2022/udp -xinuexpansion3 2023/tcp -xinuexpansion3 2023/udp -xinuexpansion4 2024/tcp -xinuexpansion4 2024/udp -ellpack 2025/tcp -xribs 2025/udp -scrabble 2026/tcp -scrabble 2026/udp -shadowserver 2027/tcp -shadowserver 2027/udp -submitserver 2028/tcp -submitserver 2028/udp -device2 2030/tcp -device2 2030/udp -blackboard 2032/tcp -blackboard 2032/udp -glogger 2033/tcp -glogger 2033/udp -scoremgr 2034/tcp -scoremgr 2034/udp -imsldoc 2035/tcp -imsldoc 2035/udp -objectmanager 2038/tcp -objectmanager 2038/udp -lam 2040/tcp -lam 2040/udp -interbase 2041/tcp -interbase 2041/udp -isis 2042/tcp # isis -isis 2042/udp # isis -rimsl 2044/tcp -rimsl 2044/udp -cdfunc 2045/tcp -cdfunc 2045/udp -sdfunc 2046/tcp -sdfunc 2046/udp -dls 2047/tcp -dls 2047/udp -shilp 2049/tcp -shilp 2049/udp -nfs 2049/tcp # Network File System - Sun Microsystems -nfs 2049/udp # Network File System - Sun Microsystems -dlsrpn 2065/tcp # Data Link Switch Read Port Number -dlsrpn 2065/udp # Data Link Switch Read Port Number -dlswpn 2067/tcp # Data Link Switch Write Port Number -dlswpn 2067/udp # Data Link Switch Write Port Number -lrp 2090/tcp # Load Report Protocol -lrp 2090/udp # Load Report Protocol -prp 2091/tcp # PRP -prp 2091/udp # PRP -descent3 2092/tcp # Descent 3 -descent3 2092/udp # Descent 3 -jetformpreview 2097/tcp # Jet Form Preview -jetformpreview 2097/udp # Jet Form Preview -amiganetfs 2100/tcp # amiganetfs -amiganetfs 2100/udp # amiganetfs -minipay 2105/tcp # MiniPay -minipay 2105/udp # MiniPay -mzap 2106/tcp # MZAP -mzap 2106/udp # MZAP -comcam 2108/tcp # Comcam -comcam 2108/udp # Comcam -ergolight 2109/tcp # Ergolight -ergolight 2109/udp # Ergolight -ici 2200/tcp # ICI -ici 2200/udp # ICI -ats 2201/tcp # Advanced Training System Program -ats 2201/udp # Advanced Training System Program -kali 2213/tcp # Kali -kali 2213/udp # Kali -ganymede 2220/tcp # Ganymede -ganymede 2220/udp # Ganymede -infocrypt 2233/tcp # INFOCRYPT -infocrypt 2233/udp # INFOCRYPT -directplay 2234/tcp # DirectPlay -directplay 2234/udp # DirectPlay -nani 2236/tcp # Nani -nani 2236/udp # Nani -imagequery 2239/tcp # Image Query -imagequery 2239/udp # Image Query -recipe 2240/tcp # RECIPe -recipe 2240/udp # RECIPe -ivsd 2241/tcp # IVS Daemon -ivsd 2241/udp # IVS Daemon -foliocorp 2242/tcp # Folio Remote Server -foliocorp 2242/udp # Folio Remote Server -magicom 2243/tcp # Magicom Protocol -magicom 2243/udp # Magicom Protocol -nmsserver 2244/tcp # NMS Server -nmsserver 2244/udp # NMS Server -hao 2245/tcp # HaO -hao 2245/udp # HaO -xmquery 2279/tcp # xmquery -xmquery 2279/udp # xmquery -lnvpoller 2280/tcp # LNVPOLLER -lnvpoller 2280/udp # LNVPOLLER -lnvconsole 2281/tcp # LNVCONSOLE -lnvconsole 2281/udp # LNVCONSOLE -lnvalarm 2282/tcp # LNVALARM -lnvalarm 2282/udp # LNVALARM -lnvstatus 2283/tcp # LNVSTATUS -lnvstatus 2283/udp # LNVSTATUS -lnvmaps 2284/tcp # LNVMAPS -lnvmaps 2284/udp # LNVMAPS -lnvmailmon 2285/tcp # LNVMAILMON -lnvmailmon 2285/udp # LNVMAILMON -dna 2287/tcp # DNA -dna 2287/udp # DNA -netml 2288/tcp # NETML -netml 2288/udp # NETML -cvmmon 2300/tcp # CVMMON -cvmmon 2300/udp # CVMMON -binderysupport 2302/tcp # Bindery Support -binderysupport 2302/udp # Bindery Support -pehelp 2307/tcp # pehelp -pehelp 2307/udp # pehelp -sdhelp 2308/tcp # sdhelp -sdhelp 2308/udp # sdhelp -sdserver 2309/tcp # SD Server -sdserver 2309/udp # SD Server -sdclient 2310/tcp # SD Client -sdclient 2310/udp # SD Client -messageservice 2311/tcp # Message Service -messageservice 2311/udp # Message Service -iapp 2313/tcp # IAPP (Inter Access Point Protocol) -iapp 2313/udp # IAPP (Inter Access Point Protocol) -cadencecontrol 2318/tcp # Cadence Control -cadencecontrol 2318/udp # Cadence Control -infolibria 2319/tcp # InfoLibria -infolibria 2319/udp # InfoLibria -rdlap 2321/tcp # RDLAP over UDP -rdlap 2321/udp # RDLAP -ofsd 2322/tcp # ofsd -ofsd 2322/udp # ofsd -cosmocall 2324/tcp # Cosmocall -cosmocall 2324/udp # Cosmocall -idcp 2326/tcp # IDCP -idcp 2326/udp # IDCP -xingcsm 2327/tcp # xingcsm -xingcsm 2327/udp # xingcsm -nvd 2329/tcp # NVD -nvd 2329/udp # NVD -tscchat 2330/tcp # TSCCHAT -tscchat 2330/udp # TSCCHAT -agentview 2331/tcp # AGENTVIEW -agentview 2331/udp # AGENTVIEW -snapp 2333/tcp # SNAPP -snapp 2333/udp # SNAPP -appleugcontrol 2336/tcp # Apple UG Control -appleugcontrol 2336/udp # Apple UG Control -ideesrv 2337/tcp # ideesrv -ideesrv 2337/udp # ideesrv -xiostatus 2341/tcp # XIO Status -xiostatus 2341/udp # XIO Status -fcmsys 2344/tcp # fcmsys -fcmsys 2344/udp # fcmsys -dbm 2345/tcp # dbm -dbm 2345/udp # dbm -psbserver 2350/tcp # psbserver -psbserver 2350/udp # psbserver -psrserver 2351/tcp # psrserver -psrserver 2351/udp # psrserver -pslserver 2352/tcp # pslserver -pslserver 2352/udp # pslserver -pspserver 2353/tcp # pspserver -pspserver 2353/udp # pspserver -psprserver 2354/tcp # psprserver -psprserver 2354/udp # psprserver -psdbserver 2355/tcp # psdbserver -psdbserver 2355/udp # psdbserver -gxtelmd 2356/tcp # GXT License Managemant -gxtelmd 2356/udp # GXT License Managemant -futrix 2358/tcp # Futrix -futrix 2358/udp # Futrix -flukeserver 2359/tcp # FlukeServer -flukeserver 2359/udp # FlukeServer -nexstorindltd 2360/tcp # NexstorIndLtd -nexstorindltd 2360/udp # NexstorIndLtd -tl1 2361/tcp # TL1 -tl1 2361/udp # TL1 -ovsessionmgr 2389/tcp # OpenView Session Mgr -ovsessionmgr 2389/udp # OpenView Session Mgr -rsmtp 2390/tcp # RSMTP -rsmtp 2390/udp # RSMTP -tacticalauth 2392/tcp # Tactical Auth -tacticalauth 2392/udp # Tactical Auth -wusage 2396/tcp # Wusage -wusage 2396/udp # Wusage -ncl 2397/tcp # NCL -ncl 2397/udp # NCL -orbiter 2398/tcp # Orbiter -orbiter 2398/udp # Orbiter -cvspserver 2401/tcp # cvspserver -cvspserver 2401/udp # cvspserver -taskmaster2000 2402/tcp # TaskMaster 2000 Server -taskmaster2000 2402/udp # TaskMaster 2000 Server -taskmaster2000 2403/tcp # TaskMaster 2000 Web -taskmaster2000 2403/udp # TaskMaster 2000 Web -jediserver 2406/tcp # JediServer -jediserver 2406/udp # JediServer -orion 2407/tcp # Orion -orion 2407/udp # Orion -optimanet 2408/tcp # OptimaNet -optimanet 2408/udp # OptimaNet -cdn 2412/tcp # CDN -cdn 2412/udp # CDN -interlingua 2414/tcp # Interlingua -interlingua 2414/udp # Interlingua -comtest 2415/tcp # COMTEST -comtest 2415/udp # COMTEST -rmtserver 2416/tcp # RMT Server -rmtserver 2416/udp # RMT Server -cas 2418/tcp # cas -cas 2418/udp # cas -crmsbits 2422/tcp # CRMSBITS -crmsbits 2422/udp # CRMSBITS -rnrp 2423/tcp # RNRP -rnrp 2423/udp # RNRP -fjitsuappmgr 2425/tcp # Fujitsu App Manager -fjitsuappmgr 2425/udp # Fujitsu App Manager -applianttcp 2426/tcp # Appliant TCP -appliantudp 2426/udp # Appliant UDP -stgcp 2427/tcp # Simple telephony Gateway Control Protocol -stgcp 2427/udp # Simple telephony Gateway Control Protocol -ott 2428/tcp # One Way Trip Time -ott 2428/udp # One Way Trip Time -venus 2430/tcp # venus -venus 2430/udp # venus -codasrv 2432/tcp # codasrv -codasrv 2432/udp # codasrv -optilogic 2435/tcp # OptiLogic -optilogic 2435/udp # OptiLogic -topx 2436/tcp # TOP/X -topx 2436/udp # TOP/X -unicontrol 2437/tcp # UniControl -unicontrol 2437/udp # UniControl -msp 2438/tcp # MSP -msp 2438/udp # MSP -sybasedbsynch 2439/tcp # SybaseDBSynch -sybasedbsynch 2439/udp # SybaseDBSynch -spearway 2440/tcp # Spearway Lockers -spearway 2440/udp # Spearway Lockser -netangel 2442/tcp # Netangel -netangel 2442/udp # Netangel -powerclientcsf 2443/tcp # PowerClient Central Storage Facility -powerclientcsf 2443/udp # PowerClient Central Storage Facility -btpp2sectrans 2444/tcp # BT PP2 Sectrans -btpp2sectrans 2444/udp # BT PP2 Sectrans -dtn1 2445/tcp # DTN1 -dtn1 2445/udp # DTN1 -ovwdb 2447/tcp # OpenView NNM daemon -ovwdb 2447/udp # OpenView NNM daemon -hpppssvr 2448/tcp # hpppsvr -hpppssvr 2448/udp # hpppsvr -ratl 2449/tcp # RATL -ratl 2449/udp # RATL -netadmin 2450/tcp # netadmin -netadmin 2450/udp # netadmin -netchat 2451/tcp # netchat -netchat 2451/udp # netchat -snifferclient 2452/tcp # SnifferClient -snifferclient 2452/udp # SnifferClient -griffin 2458/tcp # griffin -griffin 2458/udp # griffin -community 2459/tcp # Community -community 2459/udp # Community -qadmifoper 2461/tcp # qadmifoper -qadmifoper 2461/udp # qadmifoper -qadmifevent 2462/tcp # qadmifevent -qadmifevent 2462/udp # qadmifevent -lbm 2465/tcp # Load Balance Management -lbm 2465/udp # Load Balance Management -lbf 2466/tcp # Load Balance Forwarding -lbf 2466/udp # Load Balance Forwarding -seaodbc 2471/tcp # SeaODBC -seaodbc 2471/udp # SeaODBC -c3 2472/tcp # C3 -c3 2472/udp # C3 -vitalanalysis 2474/tcp # Vital Analysis -vitalanalysis 2474/udp # Vital Analysis -lingwood 2480/tcp # Lingwood's Detail -lingwood 2480/udp # Lingwood's Detail -giop 2481/tcp # Oracle GIOP -giop 2481/udp # Oracle GIOP -ttc 2483/tcp # Oracle TTC -ttc 2483/udp # Oracel TTC -netobjects1 2485/tcp # Net Objects1 -netobjects1 2485/udp # Net Objects1 -netobjects2 2486/tcp # Net Objects2 -netobjects2 2486/udp # Net Objects2 -pns 2487/tcp # Policy Notice Service -pns 2487/udp # Policy Notice Service -tsilb 2489/tcp # TSILB -tsilb 2489/udp # TSILB -groove 2492/tcp # GROOVE -groove 2492/udp # GROOVE -dirgis 2496/tcp # DIRGIS -dirgis 2496/udp # DIRGIS -quaddb 2497/tcp # Quad DB -quaddb 2497/udp # Quad DB -unicontrol 2499/tcp # UniControl -unicontrol 2499/udp # UniControl -rtsserv 2500/tcp # Resource Tracking system server -rtsserv 2500/udp # Resource Tracking system server -rtsclient 2501/tcp # Resource Tracking system client -rtsclient 2501/udp # Resource Tracking system client -wlbs 2504/tcp # WLBS -wlbs 2504/udp # WLBS -jbroker 2506/tcp # jbroker -jbroker 2506/udp # jbroker -spock 2507/tcp # spock -spock 2507/udp # spock -datastore 2508/tcp # datastore -datastore 2508/udp # datastore -fjmpss 2509/tcp # fjmpss -fjmpss 2509/udp # fjmpss -fjappmgrbulk 2510/tcp # fjappmgrbulk -fjappmgrbulk 2510/udp # fjappmgrbulk -metastorm 2511/tcp # Metastorm -metastorm 2511/udp # Metastorm -citrixima 2512/tcp # Citrix IMA -citrixima 2512/udp # Citrix IMA -citrixadmin 2513/tcp # Citrix ADMIN -citrixadmin 2513/udp # Citrix ADMIN -maincontrol 2516/tcp # Main Control -maincontrol 2516/udp # Main Control -willy 2518/tcp # Willy -willy 2518/udp # Willy -globmsgsvc 2519/tcp # globmsgsvc -globmsgsvc 2519/udp # globmsgsvc -pvsw 2520/tcp # pvsw -pvsw 2520/udp # pvsw -adaptecmgr 2521/tcp # Adaptec Manager -adaptecmgr 2521/udp # Adaptec Manager -windb 2522/tcp # WinDb -windb 2522/udp # WinDb -iqserver 2527/tcp # IQ Server -iqserver 2527/udp # IQ Server -utsftp 2529/tcp # UTS FTP -utsftp 2529/udp # UTS FTP -vrcommerce 2530/tcp # VR Commerce -vrcommerce 2530/udp # VR Commerce -ovtopmd 2532/tcp # OVTOPMD -ovtopmd 2532/udp # OVTOPMD -snifferserver 2533/tcp # SnifferServer -snifferserver 2533/udp # SnifferServer -mdhcp 2535/tcp # MDHCP -mdhcp 2535/udp # MDHCP -btpp2audctr1 2536/tcp # btpp2audctr1 -btpp2audctr1 2536/udp # btpp2audctr1 -upgrade 2537/tcp # Upgrade Protocol -upgrade 2537/udp # Upgrade Protocol -vsiadmin 2539/tcp # VSI Admin -vsiadmin 2539/udp # VSI Admin -lonworks 2540/tcp # LonWorks -lonworks 2540/udp # LonWorks -lonworks2 2541/tcp # LonWorks2 -lonworks2 2541/udp # LonWorks2 -davinci 2542/tcp # daVinci -davinci 2542/udp # daVinci -reftek 2543/tcp # REFTEK -reftek 2543/udp # REFTEK -vytalvaultbrtp 2546/tcp # vytalvaultbrtp -vytalvaultbrtp 2546/udp # vytalvaultbrtp -vytalvaultvsmp 2547/tcp # vytalvaultvsmp -vytalvaultvsmp 2547/udp # vytalvaultvsmp -vytalvaultpipe 2548/tcp # vytalvaultpipe -vytalvaultpipe 2548/udp # vytalvaultpipe -ipass 2549/tcp # IPASS -ipass 2549/udp # IPASS -ads 2550/tcp # ADS -ads 2550/udp # ADS -efidiningport 2553/tcp # efidiningport -efidiningport 2553/udp # efidiningport -pclemultimedia 2558/tcp # PCLE Multi Media -pclemultimedia 2558/udp # PCLE Multi Media -lstp 2559/tcp # LSTP -lstp 2559/udp # LSTP -labrat 2560/tcp # labrat -labrat 2560/udp # labrat -mosaixcc 2561/tcp # MosaixCC -mosaixcc 2561/udp # MosaixCC -delibo 2562/tcp # Delibo -delibo 2562/udp # Delibo -clp 2567/tcp # Cisco Line Protocol -clp 2567/udp # Cisco Line Protocol -spamtrap 2568/tcp # SPAM TRAP -spamtrap 2568/udp # SPAM TRAP -sonuscallsig 2569/tcp # Sonus Call Signal -sonuscallsig 2569/udp # Sonus Call Signal -cecsvc 2571/tcp # CECSVC -cecsvc 2571/udp # CECSVC -ibp 2572/tcp # IBP -ibp 2572/udp # IBP -trustestablish 2573/tcp # Trust Establish -trustestablish 2573/udp # Trust Establish -hl7 2575/tcp # HL7 -hl7 2575/udp # HL7 -tclprodebugger 2576/tcp # TCL Pro Debugger -tclprodebugger 2576/udp # TCL Pro Debugger -scipticslsrvr 2577/tcp # Scriptics Lsrvr -scipticslsrvr 2577/udp # Scriptics Lsrvr -mpfoncl 2579/tcp # mpfoncl -mpfoncl 2579/udp # mpfoncl -tributary 2580/tcp # Tributary -tributary 2580/udp # Tributary -mon 2583/tcp # MON -mon 2583/udp # MON -cyaserv 2584/tcp # cyaserv -cyaserv 2584/udp # cyaserv -masc 2587/tcp # MASC -masc 2587/udp # MASC -privilege 2588/tcp # Privilege -privilege 2588/udp # Privilege -idotdist 2590/tcp # idotdist -idotdist 2590/udp # idotdist -maytagshuffle 2591/tcp # Maytag Shuffle -maytagshuffle 2591/udp # Maytag Shuffle -netrek 2592/tcp # netrek -netrek 2592/udp # netrek -dts 2594/tcp # Data Base Server -dts 2594/udp # Data Base Server -worldfusion1 2595/tcp # World Fusion 1 -worldfusion1 2595/udp # World Fusion 1 -worldfusion2 2596/tcp # World Fusion 2 -worldfusion2 2596/udp # World Fusion 2 -homesteadglory 2597/tcp # Homestead Glory -homesteadglory 2597/udp # Homestead Glory -citriximaclient 2598/tcp # Citrix MA Client -citriximaclient 2598/udp # Citrix MA Client -meridiandata 2599/tcp # Meridian Data -meridiandata 2599/udp # Meridian Data -hpstgmgr 2600/tcp # HPSTGMGR -hpstgmgr 2600/udp # HPSTGMGR -servicemeter 2603/tcp # Service Meter -servicemeter 2603/udp # Service Meter -netmon 2606/tcp # Dell Netmon -netmon 2606/udp # Dell Netmon -connection 2607/tcp # Dell Connection -connection 2607/udp # Dell Connection -lionhead 2611/tcp # LIONHEAD -lionhead 2611/udp # LIONHEAD -smntubootstrap 2613/tcp # SMNTUBootstrap -smntubootstrap 2613/udp # SMNTUBootstrap -neveroffline 2614/tcp # Never Off Line -neveroffline 2614/udp # Never Off Line -firepower 2615/tcp # firepower -firepower 2615/udp # firepower -cmadmin 2617/tcp # Clinical Context Managers -cmadmin 2617/udp # Clinical Context Managers -bruce 2619/tcp # bruce -bruce 2619/udp # bruce -lpsrecommender 2620/tcp # LPSRecommender -lpsrecommender 2620/udp # LPSRecommender -dict 2628/tcp # DICT -dict 2628/udp # DICT -sitaraserver 2629/tcp # Sitara Server -sitaraserver 2629/udp # Sitara Server -sitaramgmt 2630/tcp # Sitara Management -sitaramgmt 2630/udp # Sitara Management -sitaradir 2631/tcp # Sitara Dir -sitaradir 2631/udp # Sitara Dir -interintelli 2633/tcp # InterIntelli -interintelli 2633/udp # InterIntelli -backburner 2635/tcp # Back Burner -backburner 2635/udp # Back Burner -solve 2636/tcp # Solve -solve 2636/udp # Solve -imdocsvc 2637/tcp # Import Document Service -imdocsvc 2637/udp # Import Document Service -sybaseanywhere 2638/tcp # Sybase Anywhere -sybaseanywhere 2638/udp # Sybase Anywhere -aminet 2639/tcp # AMInet -aminet 2639/udp # AMInet -tragic 2642/tcp # Tragic -tragic 2642/udp # Tragic -syncserver 2647/tcp # SyncServer -syncserver 2647/udp # SyncServer -upsnotifyprot 2648/tcp # Upsnotifyprot -upsnotifyprot 2648/udp # Upsnotifyprot -vpsipport 2649/tcp # VPSIPPORT -vpsipport 2649/udp # VPSIPPORT -eristwoguns 2650/tcp # eristwoguns -eristwoguns 2650/udp # eristwoguns -ebinsite 2651/tcp # EBInSite -ebinsite 2651/udp # EBInSite -interpathpanel 2652/tcp # InterPathPanel -interpathpanel 2652/udp # InterPathPanel -sonus 2653/tcp # Sonus -sonus 2653/udp # Sonus -unglue 2655/tcp # UNIX Nt Glue -unglue 2655/udp # UNIX Nt Glue -kana 2656/tcp # Kana -kana 2656/udp # Kana -gcmonitor 2660/tcp # GC Monitor -gcmonitor 2660/udp # GC Monitor -olhost 2661/tcp # OLHOST -olhost 2661/udp # OLHOST -extensis 2666/tcp # extensis -extensis 2666/udp # extensis -toad 2669/tcp # TOAD -toad 2669/udp # TOAD -newlixreg 2671/tcp # newlixreg -newlixreg 2671/udp # newlixreg -nhserver 2672/tcp # nhserver -nhserver 2672/udp # nhserver -firstcall42 2673/tcp # First Call 42 -firstcall42 2673/udp # First Call 42 -ewnn 2674/tcp # ewnn -ewnn 2674/udp # ewnn -simslink 2676/tcp # SIMSLink -simslink 2676/udp # SIMSLink -gadgetgate1way 2677/tcp # Gadget Gate 1 Way -gadgetgate1way 2677/udp # Gadget Gate 1 Way -gadgetgate2way 2678/tcp # Gadget Gate 2 Way -gadgetgate2way 2678/udp # Gadget Gate 2 Way -syncserverssl 2679/tcp # Sync Server SSL -syncserverssl 2679/udp # Sync Server SSL -mpnjsomb 2681/tcp # mpnjsomb -mpnjsomb 2681/udp # mpnjsomb -srsp 2682/tcp # SRSP -srsp 2682/udp # SRSP -ncdloadbalance 2683/tcp # NCDLoadBalance -ncdloadbalance 2683/udp # NCDLoadBalance -mpnjsosv 2684/tcp # mpnjsosv -mpnjsosv 2684/udp # mpnjsosv -mpnjsocl 2685/tcp # mpnjsocl -mpnjsocl 2685/udp # mpnjsocl -mpnjsomg 2686/tcp # mpnjsomg -mpnjsomg 2686/udp # mpnjsomg -fastlynx 2689/tcp # FastLynx -fastlynx 2689/udp # FastLynx -tqdata 2700/tcp # tqdata -tqdata 2700/udp # tqdata -piccolo 2787/tcp # piccolo - Cornerstone Software -piccolo 2787/udp # piccolo - Cornerstone Software -fryeserv 2788/tcp # NetWare Loadable Module - Seagate Software -fryeserv 2788/udp # NetWare Loadable Module - Seagate Software -mao 2908/tcp # mao -mao 2908/udp # mao -tdaccess 2910/tcp # TDAccess -tdaccess 2910/udp # TDAccess -blockade 2911/tcp # Blockade -blockade 2911/udp # Blockade -epicon 2912/tcp # Epicon -epicon 2912/udp # Epicon -boosterware 2913/tcp # Booster Ware -boosterware 2913/udp # Booster Ware -gamelobby 2914/tcp # Game Lobby -gamelobby 2914/udp # Game Lobby -tksocket 2915/tcp # TK Socket -tksocket 2915/udp # TK Socket -kastenchasepad 2918/tcp # Kasten Chase Pad -kastenchasepad 2918/udp # Kasten Chase Pad -netclip 2971/tcp # Net Clip -netclip 2971/udp # Net Clip -svnetworks 2973/tcp # SV Networks -svnetworks 2973/udp # SV Networks -signal 2974/tcp # Signal -signal 2974/udp # Signal -fjmpcm 2975/tcp # Fujitsu Configuration Management Service -fjmpcm 2975/udp # Fujitsu Configuration Management Service -realsecure 2998/tcp # Real Secure -realsecure 2998/udp # Real Secure -hbci 3000/tcp # HBCI -hbci 3000/udp # HBCI -cgms 3003/tcp # CGMS -cgms 3003/udp # CGMS -csoftragent 3004/tcp # Csoft Agent -csoftragent 3004/udp # Csoft Agent -geniuslm 3005/tcp # Genius License Manager -geniuslm 3005/udp # Genius License Manager -lotusmtap 3007/tcp # Lotus Mail Tracking Agent Protocol -lotusmtap 3007/udp # Lotus Mail Tracking Agent Protocol -gw 3010/tcp # Telerate Workstation -twsdss 3012/tcp # Trusted Web Client -twsdss 3012/udp # Trusted Web Client -gilatskysurfer 3013/tcp # Gilat Sky Surfer -gilatskysurfer 3013/udp # Gilat Sky Surfer -cifs 3020/tcp # CIFS -cifs 3020/udp # CIFS -agriserver 3021/tcp # AGRI Server -agriserver 3021/udp # AGRI Server -csregagent 3022/tcp # CSREGAGENT -csregagent 3022/udp # CSREGAGENT -magicnotes 3023/tcp # magicnotes -magicnotes 3023/udp # magicnotes -agentvu 3031/tcp # AgentVU -agentvu 3031/udp # AgentVU -pdb 3033/tcp # PDB -pdb 3033/udp # PDB -cogitate 3039/tcp # Cogitate, Inc. -cogitate 3039/udp # Cogitate, Inc. -journee 3042/tcp # journee -journee 3042/udp # journee -brp 3043/tcp # BRP -brp 3043/udp # BRP -responsenet 3045/tcp # ResponseNet -responsenet 3045/udp # ResponseNet -hlserver 3047/tcp # Fast Security HL Server -hlserver 3047/udp # Fast Security HL Server -pctrader 3048/tcp # Sierra Net PC Trader -pctrader 3048/udp # Sierra Net PC Trader -nsws 3049/tcp # NSWS -nsws 3049/udp # NSWS -interserver 3060/tcp # interserver -interserver 3060/udp # interserver -cardbox 3105/tcp # Cardbox -cardbox 3105/udp # Cardbox -icpv2 3130/tcp # ICPv2 -icpv2 3130/udp # ICPv2 -netbookmark 3131/tcp # Net Book Mark -netbookmark 3131/udp # Net Book Mark -vmodem 3141/tcp # VMODEM -vmodem 3141/udp # VMODEM -seaview 3143/tcp # Sea View -seaview 3143/udp # Sea View -tarantella 3144/tcp # Tarantella -tarantella 3144/udp # Tarantella -rfio 3147/tcp # RFIO -rfio 3147/udp # RFIO -ccmail 3264/tcp # cc:mail/lotus -ccmail 3264/udp # cc:mail/lotus -verismart 3270/tcp # Verismart -verismart 3270/udp # Verismart -sxmp 3273/tcp # Simple Extensible Multiplexed Protocol -sxmp 3273/udp # Simple Extensible Multiplexed Protocol -samd 3275/tcp # SAMD -samd 3275/udp # SAMD -lkcmserver 3278/tcp # LKCM Server -lkcmserver 3278/udp # LKCM Server -admind 3279/tcp # admind -admind 3279/udp # admind -sysopt 3281/tcp # SYSOPT -sysopt 3281/udp # SYSOPT -datusorb 3282/tcp # Datusorb -datusorb 3282/udp # Datusorb -plato 3285/tcp # Plato -plato 3285/udp # Plato -directvdata 3287/tcp # DIRECTVDATA -directvdata 3287/udp # DIRECTVDATA -cops 3288/tcp # COPS -cops 3288/udp # COPS -enpc 3289/tcp # ENPC -enpc 3289/udp # ENPC -dyniplookup 3295/tcp # Dynamic IP Lookup -dyniplookup 3295/udp # Dynamic IP Lookup -transview 3298/tcp # Transview -transview 3298/udp # Transview -pdrncs 3299/tcp # pdrncs -pdrncs 3299/udp # pdrncs -bmcpatrolagent 3300/tcp # BMC Patrol Agent -bmcpatrolagent 3300/udp # BMC Patrol Agent -bmcpatrolrnvu 3301/tcp # BMC Patrol Rendezvous -bmcpatrolrnvu 3301/udp # BMC Patrol Rendezvous -mysql 3306/tcp # MySQL -mysql 3306/udp # MySQL -uorb 3313/tcp # Unify Object Broker -uorb 3313/udp # Unify Object Broker -uohost 3314/tcp # Unify Object Host -uohost 3314/udp # Unify Object Host -cdid 3315/tcp # CDID -cdid 3315/udp # CDID -vsaiport 3317/tcp # VSAI PORT -vsaiport 3317/udp # VSAI PORT -ssrip 3318/tcp # Swith to Swith Routing Information Protocol -ssrip 3318/udp # Swith to Swith Routing Information Protocol -officelink2000 3320/tcp # Office Link 2000 -officelink2000 3320/udp # Office Link 2000 -vnsstr 3321/tcp # VNSSTR -vnsstr 3321/udp # VNSSTR -sftu 3326/tcp # SFTU -sftu 3326/udp # SFTU -bbars 3327/tcp # BBARS -bbars 3327/udp # BBARS -egptlm 3328/tcp # Eaglepoint License Manager -egptlm 3328/udp # Eaglepoint License Manager -webtie 3342/tcp # WebTIE -webtie 3342/udp # WebTIE -influence 3345/tcp # Influence -influence 3345/udp # Influence -trnsprntproxy 3346/tcp # Trnsprnt Proxy -trnsprntproxy 3346/udp # Trnsprnt Proxy -chevinservices 3349/tcp # Chevin Services -chevinservices 3349/udp # Chevin Services -findviatv 3350/tcp # FINDVIATV -findviatv 3350/udp # FINDVIATV -btrieve 3351/tcp # BTRIEVE -btrieve 3351/udp # BTRIEVE -ssql 3352/tcp # SSQL -ssql 3352/udp # SSQL -fatpipe 3353/tcp # FATPIPE -fatpipe 3353/udp # FATPIPE -suitjd 3354/tcp # SUITJD -suitjd 3354/udp # SUITJD -upnotifyps 3356/tcp # UPNOTIFYPS -upnotifyps 3356/udp # UPNOTIFYPS -mpsysrmsvr 3358/tcp # Mp Sys Rmsvr -mpsysrmsvr 3358/udp # Mp Sys Rmsvr -creativeserver 3364/tcp # Creative Server -creativeserver 3364/udp # Creative Server -contentserver 3365/tcp # Content Server -contentserver 3365/udp # Content Server -creativepartnr 3366/tcp # Creative Partner -creativepartnr 3366/udp # Creative Partner -tip2 3372/tcp # TIP 2 -tip2 3372/udp # TIP 2 -cdborker 3376/tcp # CD Broker -cdbroker 3376/udp # CD Broker -wsicopy 3378/tcp # WSICOPY -wsicopy 3378/udp # WSICOPY -socorfs 3379/tcp # SOCORFS -socorfs 3379/udp # SOCORFS -geneous 3381/tcp # Geneous -geneous 3381/udp # Geneous -qnxnetman 3385/tcp # qnxnetman -qnxnetman 3385/udp # qnxnetman -backroomnet 3387/tcp # Back Room Net -backroomnet 3387/udp # Back Room Net -cbserver 3388/tcp # CB Server -cbserver 3388/udp # CB Server -dsc 3390/tcp # Distributed Service Coordinator -dsc 3390/udp # Distributed Service Coordinator -savant 3391/tcp # SAVANT -savant 3391/udp # SAVANT -mercantile 3398/tcp # Mercantile -mercantile 3398/udp # Mercantile -csms 3399/tcp # CSMS -csms 3399/udp # CSMS -csms2 3400/tcp # CSMS2 -csms2 3400/udp # CSMS2 -bmap 3421/tcp # Bull Apprise portmapper -bmap 3421/udp # Bull Apprise portmapper -mira 3454/tcp # Apple Remote Access Protocol -prsvp 3455/tcp # RSVP Port -prsvp 3455/udp # RSVP Port -vat 3456/tcp # VAT default data -vat 3456/udp # VAT default data -d3winosfi 3458/tcp # D3WinOsfi -d3winosfi 3458/udp # DsWinOSFI -integral 3459/tcp # Integral -integral 3459/udp # Integral -workflow 3466/tcp # WORKFLOW -workflow 3466/udp # WORKFLOW -rcst 3467/tcp # RCST -rcst 3467/udp # RCST -ttcmremotectrl 3468/tcp # TTCM Remote Controll -ttcmremotectrl 3468/udp # TTCM Remote Controll -pluribus 3469/tcp # Pluribus -pluribus 3469/udp # Pluribus -jt400 3470/tcp # jt400 -jt400 3470/udp # jt400 -watcomdebug 3563/tcp # Watcom Debug -watcomdebug 3563/udp # Watcom Debug -harlequinorb 3672/tcp # harlequinorb -harlequinorb 3672/udp # harlequinorb -centerline 3987/tcp # Centerline -centerline 3987/udp # Centerline -terabase 4000/tcp # Terabase -terabase 4000/udp # Terabase -newoak 4001/tcp # NewOak -newoak 4001/udp # NewOak -netcheque 4008/tcp # NetCheque accounting -netcheque 4008/udp # NetCheque accounting -altserviceboot 4011/tcp # Alternate Service Boot -altserviceboot 4011/udp # Alternate Service Boot -taiclock 4014/tcp # TAICLOCK -taiclock 4014/udp # TAICLOCK -bre 4096/tcp # BRE (Bridge Relay Element) -bre 4096/udp # BRE (Bridge Relay Element) -patrolview 4097/tcp # Patrol View -patrolview 4097/udp # Patrol View -drmsfsd 4098/tcp # drmsfsd -drmsfsd 4098/udp # drmsfsd -dpcp 4099/tcp # DPCP -dpcp 4099/udp # DPCP -oirtgsvc 4141/tcp # Workflow Server -oirtgsvc 4141/udp # Workflow Server -oidocsvc 4142/tcp # Document Server -oidocsvc 4142/udp # Document Server -oidsr 4143/tcp # Document Replication -oidsr 4143/udp # Document Replication -corelccam 4300/tcp # Corel CCam -corelccam 4300/udp # Corel CCam -rwhois 4321/tcp # Remote Who Is -rwhois 4321/udp # Remote Who Is -unicall 4343/tcp # UNICALL -unicall 4343/udp # UNICALL -vinainstall 4344/tcp # VinaInstall -vinainstall 4344/udp # VinaInstall -elanlm 4346/tcp # ELAN LM -elanlm 4346/udp # ELAN LM -lansurveyor 4347/tcp # LAN Surveyor -lansurveyor 4347/udp # LAN Surveyor -itose 4348/tcp # ITOSE -itose 4348/udp # ITOSE -fsportmap 4349/tcp # File System Port Map -fsportmap 4349/udp # File System Port Map -saris 4442/tcp # Saris -saris 4442/udp # Saris -pharos 4443/tcp # Pharos -pharos 4443/udp # Pharos -krb524 4444/tcp # KRB524 -krb524 4444/udp # KRB524 -upnotifyp 4445/tcp # UPNOTIFYP -upnotifyp 4445/udp # UPNOTIFYP -privatewire 4449/tcp # PrivateWire -privatewire 4449/udp # PrivateWire -camp 4450/tcp # Camp -camp 4450/udp # Camp -ctisystemmsg 4451/tcp # CTI System Msg -ctisystemmsg 4451/udp # CTI System Msg -ctiprogramload 4452/tcp # CTI Program Load -ctiprogramload 4452/udp # CTI Program Load -nssalertmgr 4453/tcp # NSS Alert Manager -nssalertmgr 4453/udp # NSS Alert Manager -nssagentmgr 4454/tcp # NSS Agent Manager -nssagentmgr 4454/udp # NSS Agent Manager -prRegister 4457/tcp # PR Register -prRegister 4457/udp # PR Register -worldscores 4545/tcp # WorldScores -worldscores 4545/udp # WorldScores -piranha1 4600/tcp # Piranha1 -piranha1 4600/udp # Piranha1 -piranha2 4601/tcp # Piranha2 -piranha2 4601/udp # Piranha2 -rfa 4672/tcp # remote file access server -rfa 4672/udp # remote file access server -iims 4800/tcp # Icona Instant Messenging System -iims 4800/udp # Icona Instant Messenging System -iwec 4801/tcp # Icona Web Embedded Chat -iwec 4801/udp # Icona Web Embedded Chat -ilss 4802/tcp # Icona License System Server -ilss 4802/udp # Icona License System Server -htcp 4827/tcp # HTCP -htcp 4827/udp # HTCP -phrelay 4868/tcp # Photon Relay -phrelay 4868/udp # Photon Relay -phrelaydbg 4869/tcp # Photon Relay Debug -phrelaydbg 4869/udp # Photon Relay Debug -abbs 4885/tcp # ABBS -abbs 4885/udp # ABBS -rfe 5002/tcp # radio free ethernet -rfe 5002/udp # radio free ethernet -telelpathstart 5010/tcp # TelepathStart -telelpathstart 5010/udp # TelepathStart -telelpathattack 5011/tcp # TelepathAttack -telelpathattack 5011/udp # TelepathAttack -asnaacceler8db 5042/tcp # asnaacceler8db -asnaacceler8db 5042/udp # asnaacceler8db -mmcc 5050/tcp # multimedia conference control tool -mmcc 5050/udp # multimedia conference control tool -sip 5060/tcp # SIP -sip 5060/udp # SIP -atmp 5150/tcp # Ascend Tunnel Management Protocol -atmp 5150/udp # Ascend Tunnel Management Protocol -aol 5190/tcp # America-Online -aol 5190/udp # America-Online -padl2sim 5236/tcp -padl2sim 5236/udp -pk 5272/tcp # PK -pk 5272/udp # PK -cfengine 5308/tcp # CFengine -cfengine 5308/udp # CFengine -jprinter 5309/tcp # J Printer -jprinter 5309/udp # J Printer -outlaws 5310/tcp # Outlaws -outlaws 5310/udp # Outlaws -tmlogin 5311/tcp # TM Login -tmlogin 5311/udp # TM Login -excerpt 5400/tcp # Excerpt Search -excerpt 5400/udp # Excerpt Search -excerpts 5401/tcp # Excerpt Search Secure -excerpts 5401/udp # Excerpt Search Secure -mftp 5402/tcp # MFTP -mftp 5402/udp # MFTP -netsupport 5405/tcp # NetSupport -netsupport 5405/udp # NetSupport -actnet 5411/tcp # ActNet -actnet 5411/udp # ActNet -continuus 5412/tcp # Continuus -continuus 5412/udp # Continuus -wwiotalk 5413/tcp # WWIOTALK -wwiotalk 5413/udp # WWIOTALK -statusd 5414/tcp # StatusD -statusd 5414/udp # StatusD -mcntp 5418/tcp # MCNTP -mcntp 5418/udp # MCNTP -esinstall 5599/tcp # Enterprise Security Remote Install -esinstall 5599/udp # Enterprise Security Remote Install -esmmanager 5600/tcp # Enterprise Security Manager -esmmanager 5600/udp # Enterprise Security Manager -esmagent 5601/tcp # Enterprise Security Agent -esmagent 5601/udp # Enterprise Security Agent -pcanywheredata 5631/tcp # pcANYWHEREdata -pcanywheredata 5631/udp # pcANYWHEREdata -pcanywherestat 5632/tcp # pcANYWHEREstat -pcanywherestat 5632/udp # pcANYWHEREstat -rrac 5678/tcp # Remote Replication Agent Connection -rrac 5678/udp # Remote Replication Agent Connection -dccm 5679/tcp # Direct Cable Connect Manager -dccm 5679/udp # Direct Cable Connect Manager -proshareaudio 5713/tcp # proshare conf audio -proshareaudio 5713/udp # proshare conf audio -prosharevideo 5714/tcp # proshare conf video -prosharevideo 5714/udp # proshare conf video -prosharedata 5715/tcp # proshare conf data -prosharedata 5715/udp # proshare conf data -prosharerequest 5716/tcp # proshare conf request -prosharerequest 5716/udp # proshare conf request -prosharenotify 5717/tcp # proshare conf notify -prosharenotify 5717/udp # proshare conf notify -openmail 5729/tcp # Openmail User Agent Layer -openmail 5729/udp # Openmail User Agent Layer -openmailg 5755/tcp # OpenMail Desk Gateway server -openmailg 5755/udp # OpenMail Desk Gateway server -x500ms 5757/tcp # OpenMail X.500 Directory Server -x500ms 5757/udp # OpenMail X.500 Directory Server -openmailns 5766/tcp # OpenMail NewMail Server -openmailns 5766/udp # OpenMail NewMail Server -openmailpxy 5768/tcp # OpenMail CMTS Server -openmailpxy 5768/udp # OpenMail CMTS Server -softcm 6110/tcp # HP SoftBench CM -softcm 6110/udp # HP SoftBench CM -spc 6111/tcp # HP SoftBench Sub-Process Control -spc 6111/udp # HP SoftBench Sub-Process Control -dtspcd 6112/tcp # dtspcd -dtspcd 6112/udp # dtspcd -crip 6253/tcp # CRIP -crip 6253/udp # CRIP -boks 6500/tcp # BoKS Master -boks 6500/udp # BoKS Master -xdsxdm 6558/tcp -xdsxdm 6558/udp -hnmp 6790/tcp # HNMP -hnmp 6790/udp # HNMP -jmact3 6961/tcp # JMACT3 -jmact3 6961/udp # JMACT3 -jmevt2 6962/tcp # jmevt2 -jmevt2 6962/udp # jmevt2 -swismgr1 6963/tcp # swismgr1 -swismgr1 6963/udp # swismgr1 -swismgr2 6964/tcp # swismgr2 -swismgr2 6964/udp # swismgr2 -swistrap 6965/tcp # swistrap -swistrap 6965/udp # swistrap -swispol 6966/tcp # swispol -swispol 6966/udp # swispol -acmsoda 6969/tcp # acmsoda -acmsoda 6969/udp # acmsoda -dpserve 7020/tcp # DP Serve -dpserve 7020/udp # DP Serve -dpserveadmin 7021/tcp # DP Serve Admin -dpserveadmin 7021/udp # DP Serve Admin -raudio 7070/tcp @ Real Audio -arcp 7070/tcp # ARCP -arcp 7070/udp # ARCP -clutild 7174/tcp # Clutild -clutild 7174/udp # Clutild -fodms 7200/tcp # FODMS FLIP -fodms 7200/udp # FODMS FLIP -dlip 7201/tcp # DLIP -dlip 7201/udp # DLIP -winqedit 7395/tcp # winqedit -winqedit 7395/udp # winqedit -pmdmgr 7426/tcp # OpenView DM Postmaster Manager -pmdmgr 7426/udp # OpenView DM Postmaster Manager -oveadmgr 7427/tcp # OpenView DM Event Agent Manager -oveadmgr 7427/udp # OpenView DM Event Agent Manager -ovladmgr 7428/tcp # OpenView DM Log Agent Manager -ovladmgr 7428/udp # OpenView DM Log Agent Manager -xmpv7 7430/tcp # OpenView DM xmpv7 api pipe -xmpv7 7430/udp # OpenView DM xmpv7 api pipe -pmd 7431/tcp # OpenView DM ovc/xmpv3 api pipe -pmd 7431/udp # OpenView DM ovc/xmpv3 api pipe -faximum 7437/tcp # Faximum -faximum 7437/udp # Faximum -pmdfmgt 7633/tcp # PMDF Management -pmdfmgt 7633/udp # PMDF Management -cbt 7777/tcp # cbt -cbt 7777/udp # cbt -supercell 7967/tcp # Supercell -supercell 7967/udp # Supercell -irdmi2 7999/tcp # iRDMI2 -irdmi2 7999/udp # iRDMI2 -irdmi 8000/tcp # iRDMI -irdmi 8000/udp # iRDMI -mindprint 8033/tcp # MindPrint -mindprint 8033/udp # MindPrint -trivnet1 8200/tcp # TRIVNET -trivnet1 8200/udp # TRIVNET -trivnet2 8201/tcp # TRIVNET -trivnet2 8201/udp # TRIVNET -cvd 8400/tcp # cvd -cvd 8400/udp # cvd -sabarsd 8401/tcp # sabarsd -sabarsd 8401/udp # sabarsd -abarsd 8402/tcp # abarsd -abarsd 8402/udp # abarsd -admind 8403/tcp # admind -admind 8403/udp # admind -npmp 8450/tcp # npmp -npmp 8450/udp # npmp -vp2p 8473/tcp # Virtual Point to Point -vp2p 8473/udp # Virtual Point to Point -ibus 8733/tcp # iBus -ibus 8733/udp # iBus -cslistener 9000/tcp # CSlistener -cslistener 9000/udp # CSlistener -sctp 9006/tcp # SCTP -sctp 9006/udp # SCTP -websm 9090/tcp # WebSM -websm 9090/udp # WebSM -guibase 9321/tcp # guibase -guibase 9321/udp # guibase -mpidcmgr 9343/tcp # MpIdcMgr -mpidcmgr 9343/udp # MpIdcMgr -fjdmimgr 9374/tcp # fjdmimgr -fjdmimgr 9374/udp # fjdmimgr -fjinvmgr 9396/tcp # fjinvmgr -fjinvmgr 9396/udp # fjinvmgr -mpidcagt 9397/tcp # MpIdcAgt -mpidcagt 9397/udp # MpIdcAgt -ismserver 9500/tcp # ismserver -ismserver 9500/udp # ismserver -man 9535/tcp -man 9535/udp -msgsys 9594/tcp # Message System -msgsys 9594/udp # Message System -pds 9595/tcp # Ping Discovery Service -pds 9595/udp # Ping Discovery Service -sd 9876/tcp # Session Director -sd 9876/udp # Session Director -monkeycom 9898/tcp # MonkeyCom -monkeycom 9898/udp # MonkeyCom -palace 9992/tcp # Palace -palace 9992/udp # Palace -palace 9993/tcp # Palace -palace 9993/udp # Palace -palace 9994/tcp # Palace -palace 9994/udp # Palace -palace 9995/tcp # Palace -palace 9995/udp # Palace -palace 9996/tcp # Palace -palace 9996/udp # Palace -palace 9997/tcp # Palace -palace 9997/udp # Palace -distinct32 9998/tcp # Distinct32 -distinct32 9998/udp # Distinct32 -distinct 9999/tcp # distinct -distinct 9999/udp # distinct -ndmp 10000/tcp # Network Data Management Protocol -ndmp 10000/udp # Network Data Management Protocol -amanda 10080/tcp # Amanda -amanda 10080/udp # Amanda -blocks 10288/tcp # Blocks -blocks 10288/udp # Blocks -irisa 11000/tcp # IRISA -irisa 11000/udp # IRISA -metasys 11001/tcp # Metasys -metasys 11001/udp # Metasys -vce 11111/tcp # Viral Computing Environment (VCE) -vce 11111/udp # Viral Computing Environment (VCE) -entextxid 12000/tcp # IBM Enterprise Extender SNA XID Exchange -entextxid 12000/udp # IBM Enterprise Extender SNA XID Exchange -entextnetwk 12001/tcp # IBM Enterprise Extender SNA COS Network Priority -entextnetwk 12001/udp # IBM Enterprise Extender SNA COS Network Priority -entexthigh 12002/tcp # IBM Enterprise Extender SNA COS High Priority -entexthigh 12002/udp # IBM Enterprise Extender SNA COS High Priority -entextmed 12003/tcp # IBM Enterprise Extender SNA COS Medium Priority -entextmed 12003/udp # IBM Enterprise Extender SNA COS Medium Priority -entextlow 12004/tcp # IBM Enterprise Extender SNA COS Low Priority -entextlow 12004/udp # IBM Enterprise Extender SNA COS Low Priority -tsaf 12753/tcp # tsaf port -tsaf 12753/udp # tsaf port -bprd 13720/tcp # BPRD Protocol (VERITAS NetBackup) -bprd 13720/udp # BPRD Protocol (VERITAS NetBackup) -bpbrm 13721/tcp # BPBRM Protocol (VERITAS NetBackup) -bpbrm 13721/udp # BPBRM Protocol (VERITAS NetBackup) -bpcd 13782/tcp # VERITAS NetBackup -bpcd 13782/udp # VERITAS NetBackup -vopied 13783/tcp # VOPIED Protocol -vopied 13783/udp # VOPIED Protocol -netserialext1 16360/tcp # netserialext1 -netserialext1 16360/udp # netserialext1 -netserialext2 16361/tcp # netserialext2 -netserialext2 16361/udp # netserialext2 -netserialext3 16367/tcp # netserialext3 -netserialext3 16367/udp # netserialext3 -netserialext4 16368/tcp # netserialext4 -netserialext4 16368/udp # netserialext4 -chipper 17219/tcp # Chipper -chipper 17219/udp # Chipper -biimenu 18000/tcp # Beckman Instruments, Inc. -biimenu 18000/udp # Beckman Instruments, Inc. -jcp 19541/tcp # JCP Client -jcp 19541/udp # JCP Client -dnp 20000/tcp # DNP -dnp 20000/udp # DNP -track 20670/tcp # Track -track 20670/udp # Track -webphone 21845/tcp # webphone -webphone 21845/udp # webphone -wnn6 22273/tcp # wnn6 -wnn6 22273/udp # wnn6 -quake 26000/tcp # quake -quake 26000/udp # quake -traceroute 33434/tcp # traceroute use -traceroute 33434/udp # traceroute use -kastenxpipe 36865/tcp # KastenX Pipe -kastenxpipe 36865/udp # KastenX Pipe -eba 45678/tcp # EBA PRISE -eba 45678/udp # EBA PRISE -dbbrowse 47557/tcp # Databeam Corporation -dbbrowse 47557/udp # Databeam Corporation -directplaysrvr 47624/tcp # Direct Play Server -directplaysrvr 47624/udp # Direct Play Server -ap 47806/tcp # ALC Protocol -ap 47806/udp # ALC Protocol -bacnet 47808/tcp # Building Automation and Control Networks -bacnet 47808/udp # Building Automation and Control Networks -nimcontroller 48000/tcp # Nimbus Controller -nimcontroller 48000/udp # Nimbus Controller -nimspooler 48001/tcp # Nimbus Spooler -nimspooler 48001/udp # Nimbus Spooler -nimhub 48002/tcp # Nimbus Hub -nimhub 48002/udp # Nimbus Hub -nimgtw 48003/tcp # Nimbus Gateway -nimgtw 48003/udp # Nimbus Gateway diff --git a/contrib/ipfilter/perl/Ipfanaly.pl b/contrib/ipfilter/perl/Ipfanaly.pl deleted file mode 100644 index eda232e..0000000 --- a/contrib/ipfilter/perl/Ipfanaly.pl +++ /dev/null @@ -1,639 +0,0 @@ -#!/usr/local/bin/perl -# (C) Copyright 1998 Ivan S. Bishop (isb@notoryus.genmagic.com) -# -############### START SUBROUTINE DECLARATIONS ########### - - -sub usage { - print "\n" x 24; - print "USAGE: ipfanalyze.pl -h [-p port# or all] [-g] [-s] [-v] [-o] portnum -t [target ip address] [-f] logfilename\n"; - print "\n arguments to -p -f -o REQUIRED\n"; - print "\n -h show this help\n"; - print "\n -p limit stats/study to this port number.(eg 25 not smtp)\n"; - print " -g make graphs, one per 4 hour interval called outN.gif 1<=N<=5\n"; - print " -s make security report only (no graphical or full port info generated) \n"; - print " -o lowest port number incoming traffic can talk to and be regarded as safe\n"; - print " -v verbose report with graphs and textual AND SECURITY REPORTS with -o 1024 set\n"; - print " -t the ip address of the inerface on which you collected data!\n"; - print " -f name ipfilter log file (compatible with V 3.2.9) [ipfilter.log]\n"; - print " \nExample: ./ipfanalyze.pl -p all -g -f log1\n"; - print "Will look at traffic to/from all ports and make graphs from file log1\n"; - print " \nExample2 ./ipfanalyze.pl -p 25 -g -f log2\n"; - print "Will look at SMTP traffic and make graphs from file log2\n"; - print " \nExample3 ./ipfanalyze.pl -p all -g -f log3 -o 1024\n"; - print "Will look at all traffic,make graphs from file log3 and log security info for anthing talking inwards below port 1024\n"; - print " \nExample4 ./ipfanalyze.pl -p all -f log3 -v \n"; - print "Report the works.....when ports below 1024 are contacted highlight (like -s -o 1024)\n"; -} - - - - -sub makegifs { -local ($maxin,$maxout,$lookat,$xmax)=@_; -$YMAX=$maxin; -$XMAX=$xmax; - -if ($maxout > $maxin) - { $YMAX=$maxout;} - -($dateis,$junk)=split " " , @recs[0]; -($dayis,$monthis,$yearis)=split "/",$dateis; -$month=$months{$monthis}; -$dateis="$dayis " . "$month " . "$yearis "; -# split graphs in to 6 four hour spans for 24 hours -$numgraphs=int($XMAX/240); - -$junk=0; -$junk=$XMAX - 240*($numgraphs); -if($junk gt 0 ) -{ -$numgraphs++; -} - -$cnt1=0; -$end=0; -$loop=0; - -while ($cnt1++ < $numgraphs) -{ - $filename1="in$cnt1.dat"; - $filename2="out$cnt1.dat"; - $filename3="graph$cnt1.conf"; - open(OUTDATA,"> $filename2") || die "Couldnt open $filename2 for writing \n"; - open(INDATA,"> $filename1") || die "Couldnt open $filename1 for writing \n"; - - $loop=$end; - $end=($end + 240); - -# write all files as x time coord from 1 to 240 minutes -# set hour in graph via conf file - $arraycnt=0; - while ($loop++ < $end ) - { - $arraycnt++; - $val1=""; - $val2=""; - $val1=$inwards[$loop] [1]; - if($val1 eq "") - {$val1=0}; - $val2=$outwards[$loop] [1]; - if($val2 eq "") - {$val2=0}; - print INDATA "$arraycnt:$val1\n"; - print OUTDATA "$arraycnt:$val2\n"; - } - close INDATA; - close OUTDATA; - $gnum=($cnt1 - 1); - open(INCONFIG,"> $filename3") || die "Couldnt open ./graph.conf for writing \n"; - print INCONFIG "NUMBERYCELLGRIDSIZE:5\n"; - print INCONFIG "MAXYVALUE:$YMAX\n"; - print INCONFIG "MINYVALUE:0\n"; - print INCONFIG "XCELLGRIDSIZE:1.3\n"; - print INCONFIG "XMAX: 240\n"; - print INCONFIG "Bar:0\n"; - print INCONFIG "Average:0\n"; - print INCONFIG "Graphnum:$gnum\n"; - print INCONFIG "Title: port $lookat packets/minute to/from gatekeep on $dateis \n"; - print INCONFIG "Transparent:no\n"; - print INCONFIG "Rbgcolour:0\n"; - print INCONFIG "Gbgcolour:255\n"; - print INCONFIG "Bbgcolour:255\n"; - print INCONFIG "Rfgcolour:0\n"; - print INCONFIG "Gfgcolour:0\n"; - print INCONFIG "Bfgcolour:0\n"; - print INCONFIG "Rcolour:0\n"; - print INCONFIG "Gcolour:0\n"; - print INCONFIG "Bcolour:255\n"; - print INCONFIG "Racolour:255\n"; - print INCONFIG "Gacolour:255\n"; - print INCONFIG "Bacolour:0\n"; - print INCONFIG "Rincolour:100\n"; - print INCONFIG "Gincolour:100\n"; - print INCONFIG "Bincolour:60\n"; - print INCONFIG "Routcolour:60\n"; - print INCONFIG "Goutcolour:100\n"; - print INCONFIG "Boutcolour:100\n"; - close INCONFIG; - -} - - -$cnt1=0; -while ($cnt1++ < $numgraphs) -{ - $filename1="in$cnt1.dat"; - $out="out$cnt1.gif"; - $filename2="out$cnt1.dat"; - $filename3="graph$cnt1.conf"; - system( "cp ./$filename1 ./in.dat; - cp ./$filename2 ./out.dat; - cp ./$filename3 ./graph.conf"); - system( "./isbgraph -conf graph.conf;mv graphmaker.gif $out"); - system(" cp $out /isb/local/etc/httpd/htdocs/."); - -} - -} # end of subroutine make gifs - - - - -sub packbytime { -local ($xmax)=@_; -$XMAX=$xmax; -# pass in the dest port number or get graph for all packets -# at 1 minute intervals -# @shortrecs has form 209.24.1.217 123 192.216.16.2 123 udp len 20 76 -# @recs has form 27/07/1998 00:01:05.216596 le0 @0:2 L 192.216.21.16,2733 -> 192.216.16.2,53 PR udp len 20 62 -# -# dont uses hashes to store how many packets per minite as they -# return random x coordinate order -@inwards=(); -@outwards=(); -$cnt=-1; -$value5=0; -$maxin=0; -$maxout=0; -$xpos=0; -while ($cnt++ <= $#recs ) - { - ($srcip,$srcport,$destip,$destport,$pro)= split " " , @shortrecs[$cnt]; - $bit=substr(@recs[$cnt],11); - ($bit,$junkit)= split " " , $bit ; - ($hour,$minute,$sec,$junk) = split ":", $bit; -# -# covert the time to decimal minutes and bucket to nearest minute -# - $xpos=($hour * 3600) + ($minute * 60) + ($sec) ; -# xpos is number of seconds since 00:00:00 on day...... - $xpos=int($xpos / 60); -# if we just want to see all packet in/out activity - if("$lookat" eq "all") - { - if("$destip" eq "$gatekeep") - { -# TO GATEKEEP port lookat -# print "to gatekeep at $xpos\n"; - $value5=$inwards[$xpos] [1]; - $value5++ ; -# $maxin = $value5 if $maxin < $value5 ; - - if($value5 > $maxin) - { - $maxin=$value5; - $timemaxin="$hour:$minute"; - } - $inwards[$xpos][1]=$value5; - } - else - { -# FROM GATEKEEP to port lookat -# print "from gatekeep at $xpos\n"; - $value4=$outwards[$xpos] [1]; - $value4++ ; -# $maxout = $value4 if $maxout < $value4 ; - if($value4 > $maxout) - { - $maxout=$value4; - $timemaxout="$hour:$minute"; - } - - $outwards[$xpos][1]=$value4; - } - } - - - - - if("$destport" eq "$lookat") - { - if("$destip" eq "$gatekeep") - { -# TO GATEKEEP port lookat -# print "to gatekeep at $xpos\n"; - $value5=$inwards[$xpos] [1]; - $value5++ ; - $maxin = $value5 if $maxin < $value5 ; - $inwards[$xpos][1]=$value5; - } - else - { -# FROM GATEKEEP to port lookat -# print "from gatekeep at $xpos\n"; - $value4=$outwards[$xpos] [1]; - $value4++ ; - $maxout = $value4 if $maxout < $value4 ; - $outwards[$xpos][1]=$value4; - } - } - } # end while - -# now call gif making stuff -if("$opt_g" eq "1") -{ - print "Making plots of in files outN.gif\n";; - makegifs($maxin,$maxout,$lookat,$#inwards); -} -if ("$timemaxin" ne "") -{print "\nTime of peak packets/minute in was $timemaxin\n";} -if ("$timemaxout" ne "") -{print "\nTime of peak packets/minute OUT was $timemaxout\n";} - -} # end of subroutine packets by time - - - - - -sub posbadones { - -$safenam=""; -@dummy=$saferports; -foreach $it (split " ",$saferports) { -if ($it eq "icmp" ) - { - $safenam = $safenam . " icmp"; - } -else - { - $safenam = $safenam . " $services{$it}" ; - } - -} -print "\n\n########################################################################\n"; -print "well known ports are 0->1023\n"; -print "Registered ports are 1024->49151\n"; -print "Dynamic/Private ports are 49152->65535\n\n"; -print "Sites that contacted gatekeep on 'less safe' ports (<$ITRUSTABOVE)\n"; - -print " 'safe' ports are $safenam \n"; -print "\n variables saferports and safehosts hardwire what/who we trust\n"; -print "########################################################################\n"; - -$loop=-1; -while ($loop++ <= $#recs ) - { - ($srcip,$srcport,$destip,$destport,$pro)= split " " , @shortrecs[$loop]; - if ("$destip" eq "$gatekeep") - { - if ($destport < $ITRUSTABOVE ) - { -# if index not found (ie < 0) then we have a low port attach to gatekeep -# that is not to a safer port (see top of this file) -# ie no ports 25 (smtp), 53 (dns) , 113 (ident), 123 (ntp), icmp - $where=index($saferports,$destport); - if ($where < 0) - { - $nameis=$services{$destport}; - if ("$nameis" eq "" ) - { - $nameis=$destport; - } - print " Warning: $srcip contacted gatekeep $nameis\n"; - } - } - } - } -print "\n\n"; -} # end of subroutine posbadones - - - - -sub toobusy_site { -$percsafe=1; -print "\n\n########################################################################\n"; -print "# Sites sending > $percsafe % of all packets to gatekeep MAY be attacking/probing\n"; -print "Trusted hosts are $safehosts\n"; -print "\nTOTAL packets were $#recs \n"; -print "########################################################################\n"; -while(($ipadd,$numpacketsent)=each %numpacks) -{ -$perc=$numpacketsent/$#recs*100; -if ($perc > $percsafe) -# dont believe safehosts are attacking! - { - $where=index($safehosts,$ipadd); -# if not found (ie < 0 then the source host IP address -# isn't in the saferhosts list, a list we trust...... - if ($where < 0 ) - { - printf "$ipadd sent %4.1f (\045) of all packets to gatekeep\n",$perc; - } - } -} - -print "\n\n"; -} # end of subroutine toobusy_site - - -############### END SUBROUTINE DECLARATIONS ########### - -use Getopt::Std; - -getopt('pfot'); - -if("$opt_t" eq "0") - {usage;print "\n---->ERROR: You must psecify the IP address of the interface that collected the data!\n"; -exit; -} - -if("$opt_h" eq "1") - {usage;exit 0}; -if("$opt_H" eq "1") - {usage;exit 0}; - -if("$opt_v" eq "1") -{ -$ITRUSTABOVE=1024; -$opt_s=1; -$opt_o=$ITRUSTABOVE; -print "\n" x 5; -print "NOTE: when the final section of the verbose report is generated\n"; -print " every host IP address that contacted $gatekeep has \n"; -print " a tally of how many times packets from a particular port on that host\n"; -print " reached $gatekeep, and WHICH source port or source portname \n"; -print " these packets originated from.\n"; -print " Many non RFC obeying boxes do not use high ports and respond to requests from\n"; -print " $gatekeep using reserved low ports... hence you'll see things like\n"; -print " #### with 207.50.191.60 as the the source for packets ####\n"; -print " 1 connections from topx to gatekeep\n\n\n\n"; - -} - -if("$opt_o" eq "") - {usage;print "\n---->ERROR: Must specify lowest safe port name for incoming trafic\n";exit 0} -else -{ -$ITRUSTABOVE=$opt_o;$opt_s=1;} - -if("$opt_f" eq "") - {usage;print "\n---->ERROR: Must specify filename with -f \n";exit 0}; -$FILENAME=$opt_f; - -if("$opt_p" eq "") - {usage;print "\n---->ERROR: Must specify port number or 'all' with -p \n";exit 0}; - -# -p arg must be all or AN INTEGER in range 1<=N<=64K -if ("$opt_p" ne "all") - { - $_=$opt_p; - unless (/^[+-]?\d+$/) - { - usage; - print "\n---->ERROR: Must specify port number (1-64K) or 'all' with -p \n"; - exit 0; - } - } - - -# if we get here then the port option is either 'all' or an integer... -# good enough..... -$lookat=$opt_p; - -# -o arg must be all or AN INTEGER in range 1<=N<=64K - $_=$opt_o; - unless (/^[+-]?\d+$/) - { - usage; - print "\n---->ERROR: Must specify port number (1-64K) with -o \n"; - exit 0; - } - - -#--------------------------------------------------------------------- - - -%danger=(); -%numpacks=(); - -$saferports="25 53 113 123 icmp"; -$gatekeep="192.216.16.2"; -#genmagic is 192.216.25.254 -$safehosts="$gatekeep 192.216.25.254"; - - - -# load hash with service numbers versus names - -# hash called $services -print "Creating hash of service names / numbers \n"; -$SERV="./services"; -open (INFILE, $SERV) || die "Cant open $SERV: $!n"; -while(<INFILE>) -{ - ($servnum,$servname,$junk)=split(/ /,$_); -# chop off null trailing..... - $servname =~ s/\n$//; - $services{$servnum}=$servname; -} -print "Create hash of month numbers as month names\n"; -%months=("01","January","02","February","03","March","04","April","05","May","06","June","07","July","08","August","09","September","10","October","11","November","12","December"); - -print "Reading log file into an array\n"; -#$FILENAME="./ipfilter.log"; -open (REC, $FILENAME) || die "Cant open $FILENAME: \n"; -($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$junk)=stat REC; -print "Log file $FILENAME is $size bytes in size\n"; -#each record is an element of array rec[] now -while(<REC>) - { - @recs[$numrec++]=$_; - } - - -# get list of UNIQUE source IP addresses now, records look like -# 192.216.25.254,62910 -> 192.216.16.2,113 PR tcp len 20 40 -R -# this is slow on big log files, about 1minute for every 2.5M log file -print "Making list of unique source IP addresses (1minute for every 2M log parsed)\n"; -$loop=-1; -$where=-1; -while ($loop++ < $#recs ) - { -# get the LHS = source IP address, need fiddle as icmp rcords are logged oddly - $bit=substr(@recs[$loop],39); - $bit =~ s/,/ /g; - ($sourceip,$junkit)= split " " , $bit ; - -# NOTE the . is the string concat command NOT + .......!!!! - - $sourceip =~ split " ", $sourceip; - $where=index($allips,$sourceip); -# if not found (ie < 0, add it) - if ($where < 0 ) - { - $allips = $allips . "$sourceip " ; - } - } - -print "Put all unique ip addresses into a 1D array\n"; -@allips=split " ", $allips; - -#set loop back to -1 as first array element in recs is element 0 NOT 1 !! -print "Making compact array of logged entries\n"; -$loop=-1; -$icmp=" icmp "; -$ptr=" -> "; -$lenst=" len "; -$numpackets=0; - -while ($loop++ < $#recs ) - { -# this prints from 39 char to EOR - $a=substr(@recs[$loop],39); - ($srcip,$dummy,$destip,$dummy2,$dummy3,$dummy4,$lenicmp)= split " " , $a ; -# need to rewrite icmp ping records.... they dont have service numbers - $whereicmp=index($a,"PR icmp"); - if($whereicmp > 0 ) - { - $a = $srcip . $icmp . $ptr . $destip . $icmp . $icmp . $lenst . $lenicmp ; - } - -# dump the "->" and commas from logging - $a =~ s/->//g; - $a =~ s/PR//g; - $a =~ s/,/ /g; -# shortrec has records that look like -# 209.24.1.217 123 192.216.16.2 123 udp len 20 76 - @shortrecs[$loop]= "$a"; - -# count number packets from each IP address into hash - ($srcip,$junk) = split " ","$a"; - $numpackets=$numpacks{"$srcip"}; - $numpackets++ ; - $numpacks{"$srcip"}=$numpackets; - -} - - - -# call sub to analyse packets by time -# @shortrecs has form 209.24.1.217 123 192.216.16.2 123 udp len 20 76 -# @recs has form 27/07/1998 00:01:05.216596 le0 @0:2 L 192.216.21.16,2733 -> 192.216.16.2,53 PR udp len 20 62 -packbytime($XMAX); - -if("$opt_s" eq "1") -{ -# call subroutine to scan for connections to ports on gatekeep -# other than those listed in saferports, connections to high -# ports are assumed OK..... -posbadones; - -# call subroutine to print out which sites had sent more than -# a defined % of packets to gatekeep -toobusy_site; -} - - -# verbose reporting? -if ("$opt_v" eq "1") -{ -$cnt=-1; -# loop over ALL unique IP source destinations -while ($cnt++ < $#allips) -{ - %tally=(); - %unknownsrcports=(); - $uniqip=@allips[$cnt]; - $loop=-1; - $value=0; - $value1=0; - $value2=0; - $value3=0; - $set="N"; - - while ($loop++ < $#recs ) - { -# get src IP num, src port number, -# destination IP num, destnation port number,protocol - ($srcip,$srcport,$destip,$destport,$pro)= split " " , @shortrecs[$loop]; -# loop over all records for the machine $uniqip -# NOTE THE STRINGS ARE COMPARED WITH eq NOT cmp and NOT = !!!! - if( "$uniqip" eq "$srcip") - { -# look up hash of service names to get key... IF ITS NOT THERE THEN WHAT??? -# its more than likely a request coming back in on a high port -# ....So... -# find out the destination port from the unknown (high) src port -# and tally these as they may be a port attack - if ("$srcport" eq "icmp") - { $srcportnam="icmp";} - else - { - $srcportnam=$services{$srcport}; - } -# try and get dest portname, if not there, leave it as the -# dest portnumber - if ("$destport" eq "icmp") - { $destportnam="icmp";} - else - { - $destportnam=$services{$destport}; - } - - if ($destportnam eq "") - { - $destportnam=$destport; - } - - if ($srcportnam eq "") - { -# increment number of times a (high)/unknown port has gone to destport - $value1=$unknownsrcports{$destportnam}; - $value1++ ; - $unknownsrcports{$destportnam}=$value1; - } - else - { -# want tally(srcport) counter to be increased by 1 - $value3=$tally{$srcportnam}; - $value3++ ; - $tally{$srcportnam}=$value3; - } - } - - - } -# end of loop over ALL IP's - -if ($set eq "N") -{ -$set="Y"; - -print "\n#### with $uniqip as the the source for packets ####\n"; -while(($key,$value)=each %tally) - { - if (not "$uniqip" eq "$gatekeep") - { - print "$value connections from $key to gatekeep\n"; - } - else - { - print "$value connections from gatekeep to $key\n"; - } - } - - - -while(($key2,$value2)=each %unknownsrcports) - { - if (not "$uniqip" eq "$gatekeep") - { - print "$value2 high port connections to $key2 on gatekeep\n"; - } - else - { - print "$value2 high port connections to $key2 from gatekeep\n"; - } - } - -} -# print if rests for UNIQIP IF flag is set to N then toggle flag - -} # end of all IPs loop -} # end of if verbose option set block - - - diff --git a/contrib/ipfilter/perl/Isbgraph b/contrib/ipfilter/perl/Isbgraph deleted file mode 100644 index 8641099..0000000 --- a/contrib/ipfilter/perl/Isbgraph +++ /dev/null @@ -1,297 +0,0 @@ -#!/usr/local/bin/perl - -# isbgraph -# an example in not so hot perl programming.... -# based around GraphMaker from Fabrizio Pivari -# A graph maker perl script - -use GD; -use Getopt::Long; -$hr=0; - -sub main{ - -$opt_conf="./graphmaker.cnf"; - -@elem=("NUMBERYCELLGRIDSIZE","MAXYVALUE","MINYVALUE","XCELLGRIDSIZE","XMAX", - "Data","Graph","Bar","Average","Graphnum","Title","Transparent","Rbgcolour", - "Gbgcolour","Bbgcolour","Rfgcolour","Gfgcolour","Bfgcolour","Rcolour", - "Gcolour","Bcolour","Racolour","Gacolour","Bacolour"); - -%option=( - NUMBERYCELLGRIDSIZE => '8', - MAXYVALUE => '7748', - MINYVALUE => '6500', - XCELLGRIDSIZE => '18', - XMAX => '1000', - Data => './graphmaker.dat', - Graph => './graphmaker.gif', - Bar => '1', - Average => '1', - Graphnum => '1', - Title => 'GraphMaker 2.1', - Transparent => 'yes', - Rbgcolour => '255', - Gbgcolour => '255', - Bbgcolour => '255', - Rfgcolour => '0', - Gfgcolour => '0', - Bfgcolour => '0', - Rcolour => '0', - Gcolour => '0', - Bcolour => '255', - Racolour => '255', - Gacolour => '255', - Bacolour => '0'); - -&GetOptions("conf=s","help") || &printusage ; - - -if ($opt_help) {&printusage}; - -open (CNF, $opt_conf) || die; -while (<CNF>) { -s/\t/ /g; #replace tabs by space -next if /^\s*\#/; #ignore comment lines -next if /^\s*$/; #ignore empty lines -foreach $elem (@elem) - { - if (/\s*$elem\s*:\s*(.*)/) { $option{$elem}=$1; } - } -} -close(CNF); -######################################### -# -# -# -# number datapoints/24 hours is 1440 (minutes) -# -# Split into N graphs where each graph has max of 240 datapoints (4 hours) -# - -$barset=0; -$m=0; -$YGRIDSIZE = 400; -$YCELLGRIDSIZE = $YGRIDSIZE/$option{'NUMBERYCELLGRIDSIZE'}; -$XINIT = 30; -$XEND = 8; -$YINIT =20; -$YEND = 20; -#$XGRIDSIZE = ($option{'XMAX'}*$option{'XCELLGRIDSIZE'}); -#$XGRIDSIZE = (240*$option{'XCELLGRIDSIZE'}); -$XGRIDSIZE = 620; -$XGIF = $XGRIDSIZE + $XINIT + $XEND; -$XGRAPH = $XGRIDSIZE + $XINIT; -$YGIF = $YGRIDSIZE + $YEND + $YINIT; -$YGRAPH = $YGRIDSIZE + $YINIT; -$RANGE=$option{'MAXYVALUE'}-$option{'MINYVALUE'}; -$SCALE=$YGRIDSIZE/$RANGE; - -# NEW IMAGE - $im=new GD::Image($XGIF,$YGIF); - -$white=$im->colorAllocate(255,255,255); -$black=$im->colorAllocate(0,0,0); -$pink=$im->colorAllocate(255,153,153); -$red=$im->colorAllocate(255,0,0); -$blue=$im->colorAllocate(0,0,255); -$green=$im->colorAllocate(0,192,51); -$orange=$im->colorAllocate(255,102,0); -$pink=$im->colorAllocate(255,153,153); -$teal=$im->colorAllocate(51,153,153); -# gif background is $bg - $bg=$white; - $fg=$blue; -# LINE COLOUR HELP BY VAR $colour - $colour=$red; - $acolour=$yellow; - # GRID - if ($option{'Transparent'} eq "yes") {$im->transparent($bg)}; - $im->filledRectangle(0,0,$XGIF,$YGIF,$bg); - -# Dot style -# vertical markers on Y axis grid - $im->setStyle($fg,$bg,$bg,$bg); - for $i (0..$option{'XMAX'}) - { - $xspace= $XINIT+$option{'XCELLGRIDSIZE'}*$i +$i; - # $im->line($xspace,$YINIT,$xspace,$YGRAPH,gdStyled); - $num = $i+1; - - use integer; - { - $posis=$num - ($num/60)*60; - } - if ($posis eq 0) - { - $outhr=0; - $hr=($hr + 1) ; - $outhr=$hr+$option{'Graphnum'}*4; -# shift minutes coords to correct stat hour! - $im->string(gdMediumBoldFont,$xspace-3,$YGRAPH,"$outhr",$fg); - } - - } # end of scan over X values (minutes) - - $YCELLVALUE=($option{'MAXYVALUE'}-$option{'MINYVALUE'})/$option{'NUMBERYCELLGRIDSIZE'}; - for $i (0..$option{'NUMBERYCELLGRIDSIZE'}) - { - $num=$option{'MINYVALUE'}+$YCELLVALUE*($option{'NUMBERYCELLGRIDSIZE'}-$i); - $im->string(gdMediumBoldFont,0,$YINIT+$YCELLGRIDSIZE*$i -6,"$num",$fg); - } - $im->string(gdSmallFont,$XGRIDSIZE/2-80,0,$option{'Title'},$fg); - - $odd_even = $option{'XCELLGRIDSIZE'}%2; - #odd - if ($odd_even eq 1) {$middle = $option{'XCELLGRIDSIZE'}/2 +0.5;} - else {$middle = $option{'XCELLGRIDSIZE'}/2 +0.5;} - -# start reading data -# open (DATA,$option{'Data'}) || die "cant open $option{'Data'}"; -# nextdata becomes Y on reading of second data set.... -$nextdata="N"; -@datafiles=("./in.dat" , "./out.dat" ); - foreach ( @datafiles ) -{ - $m=0; - $count=0; - $i=0; - $fname=$_; - - print "fname $fname\n"; -# change entry for red in colour table to green for packets LEAVING target host - - open (DATA,$_) || die "cant open $_"; - print "$nextdata nextdata\n"; - while (<DATA>) - { - /(.*):(.*)/; - if ($option{'Average'} eq 1) {$m+=$2;$i++;} - if ($count eq 0){$XOLD=$1;$YOLD=$2;$count=1;next} - $X=$1; $Y=$2; -# +($X-1) are the pixel of the line - $xspace= $XINIT+$option{'XCELLGRIDSIZE'}*($X-1) +($X-1); - $xspaceold= $XINIT+$option{'XCELLGRIDSIZE'}*($XOLD-1) +($XOLD-1); - $yspace= $YGRAPH-($Y-$option{'MINYVALUE'})*$SCALE; - $yspaceold= $YGRAPH-($YOLD-$option{'MINYVALUE'})*$SCALE; - $barset=$option{'Bar'}; - if ($barset eq 0) - { - - if($nextdata eq "Y") - { - - #$im->line($XINIT,$YGRAPH,$X,$Y,$orange); - $im->line($xspaceold,$yspaceold,$xspace,$yspace,$green); - } - else - { - $im->line($xspaceold,$yspaceold,$xspace,$yspace,$red); - } - } - else - { - if ($1 eq 2) - { - $im->filledRectangle($xspaceold,$yspaceold, - $xspaceold+$middle,$YGRAPH,$colour); - $im->rectangle($xspaceold,$yspaceold, - $xspaceold+$middle,$YGRAPH,$fg); - } - else - { - $im->filledRectangle($xspaceold-$middle,$yspaceold, - $xspaceold+$middle,$YGRAPH,$colour); - $im->rectangle($xspaceold-$middle,$yspaceold, - $xspaceold+$middle,$YGRAPH,$fg); - } - } - $XOLD=$X; $YOLD=$Y; - - } # end of while DATA loop - - $im->line(500,40,530,40,$red); - $im->line(500,60,530,60,$green); - $im->string(gdSmallFont,535,35,"Packets IN",$fg); - $im->string(gdSmallFont,535,55,"Packets OUT",$fg); - - if ($option{'Bar'} ne 0) - { - if ($X eq $option{'XMAX'}) - { - $im->filledRectangle($xspace-$middle,$yspace, - $xspace,$YGRAPH,$colour); - $im->rectangle($xspace-$middle,$yspace, - $xspace,$YGRAPH,$fg); - } - else - { - $im->filledRectangle($xspace-$middle,$yspace, - $xspace+$middle,$YGRAPH,$colour); - $im->rectangle($xspace-$middle,$yspace, - $xspace+$middle,$YGRAPH,$fg); - } - } - close (DATA); - - - $nextdata="Y"; -# TOP LEFT is 0,0 on GIF (image) -# origin of plot is xinit,yinit - # print "little line\n"; - $im->line($xspace,$yspace,$xspace,$YGRAPH,$blue); - $im->line($xspace,$YGRAPH,$XINIT,$YGRAPH,$blue); -# (0,0) in cartesian space time=0 minutes, rate 0 packets/s - $im->line($XINIT,$YGRAPH,$XINIT,$YGRAPH,$blue); - $im->line($XINIT,$YGRAPH,$XINIT,$YGRAPH,$green); - -} # close foreach loop on data file names - - - - - if ($option{'Average'} eq 1) - { - # Line style - $im->setStyle($acolour,$acolour,$acolour,$acolour,$bg,$bg,$bg,$bg); - $m=$m/$i; - $ym=$YGRAPH-($m-$option{'MINYVALUE'})*$SCALE; - $im->line($XINIT,$ym,$XGRAPH,$ym,gdStyled) - } - $im->line($XINIT,$YINIT,$XINIT,$YGRAPH,$fg); - $im->line($XINIT,$YINIT,$XGRAPH,$YINIT,$fg); - $im->line($XGRAPH,$YINIT,$XGRAPH,$YGRAPH,$fg); - $im->line($XINIT,$YGRAPH,$XGRAPH,$YGRAPH,$fg); - - $im->string(gdSmallFont,$XGIF-335,$YGIF - 12,"Time of Day (hours)",$fg); - open (GRAPH,">$option{'Graph'}") || die "Error: Grafico.gif - $!\n"; - print GRAPH $im -> gif; - close (GRAPH); - - - - -} # end of subroutine main - -main; -exit(0); - -sub printusage { - print <<USAGEDESC; - -usage: - graphmaker [-options ...] - -where options include: - -help print out this message - -conf file the configuration file (default graphmaker.cnf) - -If you want to know more about this tool, you might want -to read the docs. They came together with graphmaker! - -Home: http://www.geocities.com/CapeCanaveral/Lab/3469/graphmaker.html - -USAGEDESC - exit(1); -} - diff --git a/contrib/ipfilter/perl/LICENSE b/contrib/ipfilter/perl/LICENSE deleted file mode 100644 index 4ae42df..0000000 --- a/contrib/ipfilter/perl/LICENSE +++ /dev/null @@ -1,6 +0,0 @@ -These shell scripts are provided "as is" by Ivan S. Bishop and any -express or implied warranties, including, but not limited to, the -implied warranties of merchantability and fitness for a particular -purpose are disclaimed. - -Permission has been granted for their redistribution within this package. diff --git a/contrib/ipfilter/perl/Services b/contrib/ipfilter/perl/Services deleted file mode 100644 index e9ae317..0000000 --- a/contrib/ipfilter/perl/Services +++ /dev/null @@ -1,2146 +0,0 @@ -1 tcpmux TCPPortServiceMultiplexer -3 compressnet CompressionProcess -5 rje RemoteJobEntry -7 echo -9 discard -11 systat -13 daytime -15 netstat -17 qotd QuoteoftheDay -18 msp MessageSendProtocol -19 chargen -20 ftp-data -21 ftp -22 ssh SSHRemoteLoginProtocol -23 telnet -25 smtp -27 nsw-fe NSWUserSystemFE -29 msg-icp MSGICP -31 msg-auth MSGAuthentication -33 dsp DisplaySupportProtocol -37 time Time -38 rap RouteAccessProtocol -39 rlp ResourceLocationProtocol -41 graphics Graphics -42 nameserver HostNameServer -43 whois -44 mpm-flags MPMFLAGSProtocol -45 mpm MessageProcessingModule[recv] -46 mpm-snd MPM[defaultsend] -47 ni-ftp NIFTP -48 auditd DigitalAuditDaemon -49 tacacs LoginHostProtocol(TACACS) -50 re-mail-ck RemoteMailCheckingProtocol -51 la-maint IMPLogicalAddressMaintenance -52 xns-time XNSTimeProtocol -53 domain DomainNameServer -54 xns-ch XNSClearinghouse -55 isi-gl ISIGraphicsLanguage -56 xns-auth XNSAuthentication -58 xns-mail XNSMail -61 ni-mail NIMAIL -62 acas ACAServices -63 whois++ whois++ -64 covia CommunicationsIntegrator(CI) -65 tacacs-ds TACACS-DatabaseService -66 sqlnet OracleSQL*NET -67 bootps BootstrapProtocolServer -68 bootpc BootstrapProtocolClient -69 tftp TrivialFileTransfer -70 gopher Gopher -71 netrjs-1 RemoteJobService -72 netrjs-2 RemoteJobService -73 netrjs-3 RemoteJobService -74 netrjs-4 RemoteJobService -76 deos DistributedExternalObjectStore -77 rje -78 vettcp vettcp -79 finger Finger -80 www-http WorldWideWebHTTP -81 hosts2-ns HOSTS2NameServer -82 xfer XFERUtility -83 mit-ml-dev MITMLDevice -84 ctf CommonTraceFacility -85 mit-ml-dev MITMLDevice -86 mfcobol MicroFocusCobol -87 link -88 kerberos Kerberos -89 su-mit-tg SU/MITTelnetGateway -90 dnsix DNSIXSecuritAttributeTokenMap -91 mit-dov MITDoverSpooler -92 npp NetworkPrintingProtocol -93 dcp DeviceControlProtocol -94 objcall TivoliObjectDispatcher -95 supdup SUPDUP -96 dixie DIXIEProtocolSpecification -97 swift-rvf SwiftRemoteVirturalFileProtocol -98 tacnews TACNews -99 metagram MetagramRelay -100 newacct [unauthorizeduse] -101 hostname NICHostNameServer -102 iso-tsap ISO-TSAPClass0 -103 x400 -104 x400-snd -105 cso CCSOnameserverprotocol -106 3com-tsmux 3COM-TSMUX -107 rtelnet RemoteTelnetService -108 snagas SNAGatewayAccessServer -109 pop2 PostOfficeProtocol-Version2 -110 pop3 PostOfficeProtocol-Version3 -111 sunrpc SUNRemoteProcedureCall -112 mcidas McIDASDataTransmissionProtocol -113 ident -114 audionews AudioNewsMulticast -115 sftp SimpleFileTransferProtocol -116 ansanotify ANSAREXNotify -117 uucp-path UUCPPathService -118 sqlserv SQLServices -119 nntp NetworkNewsTransferProtocol -120 cfdptkt CFDPTKT -121 erpc EncoreExpeditedRemotePro.Call -122 smakynet SMAKYNET -123 ntp NetworkTimeProtocol -124 ansatrader ANSAREXTrader -125 locus-map LocusPC-InterfaceNetMapSer -126 unitary UnisysUnitaryLogin -127 locus-con LocusPC-InterfaceConnServer -128 gss-xlicen GSSXLicenseVerification -129 pwdgen PasswordGeneratorProtocol -130 cisco-fna ciscoFNATIVE -131 cisco-tna ciscoTNATIVE -132 cisco-sys ciscoSYSMAINT -133 statsrv StatisticsService -134 ingres-net INGRES-NETService -135 epmap DCEendpointresolution -136 profile PROFILENamingSystem -137 netbios-ns NETBIOSNameService -138 netbios-dgm NETBIOSDatagramService -139 netbios-ssn NETBIOSSessionService -140 emfis-data EMFISDataService -141 emfis-cntl EMFISControlService -142 bl-idm Britton-LeeIDM -143 imap InternetMessageAccessProtocol -144 NeWS -145 uaac UAACProtocol -146 iso-tp0 ISO-IP0 -147 iso-ip ISO-IP -148 jargon Jargon -149 aed-512 AED512EmulationService -150 sql-net SQL-NET -151 hems HEMS -152 bftp BackgroundFileTransferProgram -153 sgmp SGMP -154 netsc-prod NETSC -155 netsc-dev NETSC -156 sqlsrv SQLService -157 knet-cmp KNET/VMCommand/MessageProtocol -158 pcmail-srv PCMailServer -159 nss-routing NSS-Routing -160 sgmp-traps SGMP-TRAPS -161 snmp SNMP -162 snmptrap SNMPTRAP -163 cmip-man CMIP/TCPManager -164 cmip-agent CMIP/TCPAgent -165 xns-courier Xerox -166 s-net SiriusSystems -167 namp NAMP -168 rsvd RSVD -169 send SEND -170 print-srv NetworkPostScript -171 multiplex NetworkInnovationsMultiplex -172 cl/1 NetworkInnovationsCL/1 -173 xyplex-mux Xyplex -174 mailq MAILQ -175 vmnet VMNET -176 genrad-mux GENRAD-MUX -177 xdmcp XDisplayManagerControlProtocol -178 nextstep NextStepWindowServer -179 bgp BorderGatewayProtocol -180 ris Intergraph -181 unify Unify -182 audit UnisysAuditSITP -183 ocbinder OCBinder -184 ocserver OCServer -185 remote-kis Remote-KIS -186 kis KISProtocol -187 aci ApplicationCommunicationInterface -188 mumps PlusFive'sMUMPS -189 qft QueuedFileTransport -190 gacp GatewayAccessControlProtocol -191 prospero ProsperoDirectoryService -192 osu-nms OSUNetworkMonitoringSystem -193 srmp SpiderRemoteMonitoringProtocol -194 irc InternetRelayChatProtocol -195 dn6-nlm-aud DNSIXNetworkLevelModuleAudit -196 dn6-smm-red DNSIXSessionMgtModuleAuditRedir -197 dls DirectoryLocationService -198 dls-mon DirectoryLocationServiceMonitor -199 smux SMUX -200 src IBMSystemResourceController -201 at-rtmp AppleTalkRoutingMaintenance -202 at-nbp AppleTalkNameBinding -203 at-3 AppleTalkUnused -204 at-echo AppleTalkEcho -205 at-5 AppleTalkUnused -206 at-zis AppleTalkZoneInformation -207 at-7 AppleTalkUnused -208 at-8 AppleTalkUnused -209 qmtp TheQuickMailTransferProtocol -210 z39.50 ANSIZ39.50 -211 914c/g TexasInstruments914C/GTerminal -212 anet ATEXSSTR -213 ipx IPX -214 vmpwscs VMPWSCS -215 softpc InsigniaSolutions -216 CAIlic ComputerAssociatesInt'lLicenseServer -217 dbase dBASEUnix -218 mpp NetixMessagePostingProtocol -219 uarps UnisysARPs -220 imap3 InteractiveMailAccessProtocolv3 -221 fln-spx BerkeleyrlogindwithSPXauth -222 rsh-spx BerkeleyrshdwithSPXauth -223 cdc CertificateDistributionCenter -224 Reserved -225 Reserved -226 Reserved -227 Reserved -228 Reserved -229 Reserved -230 Reserved -231 Reserved -232 Reserved -233 Reserved -234 Reserved -235 Reserved -236 Reserved -237 Reserved -238 Reserved -239 Reserved -240 Reserved -241 Reserved -242 direct Direct -243 sur-meas SurveyMeasurement -244 dayna Dayna -245 link LINK -246 dsp3270 DisplaySystemsProtocol -247 subntbcst_tftp SUBNTBCST_TFTP -248 bhfhs bhfhs -249 -250 Reserved -251 Reserved -252 Reserved -253 Reserved -254 Reserved -255 Reserved -256 rap RAP -257 set SecureElectronicTransaction -258 yak-chat YakWinsockPersonalChat -259 esro-gen EfficientShortRemoteOperations -260 openport Openport -261 nsiiops IIOPNameServiceoverTLS/SSL -262 arcisdms Arcisdms -263 hdap HDAP -280 http-mgmt http-mgmt -281 personal-link PersonalLink -282 cableport-ax CablePortA/X -309 entrusttime EntrustTime -310 bhmds bhmds -311 asip-webadmin AppleShareIPWebAdmin -312 vslmp VSLMP -313 magenta-logic MagentaLogic -314 opalis-robot OpalisRobot -315 dpsi DPSI -316 decauth decAuth -317 zannet Zannet -344 pdap ProsperoDataAccessProtocol -345 pawserv PerfAnalysisWorkbench -346 zserv Zebraserver -347 fatserv FatmenServer -348 csi-sgwp CabletronManagementProtocol -349 mftp mftp -350 matip-type-a MATIPTypeA -351 bhoetty bhoetty(added5/21/97) -352 dtag-ste-sb DTAG -353 ndsauth NDSAUTH -354 bh611 bh611 -355 datex-asn DATEX-ASN -356 cloanto-net-1 CloantoNet1 -357 bhevent bhevent -358 shrinkwrap Shrinkwrap -359 tenebris_nts TenebrisNetworkTraceService -360 scoi2odialog scoi2odialog -361 semantix Semantix -362 srssend SRSSend -363 rsvp_tunnel RSVPTunnel -364 aurora-cmgr AuroraCMGR -365 dtk DTK -366 odmr ODMR -367 mortgageware MortgageWare -368 qbikgdp QbikGDP -369 rpc2portmap rpc2portmap -370 codaauth2 codaauth2 -371 clearcase Clearcase -372 ulistproc ListProcessor -373 legent-1 LegentCorporation -374 legent-2 LegentCorporation -375 hassle Hassle -376 nip AmigaEnvoyNetworkInquiryProto -377 tnETOS NECCorporation -378 dsETOS NECCorporation -379 is99c TIA/EIA/IS-99modemclient -380 is99s TIA/EIA/IS-99modemserver -381 hp-collector hpperformancedatacollector -382 hp-managed-node hpperformancedatamanagednode -383 hp-alarm-mgr hpperformancedataalarmmanager -384 arns ARemoteNetworkServerSystem -385 ibm-app IBMApplication -386 asa ASAMessageRouterObjectDef. -387 aurp AppletalkUpdate-BasedRoutingPro. -388 unidata-ldm UnidataLDMVersion4 -389 ldap LightweightDirectoryAccessProtocol -390 uis UIS -391 synotics-relay SynOpticsSNMPRelayPort -392 synotics-broker SynOpticsPortBrokerPort -393 dis DataInterpretationSystem -394 embl-ndt EMBLNucleicDataTransfer -395 netcp NETscoutControlProtocol -396 netware-ip NovellNetwareoverIP -397 mptn MultiProtocolTrans.Net. -398 kryptolan Kryptolan -399 iso-tsap-c2 ISOTransportClass2Non-Controlover -400 work-sol WorkstationSolutions -401 ups UninterruptiblePowerSupply -402 genie GenieProtocol -403 decap decap -404 nced nced -405 ncld ncld -406 imsp InteractiveMailSupportProtocol -407 timbuktu Timbuktu -408 prm-sm ProsperoResourceManagerSys.Man. -409 prm-nm ProsperoResourceManagerNodeMan. -410 decladebug DECLadebugRemoteDebugProtocol -411 rmt RemoteMTProtocol -412 synoptics-trap TrapConventionPort -413 smsp SMSP -414 infoseek InfoSeek -415 bnet BNet -416 silverplatter Silverplatter -417 onmux Onmux -418 hyper-g Hyper-G -419 ariel1 Ariel -420 smpte SMPTE -421 ariel2 Ariel -422 ariel3 Ariel -423 opc-job-start IBMOperationsPlanningandControlStart -424 opc-job-track IBMOperationsPlanningandControlTrack -425 icad-el ICAD -426 smartsdp smartsdp -427 svrloc ServerLocation -428 ocs_cmu OCS_CMU -429 ocs_amu OCS_AMU -430 utmpsd UTMPSD -431 utmpcd UTMPCD -432 iasd IASD -433 nnsp NNSP -434 mobileip-agent MobileIP-Agent -435 mobilip-mn MobilIP-MN -436 dna-cml DNA-CML -437 comscm comscm -438 dsfgw dsfgw -439 dasp daspThomasObermair -440 sgcp sgcp -441 decvms-sysmgt decvms-sysmgt -442 cvc_hostd cvc_hostd -443 https httpprotocoloverTLS/SSL -444 snpp SimpleNetworkPagingProtocol -445 microsoft-ds Microsoft-DS -446 ddm-rdb DDM-RDB -447 ddm-dfm DDM-RFM -448 ddm-ssl DDM-SSL -449 as-servermap ASServerMapper -450 tserver TServer -451 sfs-smp-net CrayNetworkSemaphoreserver -452 sfs-config CraySFSconfigserver -453 creativeserver CreativeServer -454 contentserver ContentServer -455 creativepartnr CreativePartnr -456 macon-udp macon-udp -457 scohelp scohelp -458 appleqtc applequicktime -459 ampr-rcmd ampr-rcmd -460 skronk skronk -461 datasurfsrv DataRampSrv -462 datasurfsrvsec DataRampSrvSec -463 alpes alpes -464 kpasswd kpasswd -465 smtps smtpprotocoloverTLS/SSL(wasssmtp) -466 digital-vrc digital-vrc -467 mylex-mapd mylex-mapd -468 photuris proturis -469 rcp RadioControlProtocol -470 scx-proxy scx-proxy -471 mondex Mondex -472 ljk-login ljk-login -473 hybrid-pop hybrid-pop -474 tn-tl-w1 tn-tl-w1 -475 tcpnethaspsrv tcpnethaspsrv -476 tn-tl-fd1 tn-tl-fd1 -477 ss7ns ss7ns -478 spsc spsc -479 iafserver iafserver -480 iafdbase iafdbase -481 ph Phservice -482 bgs-nsi bgs-nsi -483 ulpnet ulpnet -484 integra-sme IntegraSoftwareManagementEnvironment -485 powerburst AirSoftPowerBurst -486 avian avian -487 saft saftSimpleAsynchronousFileTransfer -488 gss-http gss-http -489 nest-protocol nest-protocol -490 micom-pfs micom-pfs -491 go-login go-login -492 ticf-1 TransportIndependentConvergenceforFNA -493 ticf-2 TransportIndependentConvergenceforFNA -494 pov-ray POV-Ray -495 intecourier intecourier -496 pim-rp-disc PIM-RP-DISC -497 dantz dantz -498 siam siam -499 iso-ill ISOILLProtocol -500 isakmp isakmp -501 stmf STMF -502 asa-appl-proto asa-appl-proto -503 intrinsa Intrinsa -504 citadel citadel -505 mailbox-lm mailbox-lm -506 ohimsrv ohimsrv -507 crs crs -508 xvttp xvttp -509 snare snare -510 fcp FirstClassProtocol -511 mynet mynet-as -512 exec-or-biff -513 login-or-who -514 shell-or-syslog -515 printer spooler -516 videotex videotex -517 talk liketenexlink,butacross -518 ntalk -519 utime unixtime -520 route -521 ripng ripng -522 ulp ULP -523 ibm-db2 IBM-DB2 -524 ncp NCP -525 timed timeserver -526 tempo newdate -527 stx StockIXChange -528 custix CustomerIXChange -529 irc-serv IRC-SERV -530 courier rpc -531 conference chat -532 netnews readnews -533 netwall foremergencybroadcasts -534 mm-admin MegaMediaAdmin -535 iiop iiop -536 opalis-rdv opalis-rdv -537 nmsp NetworkedMediaStreamingProtocol -538 gdomap gdomap -539 apertus-ldp ApertusTechnologiesLoadDetermination -540 uucp uucpd -541 uucp-rlogin uucp-rlogin -542 commerce commerce -543 klogin -544 kshell krcmd -545 appleqtcsrvr appleqtcsrvr -546 dhcpv6-client DHCPv6Client -547 dhcpv6-server DHCPv6Server -548 afpovertcp AFPoverTCP -549 idfp IDFP -550 new-rwho new-who -551 cybercash cybercash -552 deviceshare deviceshare -553 pirp pirp -554 rtsp RealTimeStreamControlProtocol -555 dsf -556 remotefs rfsserver -557 openvms-sysipc openvms-sysipc -558 sdnskmp SDNSKMP -559 teedtap TEEDTAP -560 rmonitor rmonitord -561 monitor -562 chshell chcmd -563 nntps nntpprotocoloverTLS/SSL(wassnntp) -564 9pfs plan9fileservice -565 whoami whoami -566 streettalk streettalk -567 banyan-rpc banyan-rpc -568 ms-shuttle microsoftshuttle -569 ms-rome microsoftrome -570 meter demon -571 meter udemon -573 banyan-vip banyan-vip -574 ftp-agent FTPSoftwareAgentSystem -575 vemmi VEMMI -576 ipcd ipcd -577 vnas vnas -578 ipdd ipdd -579 decbsrv decbsrv -580 sntp-heartbeat SNTPHEARTBEAT -581 bdp BundleDiscoveryProtocol -582 scc-security SCCSecurity -583 philips-vc PhilipsVideo-Conferencing -584 keyserver KeyServer -585 imap4-ssl IMAP4+SSL(use993instead) -586 password-chg PasswordChange -587 submission Submission -588 cal CAL -589 eyelink EyeLink -590 tns-cml TNSCML -591 http-alt FileMaker,Inc.-HTTPAlternate(see -592 eudora-set EudoraSet -593 http-rpc-epmap HTTPRPCEpMap -594 tpip TPIP -595 cab-protocol CABProtocol -596 smsd SMSD -597 ptcnameservice PTCNameService -598 sco-websrvrmg3 SCOWebServerManager3 -599 acp AeolonCoreProtocol -600 ipcserver SunIPCserver -606 urm CrayUnifiedResourceManager -607 nqs nqs -608 sift-uft Sender-Initiated/UnsolicitedFileTransfer -609 npmp-trap npmp-trap -610 npmp-local npmp-local -611 npmp-gui npmp-gui -612 hmmp-ind HMMPIndication -613 hmmp-op HMMPOperation -614 sshell SSLshell -615 sco-inetmgr InternetConfigurationManager -616 sco-sysmgr SCOSystemAdministrationServer -617 sco-dtmgr SCODesktopAdministrationServer -618 dei-icda DEI-ICDA -619 digital-evm DigitalEVM -620 sco-websrvrmgr SCOWebServerManager -621 escp-ip ESCP -622 collaborator Collaborator -623 aux_bus_shunt AuxBusShunt -624 cryptoadmin CryptoAdmin -625 dec_dlm DECDLM -626 asia ASIA -627 cks-tivioli CKS&TIVIOLI -628 qmqp QMQP -629 3com-amp3 3ComAMP3 -630 rda RDA -631 ipp IPP(InternetPrintingProtocol) -632 bmpp bmpp -633 servstat ServiceStatusupdate(SterlingSoftware) -634 ginad ginad -635 rlzdbase RLZDBase -636 ldaps ldapprotocoloverTLS/SSL(wassldap) -637 lanserver lanserver -638 mcns-sec mcns-sec -639 msdp MSDP -666 mdqs -667 disclose campaigncontributiondisclosures-SDRTechnologies -668 mecomm MeComm -669 meregister MeRegister -670 vacdsm-sws VACDSM-SWS -671 vacdsm-app VACDSM-APP -672 vpps-qua VPPS-QUA -673 cimplex CIMPLEX -674 acap ACAP -675 dctp DCTP -676 vpps-via VPPSVia -704 elcsd errlogcopy/serverdaemon -705 agentx AgentX -707 borland-dsj BorlandDSJ -709 entrust-kmsh EntrustKeyManagementServiceHandler -710 entrust-ash EntrustAdministrationServiceHandler -711 cisco-tdp CiscoTDP -729 netviewdm1 IBMNetViewDM/6000Server/Client -730 netviewdm2 IBMNetViewDM/6000send -731 netviewdm3 IBMNetViewDM/6000receive -741 netgw netGW -742 netrcs NetworkbasedRev.Cont.Sys. -744 flexlm FlexibleLicenseManager -747 fujitsu-dev FujitsuDeviceControl -748 ris-cm RussellInfoSciCalendarManager -749 kerberos-adm kerberosadministration -750 kerberos-iv kerberosversioniv -751 pump -752 qrh -753 rrh -754 tell send -758 nlogin -759 con -760 ns -761 rxe -762 quotad -763 cycleserv -764 omserv -765 webster -767 phonebook phone -769 vid -770 cadlock -771 rtip -772 cycleserv2 -773 notify -774 rpasswd -775 acmaint_transd -776 wpages -780 wpgs -786 concert Concert -787 qsc QSC -800 mdbs_daemon -801 device -829 pkix-3-ca-ra PKIX-3CA/RA -873 rsync rsync -886 iclcnet-locate ICLcoNETionlocateserver -887 iclcnet_svinfo ICLcoNETionserverinfo -888 accessbuilder AccessBuilder -900 omginitialrefs OMGInitialRefs -911 xact-backup xact-backup -989 ftps-data ftpprotocol,data,overTLS/SSL -990 ftps ftpprotocol,control,overTLS/SSL -991 nas NetnewsAdministrationSystem -992 telnets telnetprotocoloverTLS/SSL -993 imaps imap4protocoloverTLS/SSL -994 ircs ircprotocoloverTLS/SSL -995 pop3s pop3protocoloverTLS/SSL(wasspop3) -996 vsinet vsinet -997 maitrd -998 busboy -999 garcon -1000 cadlock -1008 ufsd -1010 surf surf -1011 Reserved -1012 Reserved -1013 Reserved -1014 Reserved -1015 Reserved -1016 Reserved -1017 Reserved -1018 Reserved -1019 Reserved -1020 Reserved -1021 Reserved -1022 Reserved -1025 blackjack networkblackjack -1030 iad1 BBNIAD -1031 iad2 BBNIAD -1032 iad3 BBNIAD -1047 neod1 Sun'sNEOObjectRequestBroker -1048 neod2 Sun'sNEOObjectRequestBroker -1058 nim nim -1059 nimreg nimreg -1067 instl_boots InstallationBootstrapProto.Serv. -1068 instl_bootc InstallationBootstrapProto.Cli. -1080 socks Socks -1083 ansoft-lm-1 AnasoftLicenseManager -1084 ansoft-lm-2 AnasoftLicenseManager -1099 rmiSun -1103 xaudio -1110 nfsd-status Clusterstatusinfo -1111 lmsocialserver LMSocialServer -1123 murray Murray -1155 nfa NetworkFileAccess -1161 health-polling HealthPolling -1162 health-trap HealthTrap -1180 mc-client MillicentClientProxy -1212 lupa lupa -1222 nerv SNIR&Dnetwork -1234 search-agent InfoseekSearchAgent -1239 nmsd NMSD -1248 hermes -1300 h323hostcallsc H323HostCallSecure -1313 bmc_patroldb BMC_PATROLDB -1314 pdps PhotoscriptDistributedPrintingSystem -1345 vpjp VPJP -1346 alta-ana-lm AltaAnalyticsLicenseManager -1347 bbn-mmc multimediaconferencing -1348 bbn-mmx multimediaconferencing -1349 sbook RegistrationNetworkProtocol -1350 editbench RegistrationNetworkProtocol -1351 equationbuilder DigitalToolWorks(MIT) -1352 lotusnote LotusNote -1353 relief ReliefConsulting -1354 rightbrain RightBrainSoftware -1355 intuitive-edge IntuitiveEdge -1356 cuillamartin CuillaMartinCompany -1357 pegboard ElectronicPegBoard -1358 connlcli CONNLCLI -1359 ftsrv FTSRV -1360 mimer MIMER -1361 linx LinX -1362 timeflies TimeFlies -1363 ndm-requester NetworkDataMoverRequester -1364 ndm-server NetworkDataMoverServer -1365 adapt-sna NetworkSoftwareAssociates -1366 netware-csp NovellNetWareCommServicePlatform -1367 dcs DCS -1368 screencast ScreenCast -1369 gv-us GlobalViewtoUnixShell -1370 us-gv UnixShelltoGlobalView -1371 fc-cli FujitsuConfigProtocol -1372 fc-ser FujitsuConfigProtocol -1373 chromagrafx Chromagrafx -1374 molly EPISoftwareSystems -1375 bytex Bytex -1376 ibm-pps IBMPersontoPersonSoftware -1377 cichlid CichlidLicenseManager -1378 elan ElanLicenseManager -1379 dbreporter IntegritySolutions -1380 telesis-licman TelesisNetworkLicenseManager -1381 apple-licman AppleNetworkLicenseManager -1382 udt_os -1383 gwha GWHannawayNetworkLicenseManager -1384 os-licman ObjectiveSolutionsLicenseManager -1385 atex_elmd AtexPublishingLicenseManager -1386 checksum CheckSumLicenseManager -1387 cadsi-lm ComputerAidedDesignSoftwareIncLM -1388 objective-dbc ObjectiveSolutionsDataBaseCache -1389 iclpv-dm DocumentManager -1390 iclpv-sc StorageController -1391 iclpv-sas StorageAccessServer -1392 iclpv-pm PrintManager -1393 iclpv-nls NetworkLogServer -1394 iclpv-nlc NetworkLogClient -1395 iclpv-wsm PCWorkstationManagersoftware -1396 dvl-activemail DVLActiveMail -1397 audio-activmail AudioActiveMail -1398 video-activmail VideoActiveMail -1399 cadkey-licman CadkeyLicenseManager -1400 cadkey-tablet CadkeyTabletDaemon -1401 goldleaf-licman GoldleafLicenseManager -1402 prm-sm-np ProsperoResourceManager -1403 prm-nm-np ProsperoResourceManager -1404 igi-lm InfiniteGraphicsLicenseManager -1405 ibm-res IBMRemoteExecutionStarter -1406 netlabs-lm NetLabsLicenseManager -1407 dbsa-lm DBSALicenseManager -1408 sophia-lm SophiaLicenseManager -1409 here-lm HereLicenseManager -1410 hiq HiQLicenseManager -1411 af AudioFile -1412 innosys InnoSys -1413 innosys-acl Innosys-ACL -1414 ibm-mqseries IBMMQSeries -1415 dbstar DBStar -1416 novell-lu6.2 NovellLU6.2 -1417 timbuktu-srv1 TimbuktuService1Port -1418 timbuktu-srv2 TimbuktuService2Port -1419 timbuktu-srv3 TimbuktuService3Port -1420 timbuktu-srv4 TimbuktuService4Port -1421 gandalf-lm GandalfLicenseManager -1422 autodesk-lm AutodeskLicenseManager -1423 essbase EssbaseArborSoftware -1424 hybrid HybridEncryptionProtocol -1425 zion-lm ZionSoftwareLicenseManager -1426 sais Satellite-dataAcquisitionSystem1 -1427 mloadd mloaddmonitoringtool -1428 informatik-lm InformatikLicenseManager -1429 nms HypercomNMS -1430 tpdu HypercomTPDU -1431 rgtp ReverseGossipTransport -1432 blueberry-lm BlueberrySoftwareLicenseManager -1433 ms-sql-s Microsoft-SQL-Server -1434 ms-sql-m Microsoft-SQL-Monitor -1435 ibm-cics IBMCICS -1436 saism Satellite-dataAcquisitionSystem2 -1437 tabula Tabula -1438 eicon-server EiconSecurityAgent/Server -1439 eicon-x25 EiconX25/SNAGateway -1440 eicon-slp EiconServiceLocationProtocol -1441 cadis-1 CadisLicenseManagement -1442 cadis-2 CadisLicenseManagement -1443 ies-lm IntegratedEngineeringSoftware -1444 marcam-lm MarcamLicenseManagement -1445 proxima-lm ProximaLicenseManager -1446 ora-lm OpticalResearchAssociatesLicenseManager -1447 apri-lm AppliedParallelResearchLM -1448 oc-lm OpenConnectLicenseManager -1449 peport PEport -1450 dwf TandemDistributedWorkbenchFacility -1451 infoman IBMInformationManagement -1452 gtegsc-lm GTEGovernmentSystemsLicenseMan -1453 genie-lm GenieLicenseManager -1454 interhdl_elmd interHDLLicenseManager -1455 esl-lm ESLLicenseManager -1456 dca DCA -1457 valisys-lm ValisysLicenseManager -1458 nrcabq-lm NicholsResearchCorp. -1459 proshare1 ProshareNotebookApplication -1460 proshare2 ProshareNotebookApplication -1461 ibm_wrless_lan IBMWirelessLAN -1462 world-lm WorldLicenseManager -1463 nucleus Nucleus -1464 msl_lmd MSLLicenseManager -1465 pipes PipesPlatformmfarlin@peerlogic.com -1466 oceansoft-lm OceanSoftwareLicenseManager -1467 csdmbase CSDMBASE -1468 csdm CSDM -1469 aal-lm ActiveAnalysisLimitedLicenseManager -1470 uaiact UniversalAnalytics -1471 csdmbase csdmbase -1472 csdm csdm -1473 openmath OpenMath -1474 telefinder Telefinder -1475 taligent-lm TaligentLicenseManager -1476 clvm-cfg clvm-cfg -1477 ms-sna-server ms-sna-server -1478 ms-sna-base ms-sna-base -1479 dberegister dberegister -1480 pacerforum PacerForum -1481 airs AIRS -1482 miteksys-lm MiteksysLicenseManager -1483 afs AFSLicenseManager -1484 confluent ConfluentLicenseManager -1485 lansource LANSource -1486 nms_topo_serv nms_topo_serv -1487 localinfosrvr LocalInfoSrvr -1488 docstor DocStor -1489 dmdocbroker dmdocbroker -1490 insitu-conf insitu-conf -1491 anynetgateway anynetgateway -1492 stone-design-1 stone-design-1 -1493 netmap_lm netmap_lm -1494 ica ica -1495 cvc cvc -1496 liberty-lm liberty-lm -1497 rfx-lm rfx-lm -1498 sybase-sqlany SybaseSQLAny -1499 fhc FedericoHeinzConsultora -1500 vlsi-lm VLSILicenseManager -1501 saiscm Satellite-dataAcquisitionSystem3 -1502 shivadiscovery Shiva -1503 imtc-mcs Databeam -1504 evb-elm EVBSoftwareEngineeringLicenseManager -1505 funkproxy FunkSoftware,Inc. -1506 utcd UniversalTimedaemon(utcd) -1507 symplex symplex -1508 diagmond diagmond -1509 robcad-lm Robcad,Ltd.LicenseManager -1510 mvx-lm MidlandValleyExplorationLtd.Lic.Man. -1511 3l-l1 3l-l1 -1512 wins Microsoft'sWindowsInternetNameService -1513 fujitsu-dtc FujitsuSystemsBusinessofAmerica,Inc -1514 fujitsu-dtcns FujitsuSystemsBusinessofAmerica,Inc -1515 ifor-protocol ifor-protocol -1516 vpad VirtualPlacesAudiodata -1517 vpac VirtualPlacesAudiocontrol -1518 vpvd VirtualPlacesVideodata -1519 vpvc VirtualPlacesVideocontrol -1520 atm-zip-office atmzipoffice -1521 ncube-lm nCubeLicenseManager -1522 ricardo-lm RicardoNorthAmericaLicenseManager -1523 cichild-lm cichild -1524 ingreslock ingres -1525 orasrv oracle -1526 pdap-np ProsperoDataAccessProtnon-priv -1527 tlisrv oracle -1528 mciautoreg micautoreg -1529 coauthor oracle -1530 rap-service rap-service -1531 rap-listen rap-listen -1532 miroconnect miroconnect -1533 virtual-places VirtualPlacesSoftware -1534 micromuse-lm micromuse-lm -1535 ampr-info ampr-info -1536 ampr-inter ampr-inter -1537 sdsc-lm isi-lm -1538 3ds-lm 3ds-lm -1539 intellistor-lm IntellistorLicenseManager -1540 rds rds -1541 rds2 rds2 -1542 gridgen-elmd gridgen-elmd -1543 simba-cs simba-cs -1544 aspeclmd aspeclmd -1545 vistium-share vistium-share -1546 abbaccuray abbaccuray -1547 laplink laplink -1548 axon-lm AxonLicenseManager -1549 shivahose ShivaHose -1550 3m-image-lm ImageStoragelicensemanager3MCompany -1551 hecmtl-db HECMTL-DB -1552 pciarray pciarray -1553 sna-cs sna-cs -1554 caci-lm CACIProductsCompanyLicenseManager -1555 livelan livelan -1556 ashwin AshWinCITecnologies -1557 arbortext-lm ArborTextLicenseManager -1558 xingmpeg xingmpeg -1559 web2host web2host -1560 asci-val asci-val -1561 facilityview facilityview -1562 pconnectmgr pconnectmgr -1563 cadabra-lm CadabraLicenseManager -1564 pay-per-view Pay-Per-View -1565 winddlb WinDD -1566 corelvideo CORELVIDEO -1567 jlicelmd jlicelmd -1568 tsspmap tsspmap -1569 ets ets -1570 orbixd orbixd -1571 rdb-dbs-disp OracleRemoteDataBase -1572 chip-lm ChipcomLicenseManager -1573 itscomm-ns itscomm-ns -1574 mvel-lm mvel-lm -1575 oraclenames oraclenames -1576 moldflow-lm moldflow-lm -1577 hypercube-lm hypercube-lm -1578 jacobus-lm JacobusLicenseManager -1579 ioc-sea-lm ioc-sea-lm -1580 tn-tl-r2 tn-tl-r2 -1581 mil-2045-47001 MIL-2045-47001 -1582 msims MSIMS -1583 simbaexpress simbaexpress -1584 tn-tl-fd2 tn-tl-fd2 -1585 intv intv -1586 ibm-abtact ibm-abtact -1587 pra_elmd pra_elmd -1588 triquest-lm triquest-lm -1589 vqp VQP -1590 gemini-lm gemini-lm -1591 ncpm-pm ncpm-pm -1592 commonspace commonspace -1593 mainsoft-lm mainsoft-lm -1594 sixtrak sixtrak -1595 radio radio -1596 radio-bc radio-bc -1597 orbplus-iiop orbplus-iiop -1598 picknfs picknfs -1599 simbaservices simbaservices -1600 issd -1601 aas aas -1602 inspect inspect -1603 picodbc pickodbc -1604 icabrowser icabrowser -1605 slp SalutationManager(SalutationProtocol) -1606 slm-api SalutationManager(SLM-API) -1607 stt stt -1608 smart-lm SmartCorp.LicenseManager -1609 isysg-lm isysg-lm -1610 taurus-wh taurus-wh -1611 ill InterLibraryLoan -1612 netbill-trans NetBillTransactionServer -1613 netbill-keyrep NetBillKeyRepository -1614 netbill-cred NetBillCredentialServer -1615 netbill-auth NetBillAuthorizationServer -1616 netbill-prod NetBillProductServer -1617 nimrod-agent NimrodInter-AgentCommunication -1618 skytelnet skytelnet -1619 xs-openstorage xs-openstorage -1620 faxportwinport faxportwinport -1621 softdataphone softdataphone -1622 ontime ontime -1623 jaleosnd jaleosnd -1624 udp-sr-port udp-sr-port -1625 svs-omagent svs-omagent -1630 oraclenet8cman OracleNet8Cman -1636 cncp CableNetControlProtocol -1637 cnap CableNetAdminProtocol -1638 cnip CableNetInfoProtocol -1639 cert-initiator cert-initiator -1640 cert-responder cert-responder -1641 invision InVision -1642 isis-am isis-am -1643 isis-ambc isis-ambc -1644 saiseh Satellite-dataAcquisitionSystem4 -1645 datametrics datametrics -1646 sa-msg-port sa-msg-port -1647 rsap rsap -1648 concurrent-lm concurrent-lm -1649 inspect inspect -1650 nkd nkd -1651 shiva_confsrvr shiva_confsrvr -1652 xnmp xnmp -1653 alphatech-lm alphatech-lm -1654 stargatealerts stargatealerts -1655 dec-mbadmin dec-mbadmin -1656 dec-mbadmin-h dec-mbadmin-h -1657 fujitsu-mmpdc fujitsu-mmpdc -1658 sixnetudr sixnetudr -1659 sg-lm SiliconGrailLicenseManager -1660 skip-mc-gikreq skip-mc-gikreq -1661 netview-aix-1 netview-aix-1 -1662 netview-aix-2 netview-aix-2 -1663 netview-aix-3 netview-aix-3 -1664 netview-aix-4 netview-aix-4 -1665 netview-aix-5 netview-aix-5 -1666 netview-aix-6 netview-aix-6 -1667 netview-aix-7 netview-aix-7 -1668 netview-aix-8 netview-aix-8 -1669 netview-aix-9 netview-aix-9 -1670 netview-aix-10 netview-aix-10 -1671 netview-aix-11 netview-aix-11 -1672 netview-aix-12 netview-aix-12 -1673 proshare-mc-1 IntelProshareMulticast -1674 proshare-mc-2 IntelProshareMulticast -1675 pdp PacificDataProducts -1676 netcomm1 netcomm1 -1677 groupwise groupwise -1678 prolink prolink -1679 darcorp-lm darcorp-lm -1680 microcom-sbp microcom-sbp -1681 sd-elmd sd-elmd -1682 lanyon-lantern lanyon-lantern -1683 ncpm-hip ncpm-hip -1684 snaresecure SnareSecure -1685 n2nremote n2nremote -1686 cvmon cvmon -1687 nsjtp-ctrl nsjtp-ctrl -1688 nsjtp-data nsjtp-data -1689 firefox firefox -1690 ng-umds ng-umds -1691 empire-empuma empire-empuma -1692 sstsys-lm sstsys-lm -1693 rrirtr rrirtr -1694 rrimwm rrimwm -1695 rrilwm rrilwm -1696 rrifmm rrifmm -1697 rrisat rrisat -1698 rsvp-encap-1 RSVP-ENCAPSULATION-1 -1699 rsvp-encap-2 RSVP-ENCAPSULATION-2 -1700 mps-raft mps-raft -1701 l2f l2f -1702 deskshare deskshare -1703 hb-engine hb-engine -1704 bcs-broker bcs-broker -1705 slingshot slingshot -1706 jetform jetform -1707 vdmplay vdmplay -1708 gat-lmd gat-lmd -1709 centra centra -1710 impera impera -1711 pptconference pptconference -1712 registrar resourcemonitoringservice -1713 conferencetalk ConferenceTalk -1714 sesi-lm sesi-lm -1715 houdini-lm houdini-lm -1716 xmsg xmsg -1717 fj-hdnet fj-hdnet -1718 h323gatedisc h323gatedisc -1719 h323gatestat h323gatestat -1720 h323hostcall h323hostcall -1721 caicci caicci -1722 hks-lm HKSLicenseManager -1723 pptp pptp -1724 csbphonemaster csbphonemaster -1725 iden-ralp iden-ralp -1726 iberiagames IBERIAGAMES -1727 winddx winddx -1728 telindus TELINDUS -1729 citynl CityNLLicenseManagement -1730 roketz roketz -1731 msiccp MSICCP -1732 proxim proxim -1733 siipat SIMS-SIIPATProtocolforAlarm -1734 cambertx-lm CamberCorporationLicenseManagement -1735 privatechat PrivateChat -1736 street-stream street-stream -1737 ultimad ultimad -1738 gamegen1 GameGen1 -1739 webaccess webaccess -1740 encore encore -1741 cisco-net-mgmt cisco-net-mgmt -1742 3Com-nsd 3Com-nsd -1743 cinegrfx-lm CinemaGraphicsLicenseManager -1744 ncpm-ft ncpm-ft -1745 remote-winsock remote-winsock -1746 ftrapid-1 ftrapid-1 -1747 ftrapid-2 ftrapid-2 -1748 oracle-em1 oracle-em1 -1749 aspen-services aspen-services -1750 sslp SimpleSocketLibrary'sPortMaster -1751 swiftnet SwiftNet -1752 lofr-lm LeapofFaithResearchLicenseManager -1753 translogic-lm TranslogicLicenseManager -1754 oracle-em2 oracle-em2 -1755 ms-streaming ms-streaming -1756 capfast-lmd capfast-lmd -1757 cnhrp cnhrp -1758 tftp-mcast tftp-mcast -1759 spss-lm SPSSLicenseManager -1760 www-ldap-gw www-ldap-gw -1761 cft-0 cft-0 -1762 cft-1 cft-1 -1763 cft-2 cft-2 -1764 cft-3 cft-3 -1765 cft-4 cft-4 -1766 cft-5 cft-5 -1767 cft-6 cft-6 -1768 cft-7 cft-7 -1769 bmc-net-adm bmc-net-adm -1770 bmc-net-svc bmc-net-svc -1771 vaultbase vaultbase -1772 essweb-gw EssWebGateway -1773 kmscontrol KMSControl -1774 global-dtserv global-dtserv -1775 Unknown -1776 femis FederalEmergencyManagementInformationSystem -1777 powerguardian powerguardian -1778 prodigy-intrnet prodigy-internet -1779 pharmasoft pharmasoft -1780 dpkeyserv dpkeyserv -1781 answersoft-lm answersoft-lm -1782 hp-hcip hp-hcip -1783 fjris FujitsuRemoteInstallService -1784 finle-lm FinleLicenseManager -1785 windlm WindRiverSystemsLicenseManager -1786 funk-logger funk-logger -1787 funk-license funk-license -1788 psmond psmond -1789 hello hello -1790 nmsp NarrativeMediaStreamingProtocol -1791 ea1 EA1 -1792 ibm-dt-2 ibm-dt-2 -1793 rsc-robot rsc-robot -1794 cera-bcm cera-bcm -1795 dpi-proxy dpi-proxy -1796 vocaltec-admin VocaltecServerAdministration -1797 uma UMA -1798 etp EventTransferProtocol -1799 netrisk NETRISK -1800 ansys-lm ANSYS-Licensemanager -1801 msmq MicrosoftMessageQue -1802 concomp1 ConComp1 -1803 hp-hcip-gwy HP-HCIP-GWY -1804 enl ENL -1805 enl-name ENL-Name -1806 musiconline Musiconline -1807 fhsp FujitsuHotStandbyProtocol -1808 oracle-vp2 Oracle-VP2 -1809 oracle-vp1 Oracle-VP1 -1810 jerand-lm JerandLicenseManager -1811 scientia-sdb Scientia-SDB -1812 radius RADIUS -1813 radius-acct RADIUSAccounting -1814 tdp-suite TDPSuite -1815 mmpft MMPFT -1816 harp HARP -1818 etftp EnhancedTrivialFileTransferProtocol -1819 plato-lm PlatoLicenseManager -1820 mcagent mcagent -1821 donnyworld donnyworld -1822 es-elmd es-elmd -1823 unisys-lm UnisysNaturalLanguageLicenseManager -1824 metrics-pas metrics-pas -1850 gsi GSI -1860 sunscalar-svc SunSCALARServices -1861 lecroy-vicp LeCroyVICP -1862 techra-server techra-server -1863 msnp MSNP -1864 paradym-31port Paradym31Port -1865 entp ENTP -1870 sunscalar-dns SunSCALARDNSService -1881 ibm-mqseries2 IBMMQSeries -1901 fjicl-tep-a FujitsuICLTerminalEmulatorProgramA -1902 fjicl-tep-b FujitsuICLTerminalEmulatorProgramB -1903 linkname LocalLinkNameResolution -1904 fjicl-tep-c FujitsuICLTerminalEmulatorProgramC -1905 sugp SecureUP.LinkGatewayProtocol -1906 tpmd TPortMapperReq -1907 intrastar IntraSTAR -1908 dawn Dawn -1909 global-wlink GlobalWorldLink -1911 mtp StarlightNetworksMultimediaTransportProtocol -1913 armadp armadp -1914 elm-momentum Elm-Momentum -1915 facelink FACELINK -1916 persona PersoftPersona -1917 noagent nOAgent -1918 can-nds CandleDirectoryService-NDS -1919 can-dch CandleDirectoryService-DCH -1920 can-ferret CandleDirectoryService-FERRET -1921 noadmin NoAdmin -1944 close-combat close-combat -1945 dialogic-elmd dialogic-elmd -1946 tekpls tekpls -1947 hlserver hlserver -1948 eye2eye eye2eye -1949 ismaeasdaqlive ISMAEasdaqLive -1950 ismaeasdaqtest ISMAEasdaqTest -1951 bcs-lmserver bcs-lmserver -1973 dlsrap DataLinkSwitchingRemoteAccessProtocol -1985 hsrp HotStandbyRouterProtocol -1986 licensedaemon ciscolicensemanagement -1987 tr-rsrb-p1 ciscoRSRBPriority1port -1988 tr-rsrb-p2 ciscoRSRBPriority2port -1989 tr-rsrb-p3 ciscoRSRBPriority3port -1990 stun-p1 ciscoSTUNPriority1port -1991 stun-p2 ciscoSTUNPriority2port -1992 stun-p3 ciscoSTUNPriority3port -1993 snmp-tcp-port ciscoSNMPTCPport -1994 stun-port ciscoserialtunnelport -1995 perf-port ciscoperfport -1996 tr-rsrb-port ciscoRemoteSRBport -1997 gdp-port ciscoGatewayDiscoveryProtocol -1998 x25-svc-port ciscoX.25service(XOT) -1999 tcp-id-port ciscoidentificationport -2000 callbook -2001 dc -2002 globe -2004 mailbox -2005 berknet -2006 invokator -2007 dectalk -2008 conf -2009 news -2010 search -2011 raid-cc raid -2012 ttyinfo -2013 raid-am -2014 troff -2015 cypress -2016 bootserver -2017 cypress-stat -2018 terminaldb -2019 whosockami -2020 xinupageserver -2021 servexec -2022 down -2023 xinuexpansion3 -2024 xinuexpansion4 -2025 ellpack -2026 scrabble -2027 shadowserver -2028 submitserver -2030 device2 -2032 blackboard -2033 glogger -2034 scoremgr -2035 imsldoc -2038 objectmanager -2040 lam -2041 interbase -2042 isis isis -2043 isis-bcast isis-bcast -2044 rimsl -2045 cdfunc -2046 sdfunc -2047 dls -2048 dls-monitor -2049 nfsd-or-shilp -2065 dlsrpn DataLinkSwitchReadPortNumber -2067 dlswpn DataLinkSwitchWritePortNumber -2090 lrp LoadReportProtocol -2091 prp PRP -2102 zephyr-srv Zephyrserver -2103 zephyr-clt Zephyrserv-hmconnection -2104 zephyr-hm Zephyrhostmanager -2105 minipay MiniPay -2180 mc-gt-srv MillicentVendorGatewayServer -2200 ici ICI -2201 ats AdvancedTrainingSystemProgram -2202 imtc-map Int.MultimediaTeleconferencingCosortium -2213 kali Kali -2220 ganymede Ganymede -2221 unreg-ab1 Allen-Bradleyunregisteredport -2222 unreg-ab2 Allen-Bradleyunregisteredport -2223 inreg-ab3 Allen-Bradleyunregisteredport -2232 ivs-video IVSVideodefault -2233 infocrypt INFOCRYPT -2234 directplay DirectPlay -2235 sercomm-wlink Sercomm-WLink -2236 nani Nani -2237 optech-port1-lm OptechPort1LicenseManager -2238 aviva-sna AVIVASNASERVER -2239 imagequery ImageQuery -2240 recipe RECIPe -2241 ivsd IVSDaemon -2242 foliocorp FolioRemoteServer -2279 xmquery xmquery -2280 lnvpoller LNVPOLLER -2281 lnvconsole LNVCONSOLE -2282 lnvalarm LNVALARM -2283 lnvstatus LNVSTATUS -2284 lnvmaps LNVMAPS -2285 lnvmailmon LNVMAILMON -2286 nas-metering NAS-Metering -2287 dna DNA -2288 netml NETML -2295 advant-lm AdvantLicenseManager -2296 theta-lm ThetaLicenseManager(Rainbow) -2297 d2k-datamover1 D2KDataMover1 -2298 d2k-datamover2 D2KDataMover2 -2299 pc-telecommute PCTelecommute -2300 cvmmon CVMMON -2301 cpq-wbem CompaqHTTP -2302 binderysupport BinderySupport -2303 proxy-gateway ProxyGateway -2304 attachmate-uts AttachmateUTS -2305 mt-scaleserver MTScaleServer -2306 tappi-boxnet TAPPIBoxNet -2307 pehelp pehelp -2308 sdhelp sdhelp -2309 sdserver SDServer -2310 sdclient SDClient -2311 messageservice MessageService -2313 iapp IAPP(InterAccessPointProtocol) -2314 cr-websystems CRWebSystems -2315 precise-sft PreciseSft. -2316 sent-lm SENTLicenseManager -2317 attachmate-g32 AttachmateG32 -2318 cadencecontrol CadenceControl -2319 infolibria InfoLibria -2320 siebel-ns SiebelNS -2321 rdlap RDLAPoverUDP -2322 ofsd ofsd -2323 3d-nfsd 3d-nfsd -2324 cosmocall Cosmocall -2325 designspace-lm DesignSpaceLicenseManagement -2326 idcp IDCP -2327 xingcsm xingcsm -2328 netrix-sftm NetrixSFTM -2329 nvd NVD -2330 tscchat TSCCHAT -2331 agentview AGENTVIEW -2332 rcc-host RCCHost -2333 snapp SNAPP -2334 ace-client ACEClientAuth -2335 ace-proxy ACEProxy -2336 appleugcontrol AppleUGControl -2337 ideesrv ideesrv -2338 norton-lambert NortonLambert -2339 3com-webview 3ComWebView -2340 wrs_registry WRSRegistry -2341 xiostatus XIOStatus -2342 manage-exec SeagateManageExec -2343 nati-logos natilogos -2344 fcmsys fcmsys -2345 dbm dbm -2346 redstorm_join GameConnectionPort -2347 redstorm_find GameAnnouncementandLocation -2348 redstorm_info Informationtoqueryforgamestatus -2349 redstorm_diag DisgnosticsPort -2350 psbserver psbserver -2351 psrserver psrserver -2352 pslserver pslserver -2353 pspserver pspserver -2354 psprserver psprserver -2355 psdbserver psdbserver -2356 gxtelmd GXTLicenseManagemant -2357 unihub-server UniHubServer -2358 futrix Futrix -2359 flukeserver FlukeServer -2389 ovsessionmgr OpenViewSessionMgr -2390 rsmtp RSMTP -2391 3com-net-mgmt 3COMNetManagement -2392 tacticalauth TacticalAuth -2393 ms-olap1 MSOLAP1 -2394 ms-olap2 MSOLAP2 -2395 lan900_remote LAN900Remote -2396 wusage Wusage -2397 ncl NCL -2398 orbiter Orbiter -2399 fmpro-fdal FileMaker,Inc.-DataAccessLayer -2400 opequus-server OpEquusServer -2401 cvspserver cvspserver -2402 taskmaster2000 TaskMaster2000Server -2403 taskmaster2000 TaskMaster2000Web -2404 iec870-5-104 IEC870-5-104 -2405 trc-netpoll TRCNetpoll -2406 jediserver JediServer -2407 orion Orion -2408 optimanet OptimaNet -2409 sns-protocol SNSProtocol -2410 vrts-registry VRTSRegistry -2411 netwave-ap-mgmt NetwaveAPManagement -2412 cdn CDN -2413 orion-rmi-reg orion-rmi-reg -2414 interlingua Interlingua -2415 comtest COMTEST -2416 rmtserver RMTServer -2417 composit-server CompositServer -2418 cas cas -2419 attachmate-s2s AttachmateS2S -2420 dslremote-mgmt DSLRemoteManagement -2421 g-talk G-Talk -2422 crmsbits CRMSBITS -2423 rnrp RNRP -2424 kofax-svr KOFAX-SVR -2425 fjitsuappmgr FujitsuAppManager -2426 appliantudp AppliantUDP -2427 stgcp SimpletelephonyGatewayControlProtocol -2428 ott OneWayTripTime -2429 ft-role FT-ROLE -2430 venus venus -2431 venus-se venus-se -2432 codasrv codasrv -2433 codasrv-se codasrv-se -2434 pxc-epmap pxc-epmap -2435 optilogic OptiLogic -2436 topx TOP/X -2437 unicontrol UniControl -2438 msp MSP -2439 sybasedbsynch SybaseDBSynch -2440 spearway SpearwayLockser -2441 pvsw-inet pvsw-inet -2442 netangel Netangel -2500 rtsserv ResourceTrackingsystemserver -2501 rtsclient ResourceTrackingsystemclient -2524 optiwave-lm OptiwaveLicenseManagement -2525 ms-v-worlds MSV-Worlds -2526 ema-sent-lm EMALicenseManager -2527 iqserver IQServer -2528 ncr_ccl NCRCCL -2529 utsftp UTSFTP -2530 vrcommerce VRCommerce -2531 ito-e-gui ITO-EGUI -2532 ovtopmd OVTOPMD -2534 combox-web-acc ComboxWebAccess -2564 hp-3000-telnet HP3000NS/VTblockmodetelnet -2592 netrek netrek -2593 mns-mail MNSMailNoticeService -2628 dict DICT -2629 sitaraserver SitaraServer -2630 sitaramgmt SitaraManagement -2631 sitaradir SitaraDir -2632 irdg-post IRdgPost -2633 interintelli InterIntelli -2634 pk-electronics PKElectronics -2635 backburner BackBurner -2636 solve Solve -2637 imdocsvc ImportDocumentService -2638 sybaseanywhere SybaseAnywhere -2639 aminet AMInet -2640 sai_sentlm SabbaghAssociatesLicenceManager -2641 hdl-srv HDLServer -2642 tragic Tragic -2643 gte-samp GTE-SAMP -2644 travsoft-ipx-t TravsoftIPXTunnel -2645 novell-ipx-cmd NovellIPXCMD -2646 and-lm ANDLicenceManager -2647 syncserver SyncServer -2648 upsnotifyprot Upsnotifyprot -2649 vpsipport VPSIPPORT -2650 eristwoguns eristwoguns -2651 ebinsite EBInSite -2652 interpathpanel InterPathPanel -2653 sonus Sonus -2654 corel_vncadmin CorelVNCAdmin -2655 unglue UNIXNtGlue -2656 kana Kana -2657 sns-dispatcher SNSDispatcher -2658 sns-admin SNSAdmin -2659 sns-query SNSQuery -2700 tqdata tqdata -2766 listen -2784 www-dev worldwideweb-development -2785 aic-np aic-np -2786 aic-oncrpc aic-oncrpc-DestinyMCDdatabase -2787 piccolo piccolo-CornerstoneSoftware -2788 fryeserv NetWareLoadableModule-SeagateSoftware -2908 mao mao -2909 funk-dialout FunkDialout -2910 tdaccess TDAccess -2911 blockade Blockade -2912 epicon Epicon -2913 boosterware BoosterWare -2914 gamelobby GameLobby -2915 tksocket TKSocket -2916 elvin_server ElvinServer -2917 elvin_client ElvinClient -2918 kastenchasepad KastenChasePad -2971 netclip NetClip -2972 pmsm-webrctl PMSMWebrctl -2973 svnetworks SVNetworks -2974 signal Signal -2975 fjmpcm FujitsuConfigurationManagementService -2998 realsecure RealSecure -3000 hbci HBCI -3001 redwood-broker RedwoodBroker -3002 exlm-agent EXLMAgent -3003 cgms CGMS -3004 csoftragent CsoftAgent -3005 geniuslm GeniusLicenseManager -3006 ii-admin InstantInternetAdmin -3007 lotusmtap LotusMailTrackingAgentProtocol -3008 midnight-tech MidnightTechnologies -3009 pxc-ntfy PXC-NTFY -3010 gw TelerateWorkstation -3011 trusted-web TrustedWeb -3012 twsdss TrustedWebClient -3013 gilatskysurfer GilatSkySurfer -3014 broker_service BrokerService -3015 nati-dstp NATIDSTP -3016 notify_srvr NotifyServer -3017 event_listener EventListener -3018 srvc_registry ServiceRegistry -3019 resource_mgr ResourceManager -3020 cifs CIFS -3021 agriserver AGRIServer -3047 hlserver FastSecurityHLServer -3048 pctrader SierraNetPCTrader -3049 nsws NSWS -3080 stm_pproc stm_pproc -3105 cardbox Cardbox -3106 cardbox-http CardboxHTTP -3130 icpv2 ICPv2 -3131 netbookmark NetBookMark -3141 vmodem VMODEM -3142 rdc-wh-eos RDCWHEOS -3143 seaview SeaView -3144 tarantella Tarantella -3145 csi-lfap CSI-LFAP -3147 rfio RFIO -3180 mc-brk-srv MillicentBrokerServer -3264 ccmail cc:mail/lotus -3265 altav-tunnel AltavTunnel -3266 ns-cfg-server NSCFGServer -3267 ibm-dial-out IBMDialOut -3268 msft-gc MicrosoftGlobalCatalog -3269 msft-gc-ssl MicrosoftGlobalCatalogwithLDAP/SSL -3270 verismart Verismart -3271 csoft-prev CSoftPrevPort -3272 user-manager FujitsuUserManager -3273 sxmp SimpleExtensibleMultiplexedProtocol -3274 ordinox-server OrdinoxServer -3275 samd SAMD -3276 maxim-asics MaximASICs -3277 awg-proxy AWGProxy -3278 lkcmserver LKCMServer -3279 admind admind -3280 vs-server VSServer -3281 sysopt SYSOPT -3282 datusorb Datusorb -3283 net-assistant NetAssistant -3284 4talk 4Talk -3285 plato Plato -3286 e-net E-Net -3287 directvdata DIRECTVDATA -3288 cops COPS -3289 enpc ENPC -3290 caps-lm CAPSLOGISTICSTOOLKIT-LM -3291 sah-lm SAHolditch&Associates- -3292 cart-o-rama CartORama -3293 fg-fps fg-fps -3294 fg-gip fg-gip -3295 dyniplookup DynamicIPLookup -3296 rib-slm RibLicenseManager -3297 cytel-lm CytelLicenseManager -3298 transview Transview -3299 pdrncs pdrncs -3300 bmcpatrolagent BMCPatrolAgent -3301 bmcpatrolrnvu BMCPatrolRendezvous -3302 mcs-fastmail MCSFastmail -3303 opsession-clnt OPSessionClient -3304 opsession-srvr OPSessionServer -3305 odette-ftp ODETTE-FTP -3306 mysql MySQL -3307 opsession-prxy OPSessionProxy -3308 tns-server TNSServer -3309 tns-adv TNDADV -3310 dyna-access DynaAccess -3311 mcns-tel-ret MCNSTelRet -3312 appman-server ApplicationManagementServer -3313 uorb UnifyObjectBroker -3314 uohost UnifyObjectHost -3315 cdid CDID -3316 aicc-cmi AICC/CMI -3317 vsaiport VSAIPORT -3318 ssrip SwithtoSwithRoutingInformationProtocol -3319 sdt-lmd SDTLicenseManager -3320 officelink2000 OfficeLink2000 -3321 vnsstr VNSSTR -3322 active-net -3323 active-net -3324 active-net -3325 active-net -3326 sftu SFTU -3327 bbars BBARS -3328 egptlm EaglepointLicenseManager -3329 hp-device-disc HPDeviceDisc -3330 mcs-calypsoicf MCSCalypsoICF -3331 mcs-messaging MCSMessaging -3332 mcs-mailsvr MCSMailServer -3333 dec-notes DECNotes -3334 directv-web DirectTVWebcasting -3335 directv-soft DirectTVSoftwareUpdates -3336 directv-tick DirectTVTickers -3337 directv-catlg DirectTVDataCatalog -3338 anet-b OMFdatab -3339 anet-l OMFdatal -3340 anet-m OMFdatam -3341 anet-h OMFdatah -3342 webtie WebTIE -3343 ms-cluster-net MSClusterNet -3344 bnt-manager BNTManager -3345 influence Influence -3346 trnsprntproxy TrnsprntProxy -3347 phoenix-rpc PhoenixRPC -3348 pangolin-laser PangolinLaser -3349 chevinservices ChevinServices -3350 findviatv FINDVIATV -3351 btrieve BTRIEVE -3352 ssql SSQL -3353 fatpipe FATPIPE -3354 suitjd SUITJD -3355 ordinox-dbase OrdinoxDbase -3356 upnotifyps UPNOTIFYPS -3357 adtech-test AdtechTestIP -3358 mpsysrmsvr MpSysRmsvr -3359 wg-netforce WGNetForce -3360 kv-server KVServer -3361 kv-agent KVAgent -3362 dj-ilm DJILM -3363 nati-vi-server NATIViServer -3364 creativeserver CreativeServer -3365 contentserver ContentServer -3366 creativepartnr CreativePartner -3367 satvid-dtalnk -3368 satvid-dtalnk -3369 satvid-dtalnk -3370 satvid-dtalnk -3371 satvid-dtalnk -3372 tip2 TIP2 -3373 lavenir-lm LavenirLicenseManager -3374 cluster-disc ClusterDisc -3375 vsnm-agent VSNMAgent -3376 cdbroker CDBroker -3377 cogsys-lm CogsysNetworkLicenseManager -3378 wsicopy WSICOPY -3379 socorfs SOCORFS -3380 sns-channels SNSChannels -3381 geneous Geneous -3382 fujitsu-neat FujitsuNetworkEnhancedAntitheftfunction -3383 esp-lm EnterpriseSoftwareProductsLicenseManager -3384 hp-clic HardwareManagement -3385 qnxnetman qnxnetman -3386 gprs-sig GPRSSIG -3387 backroomnet BackRoomNet -3388 cbserver CBServer -3389 ms-wbt-server MSWBTServer -3390 dsc DistributedServiceCoordinator -3391 savant SAVANT -3392 efi-lm EFILicenseManagement -3393 d2k-tapestry1 D2KTapestryClienttoServer -3394 d2k-tapestry2 D2KTapestryServertoServer -3395 dyna-lm DynaLicenseManager(Elam) -3396 printer_agent PrinterAgent -3397 cloanto-lm CloantoLicenseManager -3398 mercantile Mercantile -3421 bmap BullAppriseportmapper -3454 mira AppleRemoteAccessProtocol -3455 prsvp RSVPPort -3456 vat VATdefaultdata -3457 vat-control VATdefaultcontrol -3458 d3winosfi DsWinOSFI -3459 integral Integral -3460 edm-manager EDMManger -3461 edm-stager EDMStager -3462 edm-std-notify EDMSTDNotify -3463 edm-adm-notify EDMADMNotify -3464 edm-mgr-sync EDMMGRSync -3465 edm-mgr-cntrl EDMMGRCntrl -3466 workflow WORKFLOW -3563 watcomdebug WatcomDebug -3900 udt_os UnidataUDTOS -3984 mapper-nodemgr MAPPERnetworknodemanager -3985 mapper-mapethd MAPPERTCP/IPserver -3986 mapper-ws_ethd MAPPERworkstationserver -3987 centerline Centerline -4000 terabase Terabase -4001 newoak NewOak -4008 netcheque NetChequeaccounting -4009 chimera-hwm ChimeraHWM -4010 samsung-unidex SamsungUnidex -4011 altserviceboot AlternateServiceBoot -4012 pda-gate PDAGate -4013 acl-manager ACLManager -4014 taiclock TAICLOCK -4045 lockd -4096 bre BRE(BridgeRelayElement) -4132 nuts_dem NUTSDaemon -4133 nuts_bootp NUTSBootpServer -4134 nifty-hmi NIFTY-ServeHMIprotocol -4141 oirtgsvc WorkflowServer -4142 oidocsvc DocumentServer -4143 oidsr DocumentReplication -4200 VRML -4201 VRML -4202 VRML -4203 VRML -4204 VRML -4205 VRML -4206 VRML -4207 VRML -4208 VRML -4209 VRML -4210 VRML -4211 VRML -4212 VRML -4213 VRML -4214 VRML -4215 VRML -4216 VRML -4217 VRML -4218 VRML -4219 VRML -4220 VRML -4221 VRML -4222 VRML -4223 VRML -4224 VRML -4225 VRML -4226 VRML -4227 VRML -4228 VRML -4229 VRML -4230 VRML -4231 VRML -4232 VRML -4233 VRML -4234 VRML -4235 VRML -4236 VRML -4237 VRML -4238 VRML -4239 VRML -4240 VRML -4241 VRML -4242 VRML -4243 VRML -4244 VRML -4245 VRML -4246 VRML -4247 VRML -4248 VRML -4249 VRML -4250 VRML -4251 VRML -4252 VRML -4253 VRML -4254 VRML -4255 VRML -4256 VRML -4257 VRML -4258 VRML -4259 VRML -4260 VRML -4261 VRML -4262 VRML -4263 VRML -4264 VRML -4265 VRML -4266 VRML -4267 VRML -4268 VRML -4269 VRML -4270 VRML -4271 VRML -4272 VRML -4273 VRML -4274 VRML -4275 VRML -4276 VRML -4277 VRML -4278 VRML -4279 VRML -4280 VRML -4281 VRML -4282 VRML -4283 VRML -4284 VRML -4285 VRML -4286 VRML -4287 VRML -4288 VRML -4289 VRML -4290 VRML -4291 VRML -4292 VRML -4293 VRML -4294 VRML -4295 VRML -4296 VRML -4297 VRML -4298 VRML -4299 VRML -4300 corelccam CorelCCam -4321 rwhois RemoteWhoIs -4343 unicall UNICALL -4344 vinainstall VinaInstall -4345 m4-network-as Macro4NetworkAS -4346 elanlm ELANLM -4347 lansurveyor LANSurveyor -4348 itose ITOSE -4349 fsportmap FileSystemPortMap -4350 net-device NetDevice -4351 plcy-net-svcs PLCYNetServices -4444 krb524 KRB524 -4445 upnotifyp UPNOTIFYP -4446 n1-fwp N1-FWP -4447 n1-rmgmt N1-RMGMT -4448 asc-slmd ASCLicenceManager -4449 privatewire PrivateWire -4450 camp Camp -4451 ctisystemmsg CTISystemMsg -4452 ctiprogramload CTIProgramLoad -4453 nssalertmgr NSSAlertManager -4454 nssagentmgr NSSAgentManager -4455 prchat-user PRChatUser -4456 prchat-server PRChatServer -4457 prRegister PRRegister -4500 sae-urn sae-urn -4501 urn-x-cdchoice urn-x-cdchoice -4545 highscore Highscore -4546 sf-lm SFLicenseManager(Sentinel) -4547 lanner-lm LannerLicenseManager -4672 rfa remotefileaccessserver -4800 iims IconaInstantMessengingSystem -4801 iwec IconaWebEmbeddedChat -4802 ilss IconaLicenseSystemServer -4827 htcp HTCP -4868 phrelay PhotonRelay -4869 phrelaydbg PhotonRelayDebug -4885 abbs ABBS -5000 commplex-main -5001 commplex-link -5002 rfe radiofreeethernet -5003 fmpro-internal FileMaker,Inc.-Proprietarynamebinding -5004 avt-profile-1 avt-profile-1 -5005 avt-profile-2 avt-profile-2 -5010 telelpathstart TelepathStart -5011 telelpathattack TelepathAttack -5020 zenginkyo-1 zenginkyo-1 -5021 zenginkyo-2 zenginkyo-2 -5050 mmcc multimediaconferencecontroltool -5051 ita-agent ITAAgent -5052 ita-manager ITAManager -5060 sip SIP -5145 rmonitor_secure -5150 atmp AscendTunnelManagementProtocol -5190 aol America-Online -5191 aol-1 AmericaOnline1 -5192 aol-2 AmericaOnline2 -5193 aol-3 AmericaOnline3 -5236 padl2sim -5272 pk PK -5300 hacl-hb #HAclusterheartbeat -5301 hacl-gs #HAclustergeneralservices -5302 hacl-cfg #HAclusterconfiguration -5303 hacl-probe #HAclusterprobing -5304 hacl-local #HAClusterCommands -5305 hacl-test #HAClusterTest -5306 sun-mc-grp SunMCGroup -5307 sco-aip SCOAIP -5308 cfengine CFengine -5309 jprinter JPrinter -5310 outlaws Outlaws -5311 tmlogin TMLogin -5400 excerpt ExcerptSearch -5401 excerpts ExcerptSearchSecure -5402 mftp MFTP -5403 hpoms-ci-lstn HPOMS-CI-LSTN -5404 hpoms-dps-lstn HPOMS-DPS-LSTN -5405 netsupport NetSupport -5406 systemics-sox SystemicsSox -5407 foresyte-clear Foresyte-Clear -5408 foresyte-sec Foresyte-Sec -5409 salient-dtasrv SalientDataServer -5410 salient-usrmgr SalientUserManager -5411 actnet ActNet -5412 continuus Continuus -5413 wwiotalk WWIOTALK -5414 statusd StatusD -5415 ns-server NSServer -5416 sns-gateway SNSGateway -5417 sns-agent SNSAgent -5418 mcntp MCNTP -5419 dj-ice DJ-ICE -5420 cylink-c Cylink-C -5500 fcp-addr-srvr1 fcp-addr-srvr1 -5501 fcp-addr-srvr2 fcp-addr-srvr2 -5502 fcp-srvr-inst1 fcp-srvr-inst1 -5503 fcp-srvr-inst2 fcp-srvr-inst2 -5504 fcp-cics-gw1 fcp-cics-gw1 -5555 personal-agent PersonalAgent -5599 esinstall EnterpriseSecurityRemoteInstall -5600 esmmanager EnterpriseSecurityManager -5601 esmagent EnterpriseSecurityAgent -5602 a1-msc A1-MSC -5603 a1-bs A1-BS -5604 a3-sdunode A3-SDUNode -5605 a4-sdunode A4-SDUNode -5631 pcanywheredata pcANYWHEREdata -5632 pcanywherestat pcANYWHEREstat -5678 rrac RemoteReplicationAgentConnection -5679 dccm DirectCableConnectManager -5713 proshareaudio proshareconfaudio -5714 prosharevideo proshareconfvideo -5715 prosharedata proshareconfdata -5716 prosharerequest proshareconfrequest -5717 prosharenotify proshareconfnotify -5729 openmail OpenmailUserAgentLayer -5741 ida-discover1 IDADiscoverPort1 -5742 ida-discover2 IDADiscoverPort2 -5745 fcopy-server fcopy-server -5746 fcopys-server fcopys-server -5755 openmailg OpenMailDeskGatewayserver -5757 x500ms OpenMailX.500DirectoryServer -5766 openmailns OpenMailNewMailServer -5767 s-openmail OpenMailSuerAgentLayer(Secure) -5768 openmailpxy OpenMailCMTSServer -6000 X11 -6001 X11 -6002 X11 -6003 X11 -6004 X11 -6005 X11 -6006 X11 -6007 X11 -6008 X11 -6009 X11 -6010 X11 -6011 X11 -6012 X11 -6013 X11 -6014 X11 -6015 X11 -6016 X11 -6017 X11 -6018 X11 -6019 X11 -6020 X11 -6021 X11 -6022 X11 -6023 X11 -6024 X11 -6025 X11 -6026 X11 -6027 X11 -6028 X11 -6029 X11 -6030 X11 -6031 X11 -6032 X11 -6033 X11 -6034 X11 -6035 X11 -6036 X11 -6037 X11 -6038 X11 -6039 X11 -6040 X11 -6041 X11 -6042 X11 -6043 X11 -6044 X11 -6045 X11 -6046 X11 -6047 X11 -6048 X11 -6049 X11 -6050 X11 -6051 X11 -6052 X11 -6053 X11 -6054 X11 -6055 X11 -6056 X11 -6057 X11 -6058 X11 -6059 X11 -6060 X11 -6061 X11 -6062 X11 -6063 X11 -6110 softcm HPSoftBenchCM -6111 spc HPSoftBenchSub-ProcessControl -6112 dtspcd dtspcd -6123 backup-express BackupExpress -6141 meta-corp MetaCorporationLicenseManager -6142 aspentec-lm AspenTechnologyLicenseManager -6143 watershed-lm WatershedLicenseManager -6144 statsci1-lm StatSciLicenseManager-1 -6145 statsci2-lm StatSciLicenseManager-2 -6146 lonewolf-lm LoneWolfSystemsLicenseManager -6147 montage-lm MontageLicenseManager -6148 ricardo-lm RicardoNorthAmericaLicenseManager -6149 tal-pod tal-pod -6253 crip CRIP -6389 clariion-evr01 clariion-evr01 -6455 skip-cert-recv SKIPCertificateReceive -6456 skip-cert-send SKIPCertificateSend -6471 lvision-lm LVisionLicenseManager -6500 boks BoKSMaster -6501 boks_servc BoKSServc -6502 boks_servm BoKSServm -6503 boks_clntd BoKSClntd -6505 badm_priv BoKSAdminPrivatePort -6506 badm_pub BoKSAdminPublicPort -6507 bdir_priv BoKSDirServer,PrivatePort -6508 bdir_pub BoKSDirServer,PublicPort -6558 xdsxdm -6665 ircu -6666 ircu -6667 ircu -6668 ircu -6669 ircu IRCU -6670 vocaltec-gold VocaltecGlobalOnlineDirectory -6672 vision_server vision_server -6673 vision_elmd vision_elmd -6701 kti-icad-srvr KTI/ICADNameserver -6790 hnmp HNMP -6831 ambit-lm ambit-lm -6969 acmsoda acmsoda -7000 afs3-fileserver fileserveritself -7001 afs3-callback callbackstocachemanagers -7002 afs3-prserver users&groupsdatabase -7003 afs3-vlserver volumelocationdatabase -7004 afs3-kaserver AFS/Kerberosauthenticationservice -7005 afs3-volser volumemanagementserver -7006 afs3-errors errorinterpretationservice -7007 afs3-bos basicoverseerprocess -7008 afs3-update server-to-serverupdater -7009 afs3-rmtsys remotecachemanagerservice -7010 ups-onlinet onlinetuninterruptablepowersupplies -7020 dpserve DPServe -7021 dpserveadmin DPServeAdmin -7070 arcp ARCP -7099 lazy-ptop lazy-ptop -7100 font-service XFontService -7121 virprot-lm VirtualPrototypesLicenseManager -7174 clutild Clutild -7200 fodms FODMSFLIP -7201 dlip DLIP -7395 winqedit winqedit -7426 pmdmgr OpenViewDMPostmasterManager -7427 oveadmgr OpenViewDMEventAgentManager -7428 ovladmgr OpenViewDMLogAgentManager -7429 opi-sock OpenViewDMrqtcommunication -7430 xmpv7 OpenViewDMxmpv7apipipe -7431 pmd OpenViewDMovc/xmpv3apipipe -7491 telops-lmd telops-lmd -7511 pafec-lm pafec-lm -7544 nta-ds FlowAnalyzerDisplayServer -7545 nta-us FlowAnalyzerUtilityServer -7570 aries-kfinder AriesKfinder -7588 sun-lm SunLicenseManager -7777 cbt cbt -7781 accu-lmgr accu-lmgr -7932 t2-drm Tier2DataResourceManager -7933 t2-brm Tier2BusinessRulesManager -7980 quest-vista QuestVista -7999 irdmi2 iRDMI2 -8000 irdmi iRDMI -8001 vcom-tunnel VCOMTunnel -8008 http-alt HTTPAlternate -8032 pro-ed ProEd -8033 mindprint MindPrint -8080 http-alt HTTPAlternate(seeport80) -8200 trivnet1 TRIVNET -8201 trivnet2 TRIVNET -8376 cruise-enum CruiseENUM -8377 cruise-swroute CruiseSWROUTE -8378 cruise-config CruiseCONFIG -8379 cruise-diags CruiseDIAGS -8380 cruise-update CruiseUPDATE -8400 cvd cvd -8401 sabarsd sabarsd -8402 abarsd abarsd -8403 admind admind -8450 npmp npmp -8473 vp2p VitualPointtoPoint -8554 rtsp-alt RTSPAlternate(seeport554) -8765 ultraseek-http UltraseekHTTP -8880 cddbp-alt CDDBP -8888 ddi-tcp-1 NewsEDGEserverTCP(TCP1) -8889 ddi-tcp-2 DesktopDataTCP1 -8890 ddi-tcp-3 DesktopDataTCP2 -8891 ddi-tcp-4 DesktopDataTCP3:NESSapplication -8892 ddi-tcp-5 DesktopDataTCP4:FARMproduct -8893 ddi-tcp-6 DesktopDataTCP5:NewsEDGE/Webapplication -8894 ddi-tcp-7 DesktopDataTCP6:COALapplication -9000 cslistener CSlistener -9006 sctp SCTP -9090 websm WebSM -9535 man -9594 msgsys MessageSystem -9595 pds PingDiscoveryService -9876 sd SessionDirector -9888 cyborg-systems CYBORGSystems -9898 monkeycom MonkeyCom -9992 palace Palace -9993 palace Palace -9994 palace Palace -9995 palace Palace -9996 palace Palace -9997 palace Palace -9998 distinct32 Distinct32 -9999 distinct distinct -10000 ndmp NetworkDataManagementProtocol -10007 mvs-capacity MVSCapacity -11001 metasys Metasys -11367 atm-uhas ATMUHAS -12000 entextxid IBMEnterpriseExtenderSNAXIDExchange -12001 entextnetwk IBMEnterpriseExtenderSNACOSNetwork -12002 entexthigh IBMEnterpriseExtenderSNACOSHigh -12003 entextmed IBMEnterpriseExtenderSNACOSMedium -12004 entextlow IBMEnterpriseExtenderSNACOSLow -12753 tsaf tsafport -13160 i-zipqd I-ZIPQD -13720 bprd BPRDProtocol(VERITASNetBackup) -13721 bpbrm BPBRMProtocol(VERITASNetBackup) -13782 bpcd VERITASNetBackup -13818 dsmcc-config DSMCCConfig -13819 dsmcc-session DSMCCSessionMessages -13820 dsmcc-passthru DSMCCPass-ThruMessages -13821 dsmcc-download DSMCCDownloadProtocol -13822 dsmcc-ccp DSMCCChannelChangeProtocol -14001 itu-sccp-ss7 ITUSCCP(SS7) -17007 isode-dua -17219 chipper Chipper -18000 biimenu BeckmanInstruments,Inc. -19541 jcp JCPClient -21845 webphone webphone -21846 netspeak-is NetSpeakCorp.DirectoryServices -21847 netspeak-cs NetSpeakCorp.ConnectionServices -21848 netspeak-acd NetSpeakCorp.AutomaticCallDistribution -21849 netspeak-cps NetSpeakCorp.CreditProcessingSystem -22273 wnn6 wnn6 -22555 vocaltec-wconf VocaltecWebConference -22800 aws-brf TelerateInformationPlatformLAN -22951 brf-gw TelerateInformationPlatformWAN -24000 med-ltp med-ltp -24001 med-fsp-rx med-fsp-rx -24002 med-fsp-tx med-fsp-tx -24003 med-supp med-supp -24004 med-ovw med-ovw -24005 med-ci med-ci -24006 med-net-svc med-net-svc -25000 icl-twobase1 icl-twobase1 -25001 icl-twobase2 icl-twobase2 -25002 icl-twobase3 icl-twobase3 -25003 icl-twobase4 icl-twobase4 -25004 icl-twobase5 icl-twobase5 -25005 icl-twobase6 icl-twobase6 -25006 icl-twobase7 icl-twobase7 -25007 icl-twobase8 icl-twobase8 -25008 icl-twobase9 icl-twobase9 -25009 icl-twobase10 icl-twobase10 -25793 vocaltec-hos VocaltecAddressServer -26000 quake quake -26208 wnn6-ds wnn6-ds -27000 flex-lm -27001 flex-lm FLEXLM(1-10) -27002 flex-lm FLEXLM(1-10) -27003 flex-lm FLEXLM(1-10) -27004 flex-lm FLEXLM(1-10) -27005 flex-lm FLEXLM(1-10) -27006 flex-lm FLEXLM(1-10) -27007 flex-lm FLEXLM(1-10) -27008 flex-lm FLEXLM(1-10) -27009 flex-lm FLEXLM(1-10) -27999 tw-auth-key TWAuthentication/KeyDistributionand -33434 traceroute tracerouteuse -44818 rockwell-encap RockwellEncapsulation -45678 eba EBAPRISE -47557 dbbrowse DatabeamCorporation -47624 directplaysrvr DirectPlayServer -47806 ap ALCProtocol -47808 bacnet BuildingAutomationandControlNetworks diff --git a/contrib/ipfilter/perl/ipf-mrtg.pl b/contrib/ipfilter/perl/ipf-mrtg.pl deleted file mode 100644 index cce30ab..0000000 --- a/contrib/ipfilter/perl/ipf-mrtg.pl +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/local/bin/perl -# reads stats and uptime for ip-filter for mrtg -# ron@rosie.18james.com, 2 Jan 2000 - -my $firewall = "IP Filter v3.3.3"; -my($in_pkts,$out_pkts) = (0,0); - -open(FW, "/sbin/ipfstat -hi|") || die "cannot open ipfstat -hi\n"; -while (<FW>) { - $in_pkts += $1 if (/^(\d+)\s+pass\s+in\s+quick.*group\s+1\d0/); -} -close(FW); -open(FW, "/sbin/ipfstat -ho|") || die "cannot open ipfstat -ho\n"; -while (<FW>) { - $out_pkts += $1 if (/^(\d+)\s+pass\s+out\s+quick.*group\s+1\d0/); -} -print "$in_pkts\n", - "$out_pkts\n"; -my $uptime = `/usr/bin/uptime`; -$uptime =~ /^\s+(\d{1,2}:\d{2}..)\s+up\s+(\d+)\s+(......),/; -print "$2 $3\n", - "$firewall\n";
\ No newline at end of file diff --git a/contrib/ipfilter/perl/ipfmeta.pl b/contrib/ipfilter/perl/ipfmeta.pl deleted file mode 100644 index decc35b..0000000 --- a/contrib/ipfilter/perl/ipfmeta.pl +++ /dev/null @@ -1,210 +0,0 @@ -#!/usr/bin/perl -w -# -# Written by Camiel Dobbelaar <cd@sentia.nl>, Aug-2000 -# ipfmeta is in the Public Domain. -# - -use strict; -use Getopt::Std; - -## PROCESS COMMANDLINE -our($opt_v); $opt_v=1; -getopts('v:') || die "usage: ipfmeta [-v verboselevel] [objfile]\n"; -my $verbose = $opt_v + 0; -my $objfile = shift || "ipf.objs"; -my $MAXRECURSION = 10; - -## READ OBJECTS -open(FH, "$objfile") || die "cannot open $objfile: $!\n"; -my @tokens; -while (<FH>) { - chomp; - s/#.*$//; # remove comments - s/^\s+//; # compress whitespace - s/\s+$//; - next if m/^$/; # skip empty lines - push (@tokens, split); -} -close(FH) || die "cannot close $objfile: $!\n"; -# link objects with their values -my $obj=""; -my %objs; -while (@tokens) { - my $token = shift(@tokens); - if ($token =~ m/^\[([^]]*)\]$/) { - # new object - $obj = $1; - } else { - # new value - push(@{$objs{$obj}}, $token) unless ($obj eq ""); - } -} - -# sort objects: longest first -my @objs = sort { length($b) <=> length($a) } keys %objs; - -## SUBSTITUTE OBJECTS WITH THEIR VALUES FROM STDIN -foreach (<STDIN>) { - foreach (expand($_, 0)) { - print; - } -} - -## END - -sub expand { - my $line = shift; - my $level = shift; - my @retlines = $line; - my $obj; - my $val; - - # coarse protection - if ($level > $MAXRECURSION) { - print STDERR "ERR: recursion exceeds $MAXRECURSION levels\n"; - return; - } - - foreach $obj (@objs) { - if ($line =~ m/$obj/) { - @retlines = ""; - if ($level < $verbose) { - # add metarule as a comment - push(@retlines, "# ".$line); - } - foreach $val (@{$objs{$obj}}) { - my $newline = $line; - $newline =~ s/$obj/$val/; - push(@retlines, expand($newline, $level+1)); - } - last; - } - } - - return @retlines; -} - -__END__ - -=head1 NAME - -B<ipfmeta> - use objects in IP filter files - -=head1 SYNOPSIS - -B<ipfmeta> [F<options>] [F<objfile>] - -=head1 DESCRIPTION - -B<ipfmeta> is used to simplify the maintenance of your IP filter -ruleset. It does this through the use of 'objects'. A matching -object gets replaced by its values at runtime. This is similar to -what a macro processor like m4 does. - -B<ipfmeta> is specifically geared towards IP filter. It is line -oriented, if an object has multiple values, the line with the object -is duplicated and substituted for each value. It is also recursive, -an object may have another object as a value. - -Rules to be processed are read from stdin, output goes to stdout. - -The verbose option allows for the inclusion of the metarules in the -output as comments. - -Definition of the objects and their values is done in a separate -file, the filename defaults to F<ipf.objs>. An object is delimited -by square brackets. A value is delimited by whitespace. Comments -start with '#' and end with a newline. Empty lines and extraneous -whitespace are allowed. A value belongs to the first object that -precedes it. - -It is recommended that you use all caps or another distinguishing -feature for object names. You can use B<ipfmeta> for NAT rules also, -for instance to keep them in sync with filter rules. Combine -B<ipfmeta> with a Makefile to save typing. - -=head1 OPTIONS - -=over 4 - -=item B<-v> I<verboselevel> - -Include metarules in output as comments. Default is 1, the top level -metarules. Higher levels cause expanded metarules to be included. -Level 0 does not add comments at all. - -=back - -=head1 BUGS - -A value can not have whitespace in it. - -=head1 EXAMPLE - -(this does not look good, formatted) - -I<ipf.objs> - -[PRIVATE] 10.0.0.0/8 127.0.0.0/8 172.16.0.0/12 192.168.0.0/16 - -[MULTICAST] 224.0.0.0/4 - -[UNWANTED] PRIVATE MULTICAST - -[NOC] xxx.yy.zz.1/32 xxx.yy.zz.2/32 - -[WEBSERVERS] 192.168.1.1/32 192.168.1.2/32 - -[MGMT-PORTS] 22 23 - -I<ipf.metarules> - -block in from UNWANTED to any - -pass in from NOC to WEBSERVERS port = MGMT-PORTS - -pass out all - -I<Run> - -ipfmeta ipf.objs <ipf.metarules >ipf.rules - -I<Output> - -# block in from UNWANTED to any - -block in from 10.0.0.0/8 to any - -block in from 127.0.0.0/8 to any - -block in from 172.16.0.0/12 to any - -block in from 192.168.0.0/16 to any - -block in from 224.0.0.0/4 to any - -# pass in from NOC to WEBSERVERS port = MGMT-PORTS - -pass in from xxx.yy.zz.1/32 to 192.168.1.1/32 port = 22 - -pass in from xxx.yy.zz.1/32 to 192.168.1.1/32 port = 23 - -pass in from xxx.yy.zz.1/32 to 192.168.1.2/32 port = 22 - -pass in from xxx.yy.zz.1/32 to 192.168.1.2/32 port = 23 - -pass in from xxx.yy.zz.2/32 to 192.168.1.1/32 port = 22 - -pass in from xxx.yy.zz.2/32 to 192.168.1.1/32 port = 23 - -pass in from xxx.yy.zz.2/32 to 192.168.1.2/32 port = 22 - -pass in from xxx.yy.zz.2/32 to 192.168.1.2/32 port = 23 - -pass out all - -=head1 AUTHOR - -Camiel Dobbelaar <cd@sentia.nl>. B<ipfmeta> is in the Public Domain. - -=cut diff --git a/contrib/ipfilter/perl/logfilter.pl b/contrib/ipfilter/perl/logfilter.pl deleted file mode 100644 index fd0da6d..0000000 --- a/contrib/ipfilter/perl/logfilter.pl +++ /dev/null @@ -1,181 +0,0 @@ -#!perl.exe - -# Author: Chris Grant -# Copyright 1999, Codetalker Communications, Inc. -# -# This script takes a firewall log and breaks it into several -# different files. Each file is named based on the service that -# runs on the port that was recognized in log line. After -# this script has run, you should end up with several files. -# Of course you will have the original log file and then files -# such as web.log, telnet.log, pop3.log, imap.log, backorifice.log, -# netbus.log, and unknown.log. -# -# The number of entries in unknown.log should be minimal. The -# mappings of the port numbers and file names are stored in the bottom -# of this file in the data section. Simply look at the ports being hit, -# find out what these ports do, and add them to the data section. -# -# You may be wondering why I haven't simply parsed RFC1700 to come up -# with a list of port numbers and files. The reason is that I don't -# believe reading firewall logs should be all that automated. You -# should be familiar with what probes are hitting your system. By -# manually adding entries to the data section this ensures that I -# have at least educated myself about what this protocol is, what -# the potential exposure is, and why you might be seeing this traffic. - -%icmp = (); -%udp = (); -%tcp = (); -%openfiles = (); -$TIDBITSFILE = "unknown.log"; - -# Read the ports data from the end of this file and build the three hashes -while (<DATA>) { - chomp; # trim the newline - s/#.*//; # no comments - s/^\s+//; # no leading white - s/\s+$//; # no trailing white - next unless length; # anything left? - $_ = lc; # switch to lowercase - ($proto, $identifier, $filename) = m/(\S+)\s+(\S+)\s+(\S+)/; - SWITCH: { - if ($proto =~ m/^icmp$/) { $icmp{$identifier} = $filename; last SWITCH; }; - if ($proto =~ m/^udp$/) { $udp{$identifier} = $filename; last SWITCH; }; - if ($proto =~ m/^tcp$/) { $tcp{$identifier} = $filename; last SWITCH; }; - die "An unknown protocol listed in the proto defs\n$_\n"; - } -} - -$filename = shift; -unless (defined($filename)) { die "Usage: logfilter.pl <log file>\n"; } -open(LOGFILE, $filename) || die "Could not open the firewall log file.\n"; -$openfiles{$filename} = "LOGFILE"; - -$linenum = 0; -while($line = <LOGFILE>) { - - chomp($line); - $linenum++; - - # determine the protocol - send to unknown.log if not found - SWITCH: { - - ($line =~ m /\sicmp\s/) && do { - - # - # ICMP Protocol - # - # Extract the icmp packet information specifying the type. - # - # Note: Must check for ICMP first because this may be an ICMP reply - # to a TCP or UDP connection (eg Port Unreachable). - - ($icmptype) = $line =~ m/icmp (\d+)\/\d+/; - - $filename = $TIDBITSFILE; - $filename = $icmp{$icmptype} if (defined($icmp{$icmptype})); - - last SWITCH; - }; - - ($line =~ m /\stcp\s/) && do { - - # - # TCP Protocol - # - # extract the source and destination ports and compare them to - # known ports in the tcp hash. For the first match, place this - # line in the file specified by the tcp hash. Ignore one of the - # port matches if both ports happen to be known services. - - ($sport, $dport) = $line =~ m/\d+\.\d+\.\d+\.\d+,(\d+) -> \d+\.\d+\.\d+\.\d+,(\d+)/; - #print "$line\n" unless (defined($sport) && defined($dport)); - - $filename = $TIDBITSFILE; - $filename = $tcp{$sport} if (defined($tcp{$sport})); - $filename = $tcp{$dport} if (defined($tcp{$dport})); - - last SWITCH; - }; - - ($line =~ m /\sudp\s/) && do { - - # - # UDP Protocol - same procedure as with TCP, different hash - # - - ($sport, $dport) = $line =~ m/\d+\.\d+\.\d+\.\d+,(\d+) -> \d+\.\d+\.\d+\.\d+,(\d+)/; - - $filename = $TIDBITSFILE; - $filename = $udp{$sport} if (defined($udp{$sport})); - $filename = $udp{$dport} if (defined($udp{$dport})); - - last SWITCH; - }; - - # - # The default case is that the protocol was unknown - # - $filename = $TIDBITSFILE; - } - - # - # write the line to the appropriate file as determined above - # - # check for filename in the openfiles hash. if it exists then write - # to the given handle. otherwise open a handle to the file and add - # it to the hash of open files. - - if (defined($openfiles{$filename})) { - $handle = $openfiles{$filename}; - } else { - $handle = "HANDLE" . keys %openfiles; - open ($handle, ">>".$filename) || die "Couldn't open|create the file $filename"; - $openfiles{$filename} = $handle; - } - print $handle "#$linenum\t $line\n"; - -} - -# close all open file handles - -foreach $key (keys %openfiles) { - close($openfiles{$key}); -} - -close(LOGFILE); - -__DATA__ -icmp 3 destunreach.log -icmp 8 ping.log -icmp 9 router.log -icmp 10 router.log -icmp 11 ttl.log -tcp 23 telnet.log -tcp 25 smtp.log -udp 25 smtp.log -udp 53 dns.log -tcp 80 http.log -tcp 110 pop3.log -tcp 111 rpc.log -udp 111 rpc.log -tcp 137 netbios.log -udp 137 netbios.log -tcp 143 imap.log -udp 161 snmp.log -udp 370 backweb.log -udp 371 backweb.log -tcp 443 https.log -udp 443 https.log -udp 512 syslog.log -tcp 635 nfs.log # NFS mount services -udp 635 nfs.log # NFS mount services -tcp 1080 socks.log -udp 1080 socks.log -tcp 6112 games.log # Battle net -tcp 6667 irc.log -tcp 7070 realaudio.log -tcp 8080 http.log -tcp 12345 netbus.log -udp 31337 backorifice.log diff --git a/contrib/ipfilter/perl/plog b/contrib/ipfilter/perl/plog deleted file mode 100644 index 208c6ea..0000000 --- a/contrib/ipfilter/perl/plog +++ /dev/null @@ -1,1061 +0,0 @@ -#!/usr/bin/perl -wT -# -# Author: Jefferson Ogata (JO317) <jogata@pobox.com> -# Date: 2000/04/22 -# Version: 0.10 -# -# Please feel free to use or redistribute this program if you find it useful. -# If you have suggestions, or even better, bits of new code, send them to me -# and I will add them when I have time. The current version of this script -# can always be found at the URL: -# -# http://www.antibozo.net/ogata/webtools/plog.pl -# http://pobox.com/~ogata/webtools/plog.txt -# -# Parse ipmon output into a coherent form. This program only handles the -# lines regarding filter actions. It does not parse nat and state lines. -# -# Present lines from ipmon to this program on standard input. -# -# EXAMPLES -# -# plog -AF block,log < /var/log/ipf -# -# Generate source and destination reports of all packets logged with -# block or log actions, and report TCP flags and keep state actions. -# -# plog -S -s ./services www.example.com < /var/log/ipf -# -# Generate a source report of traffic to or from www.example.com using -# the additional services defined in ./services. -# -# plog -nSA block < /var/log/ipf -# -# Generate a source report of all blocked packets with no hostname -# lookups. This is handy for an initial pass to identify portscans or -# other aggressive traffic. -# -# plog -SFp 192.168.0.0/24 www.example.com/24 < /var/log/ipf -# -# Generate a source report of all packets whose source or destination -# address is either in 192.168.0.0/24 or an address associated with -# the host www.example.com, report packet flags and perform paranoid -# hostname lookups. This is a handy usage for examining traffic more -# closely after identifying a potential attack. -# -# TODO -# -# - Handle output from ipmon -v. -# - Handle timestamps from other locales. Anyone with a timestamp problem -# please email me the format of your timestamps. -# - It looks as though short TCP or UDP packets will break things, but I -# haven't seen any yet. -# -# CHANGES -# -# 2000/04/22 (0.10): -# - Restructured host name and address caches. Hosts are now cached using -# packed addresses as keys. Conversion to IPv6 should be simple now. -# - Added paranoid hostname lookups. -# - Added netmask qualifications for address arguments. -# - Tweaked usage info. -# 2000/04/20: -# - Added parsing and tracking of TCP and state flags. -# 2000/04/12 (0.9): -# - Wasn't handling underscore in hostname,servicename fields; these may be -# logged using ipmon -n. Observation by <ark@eltex.ru>. -# - Hadn't properly attributed observation and fix for repetition counter in -# 0.8 change log. Added John Ladwig to attribution. Thanks, John. -# -# 2000/04/10 (0.8): -# - Service names can also have hyphens, dummy. I wasn't allowing these -# either. Observation and fix thanks to Taso N. Devetzis -# <devetzis@snet.net>. -# - IP Filter now logs a repetition counter. Observation and fixes (changed -# slightly) from Andy Kreiling <Andy@ntcs-inc.com> and John Ladwig -# <jladwig@nts.umn.edu>. -# - Added fix to handle new Solaris log format, e.g.: -# Nov 30 04:49:37 raoul ipmon[121]: [ID 702911 local0.warning] 04:49:36.420541 hme0 @0:34 b 205.152.16.6,58596 -> 204.60.220.24,113 PR tcp len 20 44 -# Fix thanks to Taso N. Devetzis <devetzis@SNET.Net>. -# - Added services map option. -# - Added options for generating only source/destination tables. -# - Added verbosity option. -# - Added option for reporting traffic for specific hosts. -# - Added some more ICMP unreachable codes, and made code and type names -# match the ones in IP Filter parse.c. -# - Condensed output format somewhat. -# - Various minor improvements, perhaps slight speed improvements. -# - Documented new options in usage() and tried to improve wording. -# -# 1999/08/02 (0.7): -# - Hostnames can have hyphens, dummy. I wasn't allowing them in the syslog -# line. Fix from Antoine Verheijen <antoine.verheijen@ualberta.ca>. -# -# 1999/05/05 (0.6): -# - IRIX syslog prefixes the hostname with a severity code. Handle it. Fix -# from John Ladwig <jladwig@nts.umn.edu>. -# -# 1999/05/05 (0.5): -# - Protocols other than TCP, UDP, or ICMP have packet lengths reported in -# parentheses for some reason. The script now handles this. Thanks to -# Dispatcher <dispatch@blackhelicopters.org>. -# - I had mixed up info-request and info-reply ICMP codes, and omitted the -# traceroute code. Sorted this out. I had also missed code 0 for type 6 -# (alternate address for host). Thanks to John Ladwig <jladwig@nts.umn.edu>. -# -# 1999/05/03: -# - Now accepts hostnames in the source and destination address fields, as -# well as port names in the port fields. This allows the people who are -# using ipmon -n to still use plog. Note that if you are logging -# hostnames, you are vulnerable to forgery of DNS information, modified -# DNS information, and your log files will be larger also. If you are -# using this program you can have it look up the names for you (still -# vulnerable to forgery) and keep your logged addresses all in numeric -# format, so that packets from the same source will always show the same -# source address regardless of what's up with DNS. Obviously, I don't -# favor using ipmon -n. Nevertheless, some people wanted this, so here it -# is. -# - Added S and n flags to %acts hash. Thanks to Stephen J. Roznowski -# <sjr@home.net>. -# - Stopped reporting host IPs twice when numeric output was requested. -# Thanks, yet again, to Stephen J. Roznowski <sjr@home.net>. -# - Number of minor tweaks that might speed it up a bit, and some comments. -# - Put the script back up on the web site. I had moved the site and -# forgotten to move the tool. -# -# 1999/02/04: -# - Changed log line parser to accept fully-qualified name in the logging -# host field. Thanks to Stephen J. Roznowski <sjr@home.net>. -# -# 1999/01/22: -# - Changed high port strategy to use 65536 for unknown high ports so that -# they are sorted last. -# -# 1999/01/21: -# - Moved icmp parsing to output loop. -# - Added parsing of icmp codes, and more types. -# - Changed packet sort routine to sort by port number rather than service -# name. -# -# 1999/01/20: -# - Fixed problem matching ipmon log lines. Sometimes they have "/ipmon" in -# them, sometimes just "ipmon". -# - Added numeric parse option to turn off hostname lookups. -# - Moved summary to usage() sub. - -use strict; -use Socket; -use IO::File; - -select STDOUT; $| = 1; - -my %hosts; - -my $me = $0; -$me =~ s/^.*\///; - -# Map of log codes for various actions. Not all of these can occur, but -# I've included everything in print_ipflog() from ipmon.c. -my %acts = ( - 'p' => 'pass', - 'P' => 'pass', - 'b' => 'block', - 'B' => 'block', - 'L' => 'log', - 'S' => 'short', - 'n' => 'nomatch', -); - -# Map of ICMP types and their relevant codes. -my %icmpTypeMap = ( - 0 => +{ - name => 'echorep', - codes => +{0 => undef}, - }, - 3 => +{ - name => 'unreach', - codes => +{ - 0 => 'net-unr', - 1 => 'host-unr', - 2 => 'proto-unr', - 3 => 'port-unr', - 4 => 'needfrag', - 5 => 'srcfail', - 6 => 'net-unk', - 7 => 'host-unk', - 8 => 'isolate', - 9 => 'net-prohib', - 10 => 'host-prohib', - 11 => 'net-tos', - 12 => 'host-tos', - 13 => 'filter-prohib', - 14 => 'host-preced', - 15 => 'preced-cutoff', - }, - }, - 4 => +{ - name => 'squench', - codes => +{0 => undef}, - }, - 5 => +{ - name => 'redir', - codes => +{ - 0 => 'net', - 1 => 'host', - 2 => 'tos', - 3 => 'tos-host', - }, - }, - 6 => +{ - name => 'alt-host-addr', - codes => +{ - 0 => 'alt-addr' - }, - }, - 8 => +{ - name => 'echo', - codes => +{0 => undef}, - }, - 9 => +{ - name => 'routerad', - codes => +{0 => undef}, - }, - 10 => +{ - name => 'routersol', - codes => +{0 => undef}, - }, - 11 => +{ - name => 'timex', - codes => +{ - 0 => 'in-transit', - 1 => 'frag-assy', - }, - }, - 12 => +{ - name => 'paramprob', - codes => +{ - 0 => 'ptr-err', - 1 => 'miss-opt', - 2 => 'bad-len', - }, - }, - 13 => +{ - name => 'timest', - codes => +{0 => undef}, - }, - 14 => +{ - name => 'timestrep', - codes => +{0 => undef}, - }, - 15 => +{ - name => 'inforeq', - codes => +{0 => undef}, - }, - 16 => +{ - name => 'inforep', - codes => +{0 => undef}, - }, - 17 => +{ - name => 'maskreq', - codes => +{0 => undef}, - }, - 18 => +{ - name => 'maskrep', - codes => +{0 => undef}, - }, - 30 => +{ - name => 'tracert', - codes => +{ }, - }, - 31 => +{ - name => 'dgram-conv-err', - codes => +{ }, - }, - 32 => +{ - name => 'mbl-host-redir', - codes => +{ }, - }, - 33 => +{ - name => 'ipv6-whereru?', - codes => +{ }, - }, - 34 => +{ - name => 'ipv6-iamhere', - codes => +{ }, - }, - 35 => +{ - name => 'mbl-reg-req', - codes => +{ }, - }, - 36 => +{ - name => 'mbl-reg-rep', - codes => +{ }, - }, -); - -# Arguments we will parse from argument list. -my $numeric = 0; # Don't lookup hostnames. -my $paranoid = 0; # Do paranoid hostname lookups. -my $verbosity = 0; # Bla' bla' bla'. -my $sTable = 0; # Generate source table. -my $dTable = 0; # Generate destination table. -my @services = (); # Preload services tables. -my $showFlags = 0; # Show TCP flag combinations. -my %selectAddrs; # Limit report to these hosts. -my %selectActs; # Limit report to these actions. - -# Parse argument list. -while (defined ($_ = shift)) -{ - if (s/^-//) - { - while (s/^([vnpSD\?hsAF])//) - { - my $flag = $1; - if ($flag eq 'v') - { - ++$verbosity; - } - elsif ($flag eq 'n') - { - $numeric = 1; - } - elsif ($flag eq 'p') - { - $paranoid = 1; - } - elsif ($flag eq 'S') - { - $sTable = 1; - } - elsif ($flag eq 'D') - { - $dTable = 1; - } - elsif ($flag eq 'F') - { - $showFlags = 1; - } - elsif (($flag eq '?') || ($flag eq 'h')) - { - &usage (0); - } - else - { - my $arg = shift; - defined ($arg) || &usage (1, qq{-$flag requires an argument}); - if ($flag eq 's') - { - push (@services, $arg); - } - elsif ($flag eq 'A') - { - my @acts = split (/,/, $arg); - my $a; - foreach $a (@acts) - { - my $aa; - my $match = 0; - foreach $aa (keys (%acts)) - { - if ($acts{$aa} eq $a) - { - ++$match; - $selectActs{$aa} = $a; - } - } - $match || &usage (1, qq{unknown action $a}); - } - } - } - } - - &usage (1, qq{unknown option: -$_}) if (length); - - next; - } - - # Add host to hash of hosts we're interested in. - (/^(.+)\/([\d+\.]+)$/) || (/^(.+)$/) || &usage (1, qq{invalid CIDR address $_}); - my ($addr, $mask) = ($1, $2); - my @addr = &hostAddrs ($addr); - (scalar (@addr)) || &usage (1, qq{cannot resolve hostname $_}); - if (!defined ($mask)) - { - $mask = (2 ** 32) - 1; - } - elsif (($mask =~ /^\d+$/) && ($mask <= 32)) - { - $mask = (2 ** 32) - 1 - ((2 ** (32 - $mask)) - 1); - } - elsif (defined ($mask = &isDottedAddr ($mask))) - { - $mask = &integerAddr ($mask); - } - else - { - &usage (1, qq{invalid CIDR address $_}); - } - foreach $addr (@addr) - { - # Save mask unless we already have a less specific one for this address. - my $a = &integerAddr ($addr) & $mask; - $selectAddrs{$a} = $mask unless (exists ($selectAddrs{$a}) && ($selectAddrs{$a} < $mask)); - } -} - -# Which tables will we generate? -$dTable = $sTable = 1 unless ($dTable || $sTable); -my @dirs; -push (@dirs, 'd') if ($dTable); -push (@dirs, 's') if ($sTable); - -# Are we interested in specific hosts? -my $selectAddrs = scalar (keys (%selectAddrs)); - -# Are we interested in specific actions? -if (scalar (keys (%selectActs)) == 0) -{ - %selectActs = %acts; -} - -# We use this hash to cache port name -> number and number -> name mappings. -# Isn't it cool that we can use the same hash for both? -my %pn; - -# Preload any services maps. -my $sm; -foreach $sm (@services) -{ - my $sf = new IO::File ($sm, "r"); - defined ($sf) || &quit (1, qq{cannot open services file $sm}); - - while (defined ($_ = $sf->getline ())) - { - my $text = $_; - chomp; - s/#.*$//; - s/\s+$//; - next unless (length); - my ($name, $spec, @aliases) = split (/\s+/); - ($spec =~ /^([\w\-]+)\/([\w\-]+)$/) - || &quit (1, qq{$sm:$.: invalid definition: $text}); - my ($pnum, $proto) = ($1, $2); - - # Enter service definition in pn hash both forwards and backwards. - my $port; - my $pname; - foreach $port ($name, @aliases) - { - $pname = "$pnum/$proto"; - $pn{$pname} = $port; - } - $pname = "$name/$proto"; - $pn{$pname} = $pnum; - } - - $sf->close (); -} - -# Cache for host name -> addr mappings. -my %ipAddr; - -# Cache for host addr -> name mappings. -my %ipName; - -# Hash for protocol number <--> name mappings. -my %pr; - -# Under IPv4 port numbers are unsigned shorts. The value below is higher -# than the maximum value of an unsigned short, and is used in place of -# high port numbers that don't correspond to known services. This makes -# high ports get sorted behind all others. -my $highPort = 0x10000; - -while (<STDIN>) -{ - chomp; - - # For ipmon output that came through syslog, we'll have an asctime - # timestamp, an optional severity code (IRIX), the hostname, - # "ipmon"[process id]: prefixed to the line. For output that was - # written directly to a file by ipmon, we'll have a date prefix as - # dd/mm/yyyy (no y2k problem here!). Both formats then have a packet - # timestamp and the log info. - my ($log); - if (s/^\w+\s+\d+\s+\d+:\d+:\d+\s+(?:\d\w:)?[\w\.\-]+\s+\S*ipmon\[\d+\]:\s+(?:\[ID\s+\d+\s+[\w\.]+\]\s+)?\d+:\d+:\d+\.\d+\s+//) - { - $log = $_; - } - elsif (s/^(?:\d+\/\d+\/\d+)\s+(?:\d+:\d+:\d+\.\d+)\s+//) - { - $log = $_; - } - else - { - # It don't look like no ipmon output to me, baby. - next; - } - next unless (defined ($log)); - - print STDERR "$log\n" if ($verbosity); - - # Parse the log line. We're expecting interface name, rule group and - # number, an action code, a source host name or IP with possible port - # name or number, a destination host name or IP with possible port - # number, "PR", a protocol name or number, "len", a header length, a - # packet length (which will be in parentheses for protocols other than - # TCP, UDP, or ICMP), and maybe some additional info. - my @fields = ($log =~ /^(?:(\d+)x)?\s*(\w+)\s+@(\d+):(\d+)\s+(\w)\s+([\w\-\.,]+)\s+->\s+([\w\-\.,]+)\s+PR\s+(\w+)\s+len\s+(\d+)\s+\(?(\d+)\)?\s*(.*)$/ox); - unless (scalar (@fields)) - { - print STDERR "$me:$.: cannot parse: $_\n"; - next; - } - my ($count, $if, $group, $rule, $act, $src, $dest, $proto, $hlen, $len, $more) = @fields; - - # Skip actions we're not interested in. - next unless (exists ($selectActs{$act})); - - # Packet count defaults to 1. - $count = 1 unless (defined ($count)); - - my ($sport, $dport, @flags); - - if ($proto eq 'icmp') - { - if ($more =~ s/^icmp (\d+)\/(\d+)\s*//) - { - # We save icmp type and code in both sport and dport. This - # allows us to sort icmp packets using the normal port-sorting - # code. - $dport = $sport = "$1.$2"; - } - else - { - $sport = ''; - $dport = ''; - } - } - else - { - if ($showFlags) - { - if (($proto eq 'tcp') && ($more =~ s/^\-([A-Z]+)\s*//)) - { - push (@flags, $1); - } - if ($more =~ s/^K\-S\s*//) - { - push (@flags, 'state'); - } - } - if ($src =~ s/,([\-\w]+)$//) - { - $sport = &portSimplify ($1, $proto); - } - else - { - $sport = ''; - } - if ($dest =~ s/,([\-\w]+)$//) - { - $dport = &portSimplify ($1, $proto); - } - else - { - $dport = ''; - } - } - - # Make sure addresses are numeric at this point. We want to sort by - # IP address later. If the hostname doesn't resolve, punt. If you - # must use ipmon -n, be ready for weirdness. Use only the first - # address returned. - my $x; - $x = (&hostAddrs ($src))[0]; - unless (defined ($x)) - { - print STDERR "$me:$.: cannot resolve hostname $src\n"; - next; - } - $src = $x; - $x = (&hostAddrs ($dest))[0]; - unless (defined ($x)) - { - print STDERR "$me:$.: cannot resolve hostname $dest\n"; - next; - } - $dest = $x; - - # Skip hosts we're not interested in. - if ($selectAddrs) - { - my ($a, $m); - my $s = &integerAddr ($src); - my $d = &integerAddr ($dest); - my $cute = 0; - while (($a, $m) = each (%selectAddrs)) - { - if ((($s & $m) == $a) || (($d & $m) == $a)) - { - $cute = 1; - last; - } - } - next unless ($cute); - } - - # Convert proto to proto number. - $proto = &protoNumber ($proto); - - sub countPacket - { - my ($host, $dir, $peer, $proto, $count, $packet, @flags) = @_; - - # Make sure host is in the hosts hash. - $hosts{$host} = - +{ - 'd' => +{ }, - 's' => +{ }, - } unless (exists ($hosts{$host})); - - # Get the source/destination traffic hash for the host in question. - my $trafficHash = $hosts{$host}->{$dir}; - - # Make sure there's a hash for the peer. - $trafficHash->{$peer} = +{ } unless (exists ($trafficHash->{$peer})); - - # Make sure the peer hash has a hash for the protocol number. - my $peerHash = $trafficHash->{$peer}; - $peerHash->{$proto} = +{ } unless (exists ($peerHash->{$proto})); - - # Make sure there's a counter for this packet type in the proto hash. - my $protoHash = $peerHash->{$proto}; - $protoHash->{$packet} = +{ '' => 0 } unless (exists ($protoHash->{$packet})); - - # Increment the counter and mark flags. - my $packetHash = $protoHash->{$packet}; - $packetHash->{''} += $count; - map { $packetHash->{$_} = undef; } (@flags); - } - - # Count the packet as outgoing traffic from the source address. - &countPacket ($src, 's', $dest, $proto, $count, "$sport:$dport:$if:$act", @flags) if ($sTable); - - # Count the packet as incoming traffic to the destination address. - &countPacket ($dest, 'd', $src, $proto, $count, "$dport:$sport:$if:$act", @flags) if ($dTable); -} - -my $dir; -foreach $dir (@dirs) -{ - my $order = ($dir eq 's' ? 'source' : 'destination'); - my $arrow = ($dir eq 's' ? '->' : '<-'); - - print "###\n"; - print "### Traffic by $order address:\n"; - print "###\n"; - - sub ipSort - { - &integerAddr ($a) <=> &integerAddr ($b); - } - - sub packetSort - { - my ($asport, $adport, $aif, $aact) = split (/:/, $a); - my ($bsport, $bdport, $bif, $bact) = split (/:/, $b); - $bact cmp $aact || $aif cmp $bif || $asport <=> $bsport || $adport <=> $bdport; - } - - my $host; - foreach $host (sort ipSort (keys %hosts)) - { - my $traffic = $hosts{$host}->{$dir}; - - # Skip hosts with no traffic. - next unless (scalar (keys (%{$traffic}))); - - if ($numeric) - { - print &dottedAddr ($host), "\n"; - } - else - { - print &hostName ($host), " \[", &dottedAddr ($host), "\]\n"; - } - - my $peer; - foreach $peer (sort ipSort (keys %{$traffic})) - { - my $peerHash = $traffic->{$peer}; - my $peerName = ($numeric ? &dottedAddr ($peer) : &hostName ($peer)); - my $proto; - foreach $proto (sort (keys (%{$peerHash}))) - { - my $protoHash = $peerHash->{$proto}; - my $protoName = &protoName ($proto); - - my $packet; - foreach $packet (sort packetSort (keys %{$protoHash})) - { - my ($sport, $dport, $if, $act) = split (/:/, $packet); - my $packetHash = $protoHash->{$packet}; - my $count = $packetHash->{''}; - $act = '?' unless (defined ($act = $acts{$act})); - if (($protoName eq 'tcp') || ($protoName eq 'udp')) - { - printf (" %-6s %7s %4d %4s %16s %2s %s.%s", $if, $act, $count, $protoName, &portName ($sport, $protoName), $arrow, $peerName, &portName ($dport, $protoName)); - } - elsif ($protoName eq 'icmp') - { - printf (" %-6s %7s %4d %4s %16s %2s %s", $if, $act, $count, $protoName, &icmpType ($sport), $arrow, $peerName); - } - else - { - printf (" %-6s %7s %4d %4s %16s %2s %s", $if, $act, $count, $protoName, '', $arrow, $peerName); - } - if ($showFlags) - { - my @flags = sort (keys (%{$packetHash})); - if (scalar (@flags)) - { - shift (@flags); - print ' (', join (',', @flags), ')' if (scalar (@flags)); - } - } - print "\n"; - } - } - } - } - - print "\n"; -} - -exit (0); - -# Translates a numeric port/named protocol to a port name. Reserved ports -# that do not have an entry in the services database are left numeric. High -# ports that do not have an entry in the services database are mapped -# to '<high>'. -sub portName -{ - my $port = shift; - my $proto = shift; - my $pname = "$port/$proto"; - unless (exists ($pn{$pname})) - { - my $name = getservbyport ($port, $proto); - $pn{$pname} = (defined ($name) ? $name : ($port <= 1023 ? $port : '<high>')); - } - return $pn{$pname}; -} - -# Translates a named port/protocol to a port number. -sub portNumber -{ - my $port = shift; - my $proto = shift; - my $pname = "$port/$proto"; - unless (exists ($pn{$pname})) - { - my $number = getservbyname ($port, $proto); - unless (defined ($number)) - { - # I don't think we need to recover from this. How did the port - # name get into the log file if we can't find it? Log file from - # a different machine? Fix /etc/services on this one if that's - # your problem. - die ("Unrecognized port name \"$port\" at $."); - } - $pn{$pname} = $number; - } - return $pn{$pname}; -} - -# Convert all unrecognized high ports to the same value so they are treated -# identically. The protocol should be by name. -sub portSimplify -{ - my $port = shift; - my $proto = shift; - - # Make sure port is numeric. - $port = &portNumber ($port, $proto) - unless ($port =~ /^\d+$/); - - # Look up port name. - my $portName = &portName ($port, $proto); - - # Port is an unknown high port. Return a value that is too high for a - # port number, so that high ports get sorted last. - return $highPort if ($portName eq '<high>'); - - # Return original port number. - return $port; -} - -# Translates a numeric address into a hostname. Pass only packed numeric -# addresses to this routine. -sub hostName -{ - my $ip = shift; - return $ipName{$ip} if (exists ($ipName{$ip})); - - # Do an inverse lookup on the address. - my $name = gethostbyaddr ($ip, AF_INET); - unless (defined ($name)) - { - # Inverse lookup failed, so map the IP address to its dotted - # representation and cache that. - $ipName{$ip} = &dottedAddr ($ip); - return $ipName{$ip}; - } - - # For paranoid hostname lookups. - if ($paranoid) - { - # If this address already matches, we're happy. - unless (exists ($ipName{$ip}) && (lc ($ipName{$ip}) eq lc ($name))) - { - # Do a forward lookup on the resulting name. - my @addr = &hostAddrs ($name); - my $match = 0; - - # Cache the forward lookup results for future inverse lookups, - # but don't stomp on inverses we've already cached, even if they - # are questionable. We want to generate consistent output, and - # the cache is growing incrementally. - foreach (@addr) - { - $ipName{$_} = $name unless (exists ($ipName{$_})); - $match = 1 if ($_ eq $ip); - } - - # Was this one of the addresses? If not, tack on a ?. - $name .= '?' unless ($match); - } - } - else - { - # Just believe it and cache it. - $ipName{$ip} = $name; - } - - return $name; -} - -# Translates a hostname or dotted address into a list of packed numeric -# addresses. -sub hostAddrs -{ - my $name = shift; - my $ip; - - # Check if it's a dotted representation. - return ($ip) if (defined ($ip = &isDottedAddr ($name))); - - # Return result from cache. - $name = lc ($name); - return @{$ipAddr{$name}} if (exists ($ipAddr{$name})); - - # Look up the addresses. - my @addr = gethostbyname ($name); - splice (@addr, 0, 4); - - unless (scalar (@addr)) - { - # Again, I don't think we need to recover from this gracefully. - # If we can't resolve a hostname that ended up in the log file, - # punt. We want to be able to sort hosts by IP address later, - # and letting hostnames through will snarl up that code. Users - # of ipmon -n will have to grin and bear it for now. The - # functions that get undef back should treat it as an error or - # as some default address, e.g. 0 just to make things work. - return (); - } - - $ipAddr{$name} = [ @addr ]; - return @{$ipAddr{$name}}; -} - -# If the argument is a valid dotted address, returns the corresponding -# packed numeric address, otherwise returns undef. -sub isDottedAddr -{ - my $addr = shift; - if ($addr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/) - { - my @a = (int ($1), int ($2), int ($3), int ($4)); - foreach (@a) - { - return undef if ($_ >= 256); - } - return pack ('C*', @a); - } - return undef; -} - -# Unpacks a packed numeric address and returns an integer representation. -sub integerAddr -{ - my $addr = shift; - return unpack ('N', $addr); - - # The following is for generalized IPv4/IPv6 stuff. For now, it's a - # lot faster to assume IPv4. - my @a = unpack ('C*', $addr); - my $a = 0; - while (scalar (@a)) - { - $a = ($a << 8) | shift (@a); - } - return $a; -} - -# Unpacks a packed numeric address into a dotted representation. -sub dottedAddr -{ - my $addr = shift; - my @a = unpack ('C*', $addr); - return join ('.', @a); -} - -# Translates a protocol number into a protocol name, or a number if no name -# is found in the protocol database. -sub protoName -{ - my $code = shift; - return $code if ($code !~ /^\d+$/); - unless (exists ($pr{$code})) - { - my $name = scalar (getprotobynumber ($code)); - if (defined ($name)) - { - $pr{$code} = $name; - } - else - { - $pr{$code} = $code; - } - } - return $pr{$code}; -} - -# Translates a protocol name or number into a protocol number. -sub protoNumber -{ - my $name = shift; - return $name if ($name =~ /^\d+$/); - unless (exists ($pr{$name})) - { - my $code = scalar (getprotobyname ($name)); - if (defined ($code)) - { - $pr{$name} = $code; - } - else - { - $pr{$name} = $name; - } - } - return $pr{$name}; -} - -sub icmpType -{ - my $typeCode = shift; - my ($type, $code) = split ('\.', $typeCode); - - return "?" unless (defined ($code)); - - my $info = $icmpTypeMap{$type}; - - return "\(type=$type/$code?\)" unless (defined ($info)); - - my $typeName = $info->{name}; - my $codeName; - if (exists ($info->{codes}->{$code})) - { - $codeName = $info->{codes}->{$code}; - $codeName = (defined ($codeName) ? "/$codeName" : ''); - } - else - { - $codeName = "/$code"; - } - return "$typeName$codeName"; -} - -sub quit -{ - my $ec = shift; - my $msg = shift; - - print STDERR "$me: $msg\n"; - exit ($ec); -} - -sub usage -{ - my $ec = shift; - my @msg = @_; - - if (scalar (@msg)) - { - print STDERR "$me: ", join ("\n", @msg), "\n\n"; - } - - print <<EOT; -usage: $me [-nSDF] [-s servicemap] [-A act1,...] [address...] - -Parses logging from ipmon and presents it in a comprehensible format. This -program generates two reports: one organized by source address and another -organized by destination address. For the first report, source addresses are -sorted by IP address. For each address, all packets originating at the address -are presented in a tabular form, where all packets with the same source and -destination address and port are counted as a single entry. Any port number -greater than 1023 that does not match an entry in the services table is treated -as a "high" port; all high ports are coalesced into the same entry. The fields -for the source address report are: - iface action packet-count proto src-port dest-host.dest-port \[\(flags\)\] -The fields for the destination address report are: - iface action packet-count proto dest-port src-host.src-port \[\(flags\)\] - -Options are: --n Disable hostname lookups, and report only IP addresses. --p Perform paranoid hostname lookups. --S Generate a source address report. --D Generate a destination address report. --F Show all flag combinations associated with packets. --s map Supply an alternate services map to be preloaded. The map should - be in the same format as /etc/services. Any service name not found - in the map will be looked for in the system services file. --A act1,... Limit the report to the specified actions. The possible actions - are pass, block, log, short, and nomatch. - -If any addresses are supplied on the command line, the report is limited to -these hosts. Addresses may be given as dotted IP addresses or hostnames, and -may be qualified with netmasks in CIDR \(/24\) or dotted \(/255.255.255.0\) format. -If a hostname resolves to multiple addresses, all addresses are used. - -If neither -S nor -D is given, both reports are generated. - -Note: if you are logging traffic with ipmon -n, ipmon will already have looked -up and logged addresses as hostnames where possible. This has an important side -effect: this program will translate the hostnames back into IP addresses which -may not match the original addresses of the logged packets because of numerous -DNS issues. If you care about where packets are really coming from, you simply -cannot rely on ipmon -n. An attacker with control of his reverse DNS can map -the reverse lookup to anything he likes. If you haven't logged the numeric IP -address, there's no way to discover the source of an attack reliably. For this -reason, I strongly recommend that you run ipmon without the -n option, and use -this or a similar script to do reverse lookups during analysis, rather than -during logging. -EOT - - exit ($ec); -} - diff --git a/contrib/ipfilter/test/Makefile b/contrib/ipfilter/test/Makefile deleted file mode 100644 index 8918311..0000000 --- a/contrib/ipfilter/test/Makefile +++ /dev/null @@ -1,520 +0,0 @@ -# -# (C)opyright 1993-1996 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -POOLDEP=../ip_lookup.c ../ip_lookup.h ../ip_pool.c ../ip_pool.h \ - ../ip_htable.c ../ip_htable.h ../ip_dstlist.c ../ip_dstlist.h \ - ../tools/ippool_y.y -BINDEST=/usr/local/bin -SBINDEST=/sbin -MANDIR=/usr/share/man -all: expected.d results tests - -expected.d: - (cd expected; make) - -results: - mkdir -p results - -tests: ipf nat logtests ipv6 pools - -ipf: patests ftests - -nat: intests ntests nitests - -first: - -mkdir -p results - -# Filtering tests -ftests: f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f24 f25 f26 f27 f28 f29 f30 - -# Rule parsing tests -patests: i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17 i18 i19 \ - i20 i21 i22 i23 - -ntests: n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 - -ntests6: n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 - -nitests: ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 ni10 ni11 ni12 ni13 ni14 ni15 \ - ni16 ni17 ni18 ni19 ni20 ni21 ni23 - -intests: in1 in2 in3 in4 in5 in6 in7 in8 in100 in101 in102 - -logtests: l1 - -pools: p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3 - -ipv6: ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 ntests6 - -bpf: bpf1 bpf-f1 - -f1: expected/f1 input/f1 regress/f1 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f2: expected/f2 input/f2 regress/f2 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f3: expected/f3 input/f3 regress/f3 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f4: expected/f4 input/f4 regress/f4 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f5: expected/f5 input/f5 regress/f5 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f6: expected/f6 input/f6 regress/f6 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f7: expected/f7 input/f7 regress/f7 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f8: expected/f8 input/f8 regress/f8 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f9: expected/f9 input/f9 regress/f9 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f10: expected/f10 input/f10 regress/f10 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f11: expected/f11 input/f11 regress/f11 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f12: expected/f12 input/f12 regress/f12 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f13: expected/f13 input/f13 regress/f13 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f14: expected/f14 input/f14 regress/f14 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f19: expected/f15 input/f15 regress/f15 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f15: expected/f15 input/f15 regress/f15 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f16: expected/f16 input/f16 regress/f16 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f17: expected/f17 input/f17 regress/f17 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f18: expected/f18 input/f18 regress/f18 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f20: expected/f20 input/f20 regress/f20 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f21: expected/f21 input/f21 regress/f21 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f22: expected/f22 input/f22 regress/f22 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f24: expected/f24 input/f24 regress/f24 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f25: expected/f25 input/f25 regress/f25 - @/bin/sh ./mtest `awk "/^$@ / { print; } " test.format` - -f26: expected/f26 input/f26 regress/f26 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f27: expected/f27 input/f27 regress/f27 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -f28: expected/f28 input/f28 regress/f28.ipf regress/f28.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -f29: expected/f29 input/f29 regress/f29.ipf regress/f29.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -f30: expected/f30 input/f30 regress/f30 - @/bin/sh ./dotest `awk "/^$@ / { print; } " test.format` - -i1: expected/i1 regress/i1 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i2: expected/i2 regress/i2 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i3: expected/i3 regress/i3 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i4: expected/i4 regress/i4 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i5: expected/i5 regress/i5 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i6: expected/i6 regress/i6 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i7: expected/i7 regress/i7 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i8: expected/i8 regress/i8 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i9: expected/i9 regress/i9 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i10: expected/i10 regress/i10 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i11: expected/i11 regress/i11 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i12: expected/i12 regress/i12 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i13: expected/i13 regress/i13 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i14: expected/i14 regress/i14 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i15: expected/i15 regress/i15 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i16: expected/i16 regress/i16 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i17: expected/i17 regress/i17 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i18: expected/i18 regress/i18 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i19: expected/i19 regress/i19 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i20: expected/i20 regress/i20 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i21: expected/i21 regress/i21 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i22: expected/i22 regress/i22 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -i23: expected/i23 regress/i23 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -bpf1: expected/bpf1 regress/bpf1 - @/bin/sh ./itest `awk "/^$@ / { print; } " test.format` - -n1: expected/n1 regress/n1 input/n1 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n2: expected/n2 regress/n2 input/n2 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n3: expected/n3 regress/n3 input/n3 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n4: expected/n4 regress/n4 input/n4 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n5: expected/n5 regress/n5 input/n5 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n6: expected/n6 regress/n6 input/n6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n7: expected/n7 regress/n7 input/n7 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n8: expected/n8 regress/n8 input/n8 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n9: expected/n9 regress/n9 input/n9 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n10: expected/n10 regress/n10 input/n10 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n11: expected/n11 regress/n11 input/n11 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n12: expected/n12 regress/n12 input/n12 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n13: expected/n13 regress/n13 input/n13 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n14: expected/n14 regress/n14 input/n14 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n15: expected/n15 regress/n15 input/n15 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n16: expected/n16 regress/n16 input/n16 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n17: expected/n17 regress/n17 input/n17 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n18: expected/n18 regress/n18 input/n18 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n100: expected/n100 regress/n100 input/n100 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n101: expected/n101 regress/n101 input/n101 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n102: expected/n102 regress/n102 input/n102 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n103: expected/n103 regress/n103 input/n103 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n104: expected/n104 regress/n104 input/n104 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n105: expected/n105 regress/n105 input/n105 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n106: expected/n106 regress/n106 input/n106 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n200: expected/n200 regress/n200 input/n200 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n1_6: expected/n1_6 regress/n1_6 input/n1_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n2_6: expected/n2_6 regress/n2_6 input/n2_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n4_6: expected/n4_6 regress/n4_6 input/n4_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n5_6: expected/n5_6 regress/n5_6 input/n5_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n6_6: expected/n6_6 regress/n6_6 input/n6_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n7_6: expected/n7_6 regress/n7_6 input/n7_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n8_6: expected/n8_6 regress/n8_6 input/n8_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n9_6: expected/n9_6 regress/n9_6 input/n9_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n11_6: expected/n11_6 regress/n11_6 input/n11_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n12_6: expected/n12_6 regress/n12_6 input/n12_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -n15_6: expected/n15_6 regress/n15_6 input/n15_6 - @/bin/sh ./nattest `awk "/^$@ / { print; } " test.format` - -ni2: expected/ni2 input/ni2 regress/ni2.nat regress/ni2.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni3: expected/ni3 input/ni3 regress/ni3.nat regress/ni3.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni4: expected/ni4 input/ni4 regress/ni4.nat regress/ni4.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni5: expected/ni5 input/ni5 regress/ni5.nat regress/ni5.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni7: expected/ni7 input/ni7 regress/ni7.nat regress/ni7.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni8: expected/ni8 input/ni8 regress/ni8.nat regress/ni8.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni9: expected/ni9 input/ni9 regress/ni9.nat regress/ni9.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni10: expected/ni10 input/ni10 regress/ni10.nat regress/ni10.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni11: expected/ni11 input/ni11 regress/ni11.nat regress/ni11.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni12: expected/ni12 input/ni12 regress/ni12.nat regress/ni12.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni13: expected/ni13 input/ni13 regress/ni13.nat regress/ni13.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni14: expected/ni14 input/ni14 regress/ni14.nat regress/ni14.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni15: expected/ni15 input/ni15 regress/ni15.nat regress/ni15.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni16: expected/ni16 input/ni16 regress/ni16.nat regress/ni16.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni19: expected/ni19 input/ni19 regress/ni19.nat regress/ni19.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni20: expected/ni20 input/ni20 regress/ni20.nat regress/ni20.ipf - @/bin/sh ./natipftest single `awk "/^$@ / { print; } " test.format` - -ni1: expected/ni1 input/ni1 regress/ni1.nat regress/ni1.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni6: expected/ni6 input/ni6 regress/ni6.nat regress/ni6.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni17: expected/ni17 input/ni17 regress/ni17.nat regress/ni17.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni18: expected/ni18 input/ni18 regress/ni18.nat regress/ni18.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni21: expected/ni21 input/ni21 regress/ni21.nat regress/ni21.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -ni23: expected/ni23 input/ni23 regress/ni23.nat regress/ni23.ipf - @/bin/sh ./natipftest multi `awk "/^$@ / { print; } " test.format` - -in1: expected/in1 regress/in1 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in2: expected/in2 regress/in2 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in3: expected/in3 regress/in3 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in4: expected/in4 regress/in4 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in5: expected/in5 regress/in5 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in6: expected/in6 regress/in6 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in7: expected/in7 regress/in7 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in8: expected/in8 regress/in8 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in100: expected/in100 regress/in100 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in101: expected/in101 regress/in101 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -in102: expected/in102 regress/in102 - @/bin/sh ./intest `awk "/^$@ / { print; } " test.format` - -l1: - @/bin/sh ./logtest `awk "/^$@ / { print; } " test.format` - -ipv6.1: expected/ipv6.1 input/ipv6.1 regress/ipv6.1 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.2: expected/ipv6.2 input/ipv6.2 regress/ipv6.2 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.3: expected/ipv6.3 input/ipv6.3 regress/ipv6.3 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.4: expected/ipv6.4 input/ipv6.4 regress/ipv6.4 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.5: expected/ipv6.5 input/ipv6.5 regress/ipv6.5 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -ipv6.6: expected/ipv6.6 input/ipv6.6 regress/ipv6.6 - @/bin/sh ./dotest6 `awk "/^$@ / { print; } " test.format` - -p1: expected/p1 input/p1 regress/p1.ipf regress/p1.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p2: expected/p2 input/p2 regress/p2.ipf $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p3: expected/p3 input/p3 regress/p3.ipf regress/p3.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p4: expected/p4 input/p4 regress/p4.nat regress/p4.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p5: expected/p5 input/p5 regress/p5.ipf regress/p5.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p6: expected/p6 input/p6 regress/p6.ipf regress/p6.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p7: expected/p7 input/p7 regress/p7.nat regress/p7.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p9: expected/p9 input/p9 regress/p9.nat regress/p9.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p10: expected/p10 input/p10 regress/p10.nat regress/p10.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p11: expected/p11 input/p11 regress/p11.nat regress/p11.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p12: expected/p12 input/p12 regress/p12.nat regress/p12.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -p13: expected/p13 input/p13 regress/p13.ipf regress/p13.pool $(POOLDEP) - @/bin/sh ./ptest `awk "/^$@ / { print; } " test.format` - -ip1: expected/ip1 regress/ip1 $(POOLDEP) - @/bin/sh ./iptest `awk "/^$@ / { print; } " test.format` - -ip2: expected/ip2 input/ip2.data regress/ip2 $(POOLDEP) - @/bin/sh ./iptest `awk "/^$@ / { print; } " test.format` - -ip3: expected/ip3 regress/ip3 $(POOLDEP) - @/bin/sh ./iptest `awk "/^$@ / { print; } " test.format` - -bpf-f1: expected/bpf-f1 regress/bpf-f1 - /bin/sh ./bpftest `awk "/^$@ / { print; } " test.format` - -clean: - /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13 f14 f15 f16 f17 - /bin/rm -f f18 f19 f20 f21 f22 f24 f25 f26 f27 f28 f29 - /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 i12 i13 i14 i15 i16 i17 - /bin/rm -f i18 i19 i20 i21 i22 i23 - /bin/rm -f n1 n2 n3 n4 n5 n6 n7 n8 n9 n10 n11 n12 n13 n14 n15 n16 n17 n18 n100 n101 n102 n103 n104 n105 n106 n200 - /bin/rm -f n1_6 n2_6 n4_6 n5_6 n6_6 n7_6 n8_6 n9_6 n11_6 n12_6 n15_6 - /bin/rm -f ni1 ni2 ni3 ni4 ni5 ni6 ni7 ni8 ni9 - /bin/rm -f ni10 ni11 ni12 ni13 ni14 ni15 ni16 ni17 ni18 ni19 ni20 ni21 ni23 - /bin/rm -f in1 in2 in3 in4 in5 in6 in7 in100 in101 in102 - /bin/rm -f p1 p2 p3 p4 p5 p6 p7 p9 p10 p11 p12 p13 ip1 ip2 ip3 - /bin/rm -f l1 - /bin/rm -f ipv6.1 ipv6.2 ipv6.3 ipv6.4 ipv6.5 ipv6.6 - /bin/rm -f bpf1 bpf-f1 - /bin/rm -f results/* logout - (cd expected; make clean) - -diffs: - -cd expected; for i in *; do if [ -f $$i -a ! -f ../$$i -a -f ../results/$$i ] ; then diff -c $$i ../results/$$i >> ../diff.out; fi done - -n6s: - for i in 1 2 4 5 6 7 11 13 14 15; do \ - sh i4to6 < input/n$${i} > input/n$${i}_6; \ - sh e4to6 < regress/n$${i} > regress/n$${i}_6; \ - sh e4to6 < expected/n$${i} > expected/n$${i}_6; \ - done - for i in 8 9 10 12 17; do \ - sh e4to6 < regress/n$${i} > regress/n$${i}_6; \ - perl h4to6 < input/n$${i} > input/n$${i}_6; \ - done diff --git a/contrib/ipfilter/test/README.TXT b/contrib/ipfilter/test/README.TXT deleted file mode 100644 index 0b62145..0000000 --- a/contrib/ipfilter/test/README.TXT +++ /dev/null @@ -1,30 +0,0 @@ -The contents of this directory sub tree is dedicated to regression testing -of IPFilter. - -The tests are broken down into these groups: -f - filter rule tests -i - parsing & printing test of ipf rules -in - parsing & printing test of ipnat rules -ipv6 - ipv6 filter rule tests -l - logging test -n - NAT testing -ni - combined NAT & IPF tests - - TEST -f1 - block/pass, in/out. -f2 - proto -f3 - from IP# -f4 - to #IP -f5 - source port -f6 - destination port -f7 - icmp-type, code -f8 - flags -f9 - ipoptions -f10 - ipoptions -f11 - keep frag/state -f12 - short/frag -f13 - keep frag/state (fragmented packets) -f14 - from !host, to !host -f15 - groups -f16 - skip -f17 - TCP state transition on flags diff --git a/contrib/ipfilter/test/bpftest b/contrib/ipfilter/test/bpftest deleted file mode 100644 index 5449658f..0000000 --- a/contrib/ipfilter/test/bpftest +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -input=`expr $name : 'bpf-\(.*\)'` -/bin/cp /dev/null results/$name -( while read rule; do - echo "$rule" | ../ipftest -Rbr - -i input/$input >> results/$name - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "--------" >> results/$name -done ) < regress/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/dotest b/contrib/ipfilter/test/dotest deleted file mode 100644 index 71c09b7..0000000 --- a/contrib/ipfilter/test/dotest +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -name=$1 -format=$2 -output=$3 -tuning=$4 - -. ./ipflib.sh - -test_init - -if [ "$tuning" != "" ] ; then - case $tuning in - -*) - ;; - *) - tuning="-T $tuning" - ;; - esac -fi -echo "${name}..."; -n=1 -/bin/cp /dev/null results/${name} -( while read rule; do - set_core $name $n - echo "$rule" | ../ipftest -F $format -Rbr - -i input/${name} $tuning>> results/${name} & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - echo "--------" >> results/${name} -done ) < regress/${name} -check_results $name -exit $status diff --git a/contrib/ipfilter/test/dotest6 b/contrib/ipfilter/test/dotest6 deleted file mode 100755 index d6db564..0000000 --- a/contrib/ipfilter/test/dotest6 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -format=$2 -mkdir -p results -if [ -f /usr/ucb/touch ] ; then - TOUCH=/usr/ucb/touch -else - if [ -f /usr/bin/touch ] ; then - TOUCH=/usr/bin/touch - else - if [ -f /bin/touch ] ; then - TOUCH=/bin/touch - fi - fi -fi -echo "$1..."; -/bin/cp /dev/null results/$1 -../ipftest -6 -r /dev/null -i /dev/null >/dev/null 2>&1 -if [ $? -ne 0 ] ; then - echo "skipping IPv6 tests" - $TOUCH $1 - exit 0 -fi -( while read rule; do - echo "$rule" | ../ipftest -F $format -6br - -i input/$1 >> results/$1; - if [ $? -ne 0 ] ; then - exit 1; - fi - echo "--------" >> results/$1 -done ) < regress/$1 -cmp expected/$1 results/$1 -status=$? -if [ $status = 0 ] ; then - $TOUCH $1 -fi -exit $status diff --git a/contrib/ipfilter/test/e4to6 b/contrib/ipfilter/test/e4to6 deleted file mode 100644 index 8755899..0000000 --- a/contrib/ipfilter/test/e4to6 +++ /dev/null @@ -1,61 +0,0 @@ -sed \ --e 's/192.168.126.0/c0a8:7e00::/' \ --e 's/\/32/\/128/g' \ --e 's/\/24/\/112/g' \ --e 's/\/16/\/32/g' \ --e 's/10\.2\.0\.0/10::2:0:0/g' \ --e 's/1\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/1:0:0:0:0:\1:\2:\3/g' \ --e 's/2\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/2:0:0:0:0:\1:\2:\3/g' \ --e 's/4\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/4:\1:\2:0:0:0:0:\3/g' \ --e 's/3\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/3:0:\1:0:0:0:\2:\3/g' \ --e 's/5\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/5:\1:0:0:0:0:\2:\3/g' \ --e 's/9\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/9:\1:\2:0:0:0:0:\3/g' \ --e 's/10\.1\.\([0-9]\)\.\([0-9]\)/10:1:\1:0:0:0:0:\2/g' \ --e 's/10\.10\.\([0-9]*\)\.\([0-9]\)/10:10:\1:0:0:0:0:\2/g' \ --e 's/10\.2\.\([0-9]\)\.\([0-9]\)/10:0:0:0:0:2:\1:\2/g' \ --e 's/10\.4\.3\.\([0-9]\)/10:4:3:0:0:0:0:\1/g' \ --e 's/10\.3\.4\.\([0-9]\)/10:0:0:0:0:3:4:\1/g' \ --e 's/10\.3\.\([0-9]\)\.\([0-9]\)/10:3:\1:0:0:0:0:\2/g' \ --e 's/0\.0\.0\.0/any/g' \ --e 's/ 0\/0 / any /g' \ --e 's/ip #0/ip6\/0/' \ --e 's/40(20) 6 /20 0 6 /' \ --e 's/28(20) 17 /8 0 17 /' \ --e 's/20(20) 0 /1 0 41 /' \ --e 's/48(20) 1 /88 0 58 /g' \ --e 's/20(20) 34 /1 0 34 /g' \ --e 's/20(20) 35 /1 0 35 /g' \ --e 's/20(20) 255 /1 0 255 /g' \ --e 's/ */ /g' | sed \ --e '/use/s/:0:0:0:0:/::/g' \ --e '/map/s/:0:0:0:0:/::/g' \ --e '/rdr/s/:0:0:0:0:/::/g' \ --e '/map/s/:0:0:0:/::/g' \ --e '/rdr/s/:0:0:0:/::/g' \ --e '/MAP/s/:0:0:0:0:0:/::/g' \ --e '/RDR/s/:0:0:0:0:0:/::/g' \ --e '/MAP/s/:0:0:0:0:/::/g' \ --e '/RDR/s/:0:0:0:0:/::/g' \ --e '/MAP/s/:0:0:0:/::/g' \ --e '/RDR/s/:0:0:0:/::/g' \ -| sed \ --e '/MAP/s/ \([0-9][0-9][0-9][0-9]\) / \1 /g' \ --e '/MAP/s/ \([0-9][0-9][0-9]\) / \1 /g' \ --e '/MAP/s/ \([0-9][0-9]\) / \1 /g' \ --e '/RDR/s/ \([0-9][0-9][0-9][0-9]\) / \1 /g' \ --e '/RDR/s/ \([0-9][0-9][0-9]\) / \1 /g' \ --e '/RDR/s/ \([0-9][0-9]\) / \1 /g' \ --e 's/::0:0\//::\//g' \ --e 's/:0:0\//::\//g' \ --e 's/::0\([^:0-9]\)/::\1/g' \ --e 's/::0,/::,/g' \ --e 's/::0:0 \([^>]\)/:: \1/g' \ --e 's/:0:0 \([^>]\)/:: \1/g' \ --e 's/::0 \([^>]\)/:: \1/g' \ -| sed \ --e 's@::\([0-9]*\)::/16@::/16@g' \ --e 's@::\([0-9]*\)::/32@::/32@g' \ --e 's@::\([0-9]*\)::@::\1:0:0@g' \ --e 's@::\([0-9]*\)::@::\1:0:0@g' \ --e 's@::[:0-9]*\([^0-9:]\)/16@::/16@g' \ --e 's@::[:0-9]*\([^0-9:]\)/32@::/32@g' diff --git a/contrib/ipfilter/test/expected/Makefile b/contrib/ipfilter/test/expected/Makefile deleted file mode 100644 index bb91b8b..0000000 --- a/contrib/ipfilter/test/expected/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# (C)opyright 2007 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -all: i19 - -i19: i19.dist Makefile - -if [ "`grep LOG_SECURITY /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - if [ "`grep LOG_AUDIT /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/security/!!!/g' i19.dist > i19.p1; \ - else \ - sed -e 's/security/audit/g' i19.dist > i19.p1; \ - fi \ - else \ - /bin/cp i19.dist i19.p1; \ - fi - -if [ "`grep LOG_AUTHPRIV /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/authpriv/!!!/g' i19.p1 > i19.p2; \ - else \ - /bin/cp i19.p1 i19.p2; \ - fi - -if [ "`grep LOG_LOGALERT /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/logalert/!!!/g' i19.p2 > i19.p1; \ - else \ - /bin/cp i19.p2 i19.p1; \ - fi - -if [ "`grep LOG_FTP /usr/include/sys/syslog.h 2>&1`" = "" ] ; then \ - sed -e 's/ftp/!!!/g' i19.p1 > i19.p2; \ - else \ - /bin/cp i19.p1 i19.p2; \ - fi - -if [ "`egrep 'LOG_CRON.*15' /usr/include/sys/syslog.h 2>&1`" != "" ] ; then \ - sed -e 's/cron/cron2/g' i19.p2 > i19; \ - else \ - /bin/cp i19.p2 i19; \ - fi - /bin/rm i19.p? - -clean: - /bin/rm -f i19 diff --git a/contrib/ipfilter/test/expected/bpf-f1 b/contrib/ipfilter/test/expected/bpf-f1 deleted file mode 100644 index 85ce84c..0000000 --- a/contrib/ipfilter/test/expected/bpf-f1 +++ /dev/null @@ -1,20 +0,0 @@ -nomatch -pass -nomatch -nomatch --------- -nomatch -nomatch -nomatch -pass --------- -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/bpf1 b/contrib/ipfilter/test/expected/bpf1 deleted file mode 100644 index 76381a7..0000000 --- a/contrib/ipfilter/test/expected/bpf1 +++ /dev/null @@ -1,4 +0,0 @@ -pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "0 0 0 0 0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x1 0x6 0 0 0" } -pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "0 0 0 0 0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x1 0x6 0 0 0" } diff --git a/contrib/ipfilter/test/expected/f1 b/contrib/ipfilter/test/expected/f1 deleted file mode 100644 index 86d9592..0000000 --- a/contrib/ipfilter/test/expected/f1 +++ /dev/null @@ -1,20 +0,0 @@ -block -block -nomatch -nomatch --------- -pass -pass -nomatch -nomatch --------- -nomatch -nomatch -block -block --------- -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f10 b/contrib/ipfilter/test/expected/f10 deleted file mode 100644 index da6c312..0000000 --- a/contrib/ipfilter/test/expected/f10 +++ /dev/null @@ -1,126 +0,0 @@ -nomatch -block -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -nomatch -nomatch -pass --------- -block -block -block -nomatch -nomatch -block --------- -pass -pass -pass -nomatch -nomatch -pass --------- -block -block -nomatch -nomatch -nomatch -block --------- -pass -pass -nomatch -nomatch -nomatch -pass --------- -block -block -block -block -block -block --------- -pass -pass -pass -pass -pass -pass --------- -nomatch -block -block -block -nomatch -block --------- -nomatch -pass -pass -pass -nomatch -pass --------- -nomatch -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -block -block --------- -nomatch -pass -pass -pass -pass -pass --------- -block -block -nomatch -block -nomatch -block --------- -pass -pass -nomatch -pass -nomatch -pass --------- -block -block -block -block -block -block --------- -pass -pass -pass -pass -pass -pass --------- -block -block -block -nomatch -nomatch -block --------- diff --git a/contrib/ipfilter/test/expected/f11 b/contrib/ipfilter/test/expected/f11 deleted file mode 100644 index d7ab889..0000000 --- a/contrib/ipfilter/test/expected/f11 +++ /dev/null @@ -1,283 +0,0 @@ -pass -nomatch -nomatch -pass -pass -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 pass in proto tcp from any to any port = 23 flags S/SA keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -block -nomatch -nomatch -block -block -nomatch -block -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in proto tcp from any to any port = 23 flags S/SA keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in proto udp from any to any port = 53 keep frags -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 block in proto udp from any to any port = 53 keep frags -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:2.2.2.2,2 dst:4.4.4.4,53 240 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[e1],X[] out X[],X[] - Sync status: not synchronized -4:udp src:1.1.1.1,1 dst:4.4.4.4,53 24 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[e1],X[e0] out X[],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in proto udp from any to any port = 53 keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:2.2.2.2,2 dst:4.4.4.4,53 240 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008401 = block in keep state - interfaces: in X[e1],X[] out X[],X[] - Sync status: not synchronized -4:udp src:1.1.1.1,1 dst:4.4.4.4,53 24 - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - tag 0 pass 0x2008401 = block in keep state - interfaces: in X[e1],X[e0] out X[],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 block in proto udp from any to any port = 53 keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:tcp src:1.1.1.1,1 dst:2.1.2.2,25 state:3/4 864000 - 2:66 4096<<0:16384<<0 - FWD: IN pkts 1 bytes 40 OUT pkts 0 bytes 0 - REV: IN pkts 1 bytes 40 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[e0],X[e1] out X[],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 pass in on e0 proto tcp from any to any port = 25 keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- diff --git a/contrib/ipfilter/test/expected/f12 b/contrib/ipfilter/test/expected/f12 deleted file mode 100644 index 094d8c0..0000000 --- a/contrib/ipfilter/test/expected/f12 +++ /dev/null @@ -1,60 +0,0 @@ -pass -pass -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch --------- -pass -pass -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch --------- -nomatch -nomatch -nomatch -bad-packet -block -nomatch -bad-packet -nomatch -nomatch --------- -nomatch -nomatch -block -bad-packet -block -nomatch -bad-packet -nomatch -nomatch --------- -nomatch -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -pass --------- -nomatch -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -block --------- diff --git a/contrib/ipfilter/test/expected/f13 b/contrib/ipfilter/test/expected/f13 deleted file mode 100644 index ac7947b..0000000 --- a/contrib/ipfilter/test/expected/f13 +++ /dev/null @@ -1,180 +0,0 @@ -pass -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -bad-packet -nomatch -block -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -pass -bad-packet -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -block -bad-packet -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch --------- -block -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -pass --------- -block -bad-packet -nomatch -block -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -block -block --------- -nomatch -bad-packet -nomatch -nomatch -bad-packet -nomatch -nomatch -bad-packet -pass -bad-packet -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -block -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -pass -block -block -pass --------- -block -bad-packet -nomatch -pass -bad-packet -nomatch -nomatch -bad-packet -nomatch -bad-packet -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f14 b/contrib/ipfilter/test/expected/f14 deleted file mode 100644 index 1c6ed5c..0000000 --- a/contrib/ipfilter/test/expected/f14 +++ /dev/null @@ -1,48 +0,0 @@ -block -nomatch -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -pass -pass --------- -block -nomatch -nomatch -nomatch -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f15 b/contrib/ipfilter/test/expected/f15 deleted file mode 100644 index 9b31258..0000000 --- a/contrib/ipfilter/test/expected/f15 +++ /dev/null @@ -1,9 +0,0 @@ -block return-rst -pass -block return-icmp -pass -block -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f16 b/contrib/ipfilter/test/expected/f16 deleted file mode 100644 index b6cb3fa..0000000 --- a/contrib/ipfilter/test/expected/f16 +++ /dev/null @@ -1,9 +0,0 @@ -block -block -pass -block -pass -pass -block -block --------- diff --git a/contrib/ipfilter/test/expected/f17 b/contrib/ipfilter/test/expected/f17 deleted file mode 100644 index c586e5b..0000000 --- a/contrib/ipfilter/test/expected/f17 +++ /dev/null @@ -1,7 +0,0 @@ -pass -block return-rst -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f18 b/contrib/ipfilter/test/expected/f18 deleted file mode 100644 index 1af5de5..0000000 --- a/contrib/ipfilter/test/expected/f18 +++ /dev/null @@ -1,27 +0,0 @@ -pass -pass -pass -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in inet from 1.1.1.1/32 to any -Rules configured (set 0, out) -2 pass out inet from 2.2.2.2/32 to any -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -1 count in inet from 1.1.1.1/32 to 3.3.3.3/32 -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -1 count out inet from 2.2.2.2/32 to 4.4.4.4/32 -Accounting rules configured (set 1, out) --------- diff --git a/contrib/ipfilter/test/expected/f19 b/contrib/ipfilter/test/expected/f19 deleted file mode 100644 index 5ee2e9d..0000000 --- a/contrib/ipfilter/test/expected/f19 +++ /dev/null @@ -1,10 +0,0 @@ -pass -pass -pass -nomatch --------- -pass -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f2 b/contrib/ipfilter/test/expected/f2 deleted file mode 100644 index 7093a41..0000000 --- a/contrib/ipfilter/test/expected/f2 +++ /dev/null @@ -1,42 +0,0 @@ -block -block -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -block -nomatch -nomatch --------- -nomatch -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -block -block --------- -nomatch -nomatch -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f20 b/contrib/ipfilter/test/expected/f20 deleted file mode 100644 index 86308a0..0000000 --- a/contrib/ipfilter/test/expected/f20 +++ /dev/null @@ -1,3 +0,0 @@ -pass -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f21 b/contrib/ipfilter/test/expected/f21 deleted file mode 100644 index 525daca..0000000 --- a/contrib/ipfilter/test/expected/f21 +++ /dev/null @@ -1,5 +0,0 @@ -pass -pass -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f22 b/contrib/ipfilter/test/expected/f22 deleted file mode 100644 index 525daca..0000000 --- a/contrib/ipfilter/test/expected/f22 +++ /dev/null @@ -1,5 +0,0 @@ -pass -pass -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f24 b/contrib/ipfilter/test/expected/f24 deleted file mode 100644 index 801abd3..0000000 --- a/contrib/ipfilter/test/expected/f24 +++ /dev/null @@ -1,5 +0,0 @@ -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f25 b/contrib/ipfilter/test/expected/f25 deleted file mode 100644 index a87b084..0000000 --- a/contrib/ipfilter/test/expected/f25 +++ /dev/null @@ -1,35 +0,0 @@ -pass -pass -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:192.168.1.235,8008 dst:239.255.255.250,1900 240 - FWD: IN pkts 1 bytes 129 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[hme0],X[] out X[],X[] - Sync status: not synchronized -4:udp src:192.168.1.235,8008 dst:192.168.1.254,1900 24 - FWD: IN pkts 1 bytes 129 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 1 bytes 264 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[hme0],X[] out X[],X[hme0] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in on hme0 proto udp from any to any with mcast keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) --------- diff --git a/contrib/ipfilter/test/expected/f26 b/contrib/ipfilter/test/expected/f26 deleted file mode 100644 index 9e4d62b..0000000 --- a/contrib/ipfilter/test/expected/f26 +++ /dev/null @@ -1,84 +0,0 @@ -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f27 b/contrib/ipfilter/test/expected/f27 deleted file mode 100644 index c62f588..0000000 --- a/contrib/ipfilter/test/expected/f27 +++ /dev/null @@ -1,90 +0,0 @@ -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -nomatch -pass -pass -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass --------- diff --git a/contrib/ipfilter/test/expected/f28 b/contrib/ipfilter/test/expected/f28 deleted file mode 100644 index e5867e6..0000000 --- a/contrib/ipfilter/test/expected/f28 +++ /dev/null @@ -1,32 +0,0 @@ -block -block -block -> nic0 ip #0 20(20) 0 4.4.3.1 > 4.2.3.2 -pass -> nic1 ip #0 20(20) 0 4.4.1.1 > 4.2.1.2 -pass -> nic2 ip #0 20(20) 0 4.4.2.1 > 4.2.2.2 -pass -> nic3 ip #0 20(20) 0 4.4.3.1 > 4.2.3.2 -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -7 block in all -4 pass in on nic0 to dstlist/spread inet from 4.4.0.0/16 to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/f29 b/contrib/ipfilter/test/expected/f29 deleted file mode 100644 index a650c1b..0000000 --- a/contrib/ipfilter/test/expected/f29 +++ /dev/null @@ -1,64 +0,0 @@ -block -block -block -> nic0 ip #0 28(20) 17 4.4.3.1,1000 > 4.2.3.2,2000 -pass -> nic0 ip #0 28(20) 17 4.4.3.1,1000 > 4.2.3.2,2000 -pass -> nic1 ip #0 28(20) 17 4.4.1.1,1001 > 4.2.1.2,2001 -pass -> nic1 ip #0 28(20) 17 4.4.1.1,1001 > 4.2.1.2,2001 -pass -> nic2 ip #0 28(20) 17 4.4.2.1,1002 > 4.2.2.2,2002 -pass -> nic2 ip #0 28(20) 17 4.4.2.1,1002 > 4.2.2.2,2002 -pass -> nic3 ip #0 28(20) 17 4.4.3.1,1003 > 4.2.3.2,2003 -pass -> nic3 ip #0 28(20) 17 4.4.3.1,1003 > 4.2.3.2,2003 -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -4:udp src:4.4.3.1,1003 dst:4.2.3.2,2003 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic3],X[] - Sync status: not synchronized -4:udp src:4.4.2.1,1002 dst:4.2.2.2,2002 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic2],X[] - Sync status: not synchronized -4:udp src:4.4.1.1,1001 dst:4.2.1.2,2001 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic1],X[] - Sync status: not synchronized -4:udp src:4.4.3.1,1000 dst:4.2.3.2,2000 240 - FWD: IN pkts 2 bytes 56 OUT pkts 2 bytes 56 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[nic0],X[] out X[nic0],X[] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -7 block in all -4 pass in on nic0 to dstlist/spread inet from 4.4.0.0/16 to any keep state -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/f3 b/contrib/ipfilter/test/expected/f3 deleted file mode 100644 index 5df3ac4..0000000 --- a/contrib/ipfilter/test/expected/f3 +++ /dev/null @@ -1,48 +0,0 @@ -nomatch -block -nomatch -nomatch -nomatch --------- -nomatch -pass -nomatch -nomatch -nomatch --------- -nomatch -block -block -nomatch -nomatch --------- -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -block -block -block -nomatch --------- -nomatch -pass -pass -pass -nomatch --------- -block -block -block -block -block --------- -pass -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f30 b/contrib/ipfilter/test/expected/f30 deleted file mode 100644 index 30b9d40..0000000 --- a/contrib/ipfilter/test/expected/f30 +++ /dev/null @@ -1,68 +0,0 @@ -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -pass -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f4 b/contrib/ipfilter/test/expected/f4 deleted file mode 100644 index 5df3ac4..0000000 --- a/contrib/ipfilter/test/expected/f4 +++ /dev/null @@ -1,48 +0,0 @@ -nomatch -block -nomatch -nomatch -nomatch --------- -nomatch -pass -nomatch -nomatch -nomatch --------- -nomatch -block -block -nomatch -nomatch --------- -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -block -block -block -nomatch --------- -nomatch -pass -pass -pass -nomatch --------- -block -block -block -block -block --------- -pass -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f5 b/contrib/ipfilter/test/expected/f5 deleted file mode 100644 index 36c7d40..0000000 --- a/contrib/ipfilter/test/expected/f5 +++ /dev/null @@ -1,1392 +0,0 @@ -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f6 b/contrib/ipfilter/test/expected/f6 deleted file mode 100644 index 36c7d40..0000000 --- a/contrib/ipfilter/test/expected/f6 +++ /dev/null @@ -1,1392 +0,0 @@ -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -block --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -pass --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block -block -block -block -nomatch -block -block -block -block -block -block -block -block -block -block --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f7 b/contrib/ipfilter/test/expected/f7 deleted file mode 100644 index 7a4daed..0000000 --- a/contrib/ipfilter/test/expected/f7 +++ /dev/null @@ -1,144 +0,0 @@ -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/f8 b/contrib/ipfilter/test/expected/f8 deleted file mode 100644 index ad42ff2..0000000 --- a/contrib/ipfilter/test/expected/f8 +++ /dev/null @@ -1,42 +0,0 @@ -block -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -nomatch -nomatch -nomatch -nomatch -nomatch --------- -block -nomatch -block -nomatch -nomatch -nomatch --------- -pass -nomatch -pass -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- diff --git a/contrib/ipfilter/test/expected/f9 b/contrib/ipfilter/test/expected/f9 deleted file mode 100644 index cc5be68..0000000 --- a/contrib/ipfilter/test/expected/f9 +++ /dev/null @@ -1,180 +0,0 @@ -block -block -block -block -block -block -block -block -block --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -pass -pass -pass --------- -block -block -block -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -block -block -nomatch --------- diff --git a/contrib/ipfilter/test/expected/i1 b/contrib/ipfilter/test/expected/i1 deleted file mode 100644 index 19ae393..0000000 --- a/contrib/ipfilter/test/expected/i1 +++ /dev/null @@ -1,17 +0,0 @@ -pass in all -block out all -log in all -log body in all -count in from any to any -pass in from !any to any pps 10 -block in from any to !any -pass in on ed0(!) inet from 127.0.0.1/32 to 127.0.0.1/32 -pass in on ed0(!),vx0(!) inet from 127.0.0.1/32 to 127.0.0.1/32 -block in log first on lo0(!) from any to any -pass in log body or-block quick from any to any -block return-rst in quick on le0(!) proto tcp from any to any -block return-icmp in on qe0(!) from any to any -block return-icmp(host-unr) in on qe0(!) from any to any -block return-icmp-as-dest in on le0(!) from any to any -block return-icmp-as-dest(port-unr) in on qe0(!) from any to any -pass out on longNICname0(!) inet from 254.220.186.152/32 to 254.220.186.152/32 diff --git a/contrib/ipfilter/test/expected/i10 b/contrib/ipfilter/test/expected/i10 deleted file mode 100644 index 24137c1..0000000 --- a/contrib/ipfilter/test/expected/i10 +++ /dev/null @@ -1,5 +0,0 @@ -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with opt sec -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with opt lsrr not opt sec -block in inet from any to any with not opt sec-class topsecret -block in inet from any to any with not opt sec-class topsecret,secret -pass in inet from any to any with opt sec-class topsecret,confid not opt sec-class unclass diff --git a/contrib/ipfilter/test/expected/i11 b/contrib/ipfilter/test/expected/i11 deleted file mode 100644 index d1d2cf6..0000000 --- a/contrib/ipfilter/test/expected/i11 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on ed0(!) inet proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 keep state # count 0 -block in log first on lo0(!) proto tcp/udp from any to any port = 7 keep state # count 0 -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 20499 keep frags -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 2049 keep frags (strict) -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 port = 53 keep state keep frags # count 0 -pass in on ed0(!) out-via vx0(!) proto udp from any to any keep state # count 0 -pass out on ppp0(!) in-via le0(!) proto tcp from any to any keep state # count 0 -pass in on ed0(!),vx0(!) out-via vx0(!),ed0(!) proto udp from any to any keep state # count 0 -pass in inet proto tcp from any port > 1024 to 127.0.0.1/32 port = 1024 keep state # count 0 -pass in proto tcp from any to any flags S/FSRPAU keep state (limit 101,strict,newisn,no-icmp-err,age 600/600) # count 0 -pass in proto tcp from any to any flags S/FSRPAU keep state (limit 101,loose,newisn,no-icmp-err,age 600/600) # count 0 -pass in proto udp from any to any keep state (sync,age 10/20) # count 0 diff --git a/contrib/ipfilter/test/expected/i12 b/contrib/ipfilter/test/expected/i12 deleted file mode 100644 index 6747d93..0000000 --- a/contrib/ipfilter/test/expected/i12 +++ /dev/null @@ -1,39 +0,0 @@ -pass in inet from 1.1.1.1/32 to 2.2.2.2/32 -pass in inet from 2.2.2.0/24 to 4.4.4.4/32 -pass in inet from 3.3.3.3/32 to 4.4.4.4/32 -pass in inet from 2.2.2.0/24 to 5.5.5.5/32 -pass in inet from 3.3.3.3/32 to 5.5.5.5/32 -pass in inet from 2.2.2.0/24 to 6.6.6.6/32 -pass in inet from 3.3.3.3/32 to 6.6.6.6/32 -pass in inet from 2.2.2.0/24 to 5.5.5.5/32 port = 22 -pass in inet from 3.3.3.3/32 to 5.5.5.5/32 port = 22 -pass in inet from 2.2.2.0/24 to 6.6.6.6/32 port = 22 -pass in inet from 3.3.3.3/32 to 6.6.6.6/32 port = 22 -pass in inet from 2.2.2.0/24 to 5.5.5.5/32 port = 25 -pass in inet from 3.3.3.3/32 to 5.5.5.5/32 port = 25 -pass in inet from 2.2.2.0/24 to 6.6.6.6/32 port = 25 -pass in inet from 3.3.3.3/32 to 6.6.6.6/32 port = 25 -pass in inet proto tcp from 2.2.2.0/24 port = 53 to 5.5.5.5/32 -pass in inet proto tcp from 3.3.3.3/32 port = 53 to 5.5.5.5/32 -pass in inet proto tcp from 2.2.2.0/24 port = 9 to 5.5.5.5/32 -pass in inet proto tcp from 3.3.3.3/32 port = 9 to 5.5.5.5/32 -pass in inet proto tcp from 2.2.2.0/24 port = 53 to 6.6.6.6/32 -pass in inet proto tcp from 3.3.3.3/32 port = 53 to 6.6.6.6/32 -pass in inet proto tcp from 2.2.2.0/24 port = 9 to 6.6.6.6/32 -pass in inet proto tcp from 3.3.3.3/32 port = 9 to 6.6.6.6/32 -pass in inet proto udp from 2.2.2.0/24 to 5.5.5.5/32 port = 53 -pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 53 -pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 53 -pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 53 -pass in inet proto udp from 2.2.2.0/24 to 5.5.5.5/32 port = 9 -pass in inet proto udp from 3.3.3.3/32 to 5.5.5.5/32 port = 9 -pass in inet proto udp from 2.2.2.0/24 to 6.6.6.6/32 port = 9 -pass in inet proto udp from 3.3.3.3/32 to 6.6.6.6/32 port = 9 -pass in inet from 10.10.10.10/32 to 11.11.11.11/32 -pass in from pool/101 to hash/202 -pass in from hash/303 to pool/404 -table role=ipf type=tree number= - { ! 2.2.0.0/16; 2.2.2.2/32; ! 1.1.1.1/32; }; -table role=ipf type=tree number= - { 1.1.0.0/16; }; -pass in from pool/0 to pool/0 diff --git a/contrib/ipfilter/test/expected/i13 b/contrib/ipfilter/test/expected/i13 deleted file mode 100644 index 5c8d945..0000000 --- a/contrib/ipfilter/test/expected/i13 +++ /dev/null @@ -1,2 +0,0 @@ -block in from any to any -pass in from any to any diff --git a/contrib/ipfilter/test/expected/i14 b/contrib/ipfilter/test/expected/i14 deleted file mode 100644 index bccdcac..0000000 --- a/contrib/ipfilter/test/expected/i14 +++ /dev/null @@ -1,12 +0,0 @@ -block in on eri0(!) all head 1 -pass in on eri0(!) proto icmp from any to any group 1 -pass out on ed0(!) all head 1000000 -block out on ed0(!) proto udp from any to any group 1000000 -block in on vm0(!) proto tcp/udp from any to any head 101 -pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group 101 -pass in inet proto tcp from 1.0.0.1/32 to 2.0.0.2/32 group 101 -pass in inet proto udp from 2.0.0.2/32 to 3.0.0.3/32 group 101 -block in on vm0(!) proto tcp/udp from any to any head vm0-group -pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group -block in on vm0(!) proto tcp/udp from any to any head vm0-group -pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group diff --git a/contrib/ipfilter/test/expected/i15 b/contrib/ipfilter/test/expected/i15 deleted file mode 100644 index 4974659..0000000 --- a/contrib/ipfilter/test/expected/i15 +++ /dev/null @@ -1,4 +0,0 @@ -pass out on fxp0(!) all set-tag(log=100) -pass out on fxp0(!) all set-tag(nat=foo) -pass out on fxp0(!) all set-tag(log=100, nat=200) -pass out on fxp0(!) all set-tag(log=2147483648, nat=overtherainbowis) diff --git a/contrib/ipfilter/test/expected/i16 b/contrib/ipfilter/test/expected/i16 deleted file mode 100644 index c5b3cf3..0000000 --- a/contrib/ipfilter/test/expected/i16 +++ /dev/null @@ -1,3 +0,0 @@ -block out all -100 pass in all -10101 pass out proto tcp from any to any diff --git a/contrib/ipfilter/test/expected/i17 b/contrib/ipfilter/test/expected/i17 deleted file mode 100644 index 9e71cb1..0000000 --- a/contrib/ipfilter/test/expected/i17 +++ /dev/null @@ -1,29 +0,0 @@ -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -0 pass in inet from 1.1.1.1/32 to any -0 pass in all -0 pass in inet from 3.3.3.3/32 to any -0 pass in inet from any to 127.0.0.1/32 -0 pass in inet from 127.0.0.1/32 to any -0 100 pass in inet from 127.0.0.1/32 to any -0 100 pass in all -0 110 pass in proto udp from any to any -0 110 pass in inet from 2.2.2.2/32 to any -0 110 pass in inet from 127.0.0.1/32 to any -0 200 pass in proto tcp from any to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) diff --git a/contrib/ipfilter/test/expected/i18 b/contrib/ipfilter/test/expected/i18 deleted file mode 100644 index 2c7e493..0000000 --- a/contrib/ipfilter/test/expected/i18 +++ /dev/null @@ -1,11 +0,0 @@ -pass in tos 0x50 from any to any -pass in tos 0x80 from any to any -pass out tos 0x80 from any to any -pass out tos 0x50 from any to any -block in ttl 0 from any to any -block in ttl 1 from any to any -block in ttl 2 from any to any -block in ttl 3 from any to any -block in ttl 4 from any to any -block in ttl 5 from any to any -block in ttl 6 from any to any diff --git a/contrib/ipfilter/test/expected/i19 b/contrib/ipfilter/test/expected/i19 deleted file mode 100644 index 4ca19b5..0000000 --- a/contrib/ipfilter/test/expected/i19 +++ /dev/null @@ -1,22 +0,0 @@ -block in log level user.debug quick proto icmp from any to any -block in log level mail.info quick proto icmp from any to any -block in log level daemon.notice quick proto icmp from any to any -block in log level auth.warn quick proto icmp from any to any -block in log level syslog.err quick proto icmp from any to any -block in log level lpr.crit quick proto icmp from any to any -block in log level news.alert quick proto icmp from any to any -block in log level uucp.emerg quick proto icmp from any to any -block in log level cron.debug quick proto icmp from any to any -block in log level ftp.info quick proto icmp from any to any -block in log level authpriv.notice quick proto icmp from any to any -block in log level !!!.warn quick proto icmp from any to any -block in log level local0.err quick proto icmp from any to any -block in log level local1.crit quick proto icmp from any to any -block in log level local2.alert quick proto icmp from any to any -block in log level local3.emerg quick proto icmp from any to any -block in log level local4.debug quick proto icmp from any to any -block in log level local5.info quick proto icmp from any to any -block in log level local6.notice quick proto icmp from any to any -block in log level local7.warn quick proto icmp from any to any -block in log level kern.err quick proto icmp from any to any -block in log level !!!.emerg quick proto icmp from any to any diff --git a/contrib/ipfilter/test/expected/i19.dist b/contrib/ipfilter/test/expected/i19.dist deleted file mode 100644 index 5d9c26c..0000000 --- a/contrib/ipfilter/test/expected/i19.dist +++ /dev/null @@ -1,22 +0,0 @@ -block in log level user.debug quick proto icmp from any to any -block in log level mail.info quick proto icmp from any to any -block in log level daemon.notice quick proto icmp from any to any -block in log level auth.warn quick proto icmp from any to any -block in log level syslog.err quick proto icmp from any to any -block in log level lpr.crit quick proto icmp from any to any -block in log level news.alert quick proto icmp from any to any -block in log level uucp.emerg quick proto icmp from any to any -block in log level cron.debug quick proto icmp from any to any -block in log level ftp.info quick proto icmp from any to any -block in log level authpriv.notice quick proto icmp from any to any -block in log level logalert.warn quick proto icmp from any to any -block in log level local0.err quick proto icmp from any to any -block in log level local1.crit quick proto icmp from any to any -block in log level local2.alert quick proto icmp from any to any -block in log level local3.emerg quick proto icmp from any to any -block in log level local4.debug quick proto icmp from any to any -block in log level local5.info quick proto icmp from any to any -block in log level local6.notice quick proto icmp from any to any -block in log level local7.warn quick proto icmp from any to any -block in log level kern.err quick proto icmp from any to any -block in log level security.emerg quick proto icmp from any to any diff --git a/contrib/ipfilter/test/expected/i2 b/contrib/ipfilter/test/expected/i2 deleted file mode 100644 index 17b9d07..0000000 --- a/contrib/ipfilter/test/expected/i2 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp from any to any -pass in proto tcp from any to any -pass in inet proto udp from 127.0.0.1/32 to 127.0.0.1/32 -block in proto ipv6 from any to any -block in proto udp from any to any -block in proto 250 from any to any -pass in proto tcp/udp from any to any -block in proto tcp/udp from any to any -block in proto tcp/udp from any to any diff --git a/contrib/ipfilter/test/expected/i20 b/contrib/ipfilter/test/expected/i20 deleted file mode 100644 index 25e35cd..0000000 --- a/contrib/ipfilter/test/expected/i20 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on ppp0(!) inet from ppp0/peer to ppp0/32 -block in on hme0(!) inet from any to hme0/bcast -pass in on bge0(!) inet from bge0/net to bge0/32 -block in on eri0(!) inet from any to eri0/netmasked diff --git a/contrib/ipfilter/test/expected/i21 b/contrib/ipfilter/test/expected/i21 deleted file mode 100644 index d4d28da..0000000 --- a/contrib/ipfilter/test/expected/i21 +++ /dev/null @@ -1,16 +0,0 @@ -pass in from any port = 10101 to any -pass out from any to any port != 22 -block in from any port 20:21 to any -block out from any to any port 10 <> 100 -pass out from any to any port = 3 -pass out from any to any port = 5 -pass out from any to any port = 7 -pass out from any to any port = 9 -block in from any port = 20 to any -block in from any port = 25 to any -pass in from any port 11:12 to any port 1:2 -pass in from any port 21:22 to any port 1:2 -pass in from any port 11:12 to any port 4:5 -pass in from any port 21:22 to any port 4:5 -pass in from any port 11:12 to any port 8:9 -pass in from any port 21:22 to any port 8:9 diff --git a/contrib/ipfilter/test/expected/i22 b/contrib/ipfilter/test/expected/i22 deleted file mode 100644 index 6e5a07d..0000000 --- a/contrib/ipfilter/test/expected/i22 +++ /dev/null @@ -1,5 +0,0 @@ -pass in exp { "ip.src != 1.1.1.0/24; tcp.dport = 80;" } -pass in exp { "ip.addr = 1.2.3.4/32,5.6.7.8/32;" } -block out exp { "ip.dst = 127.0.0.0/8;" } -block in exp { "udp.sport = 53; udp.dport = 53;" } -pass out exp { "tcp.sport = 22; tcp.port = 25;" } diff --git a/contrib/ipfilter/test/expected/i23 b/contrib/ipfilter/test/expected/i23 deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/expected/i23 +++ /dev/null diff --git a/contrib/ipfilter/test/expected/i3 b/contrib/ipfilter/test/expected/i3 deleted file mode 100644 index 691ad25..0000000 --- a/contrib/ipfilter/test/expected/i3 +++ /dev/null @@ -1,11 +0,0 @@ -log in all -pass in inet from 128.16.0.0/16 to 129.10.10.0/24 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 128.0.0.0/24 to 128.0.0.0/16 -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 -block in log inet from any to any -block in log level auth.info on hme0(!) all -log level local5.warn out all diff --git a/contrib/ipfilter/test/expected/i4 b/contrib/ipfilter/test/expected/i4 deleted file mode 100644 index 1198714..0000000 --- a/contrib/ipfilter/test/expected/i4 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp from any port > 0 to any -log in proto tcp from any to any port > 0 -pass in proto tcp from any port != 0 to any port 0 >< 65535 -pass in inet proto udp from 127.0.0.1/32 port > 32000 to 127.0.0.1/32 port < 29000 -block in proto udp from any port != 123 to any port < 7 -block in proto tcp from any port = 25 to any port > 25 -pass in proto tcp/udp from any port 1 >< 3 to any port 1 <> 3 -pass in proto tcp/udp from any port 2:2 to any port 10:20 -pass in log first quick proto tcp from any port > 1023 to any port = 1723 flags S/FSRPAU keep state # count 0 diff --git a/contrib/ipfilter/test/expected/i5 b/contrib/ipfilter/test/expected/i5 deleted file mode 100644 index 0dbc859..0000000 --- a/contrib/ipfilter/test/expected/i5 +++ /dev/null @@ -1,9 +0,0 @@ -log in all -count in tos 0x80 from any to any -pass in on ed0(!) inet tos 0x40 from 127.0.0.1/32 to 127.0.0.1/32 -block in log on lo0(!) ttl 0 from any to any -pass in quick ttl 1 from any to any -skip 3 out inet from 127.0.0.1/32 to any -auth out on foo0(!) proto tcp from any to any port = 80 -preauth out on foo0(!) proto tcp from any to any port = 22 -nomatch out on foo0(!) proto tcp from any port < 1024 to any diff --git a/contrib/ipfilter/test/expected/i6 b/contrib/ipfilter/test/expected/i6 deleted file mode 100644 index 29c33a2..0000000 --- a/contrib/ipfilter/test/expected/i6 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on lo0(!) fastroute from any to any -pass in on lo0(!) to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32 -pass in on le0(!) to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32 -pass in on lo0(!) dup-to qe0(!) inet from 127.0.0.1/32 to 127.0.0.1/32 -pass in on le0(!) dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32 -pass in on le0(!) to hme0:10.1.1.1 dup-to qe0:127.0.0.1 inet from 127.0.0.1/32 to 127.0.0.1/32 -block in quick on qe0(!) to qe1(!) from any to any -block in quick to qe1(!) from any to any -pass out quick dup-to hme0(!) from any to any -pass out quick on hme0(!) reply-to hme1(!) from any to any -pass in on le0(!) dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 inet all -pass in quick fastroute all diff --git a/contrib/ipfilter/test/expected/i7 b/contrib/ipfilter/test/expected/i7 deleted file mode 100644 index 552f7f8..0000000 --- a/contrib/ipfilter/test/expected/i7 +++ /dev/null @@ -1,14 +0,0 @@ -pass in on ed0(!) inet proto tcp from 127.0.0.1/32 to 127.0.0.1/32 port = 23 flags S/SA -block in on lo0(!) proto tcp from any to any flags A/FSRPAU -pass in on lo0(!) proto tcp from any to any flags /SPA -block in on lo0(!) proto tcp from any to any flags C/A -pass in on lo0(!) proto tcp from any to any flags S/SA -block in on lo0(!) proto tcp from any to any flags S/SA -pass in on lo0(!) proto tcp from any to any flags S/FSRPAU -block in on lo0(!) proto tcp from any to any flags /A -pass in on lo0(!) proto tcp from any to any flags S/SA -pass in on lo0(!) proto tcp from any to any flags S/SA -block in on lo0(!) proto tcp from any to any flags S/SA -pass in on lo0(!) proto tcp from any to any flags S/FSRPAU -block in on lo0(!) proto tcp from any to any flags /A -pass in on lo0(!) proto tcp from any to any flags S/SA diff --git a/contrib/ipfilter/test/expected/i8 b/contrib/ipfilter/test/expected/i8 deleted file mode 100644 index a85f1de..0000000 --- a/contrib/ipfilter/test/expected/i8 +++ /dev/null @@ -1,66 +0,0 @@ -pass in inet proto icmp from 127.0.0.1/32 to 127.0.0.1/32 icmp-type timest -block in inet proto icmp from any to any icmp-type unreach code 1 -pass in inet proto icmp from any to any icmp-type unreach code 15 -pass in inet proto icmp from any to any icmp-type unreach code 13 -pass in inet proto icmp from any to any icmp-type unreach code 8 -pass in inet proto icmp from any to any icmp-type unreach code 4 -pass in inet proto icmp from any to any icmp-type unreach code 9 -pass in inet proto icmp from any to any icmp-type unreach code 11 -pass in inet proto icmp from any to any icmp-type unreach code 14 -pass in inet proto icmp from any to any icmp-type unreach code 10 -pass in inet proto icmp from any to any icmp-type unreach code 12 -pass in inet proto icmp from any to any icmp-type unreach code 7 -pass in inet proto icmp from any to any icmp-type unreach code 1 -pass in inet proto icmp from any to any icmp-type unreach code 6 -pass in inet proto icmp from any to any icmp-type unreach code 0 -pass in inet proto icmp from any to any icmp-type unreach code 3 -pass in inet proto icmp from any to any icmp-type unreach code 2 -pass in inet proto icmp from any to any icmp-type unreach code 5 -pass in inet proto icmp from any to any icmp-type echo -pass in inet proto icmp from any to any icmp-type echorep -pass in inet proto icmp from any to any icmp-type inforeq -pass in inet proto icmp from any to any icmp-type inforep -pass in inet proto icmp from any to any icmp-type maskrep -pass in inet proto icmp from any to any icmp-type maskreq -pass in inet proto icmp from any to any icmp-type paramprob -pass in inet proto icmp from any to any icmp-type redir -pass in inet proto icmp from any to any icmp-type unreach -pass in inet proto icmp from any to any icmp-type routerad -pass in inet proto icmp from any to any icmp-type routersol -pass in inet proto icmp from any to any icmp-type squench -pass in inet proto icmp from any to any icmp-type timest -pass in inet proto icmp from any to any icmp-type timestrep -pass in inet proto icmp from any to any icmp-type timex -pass in inet proto icmp from any to any icmp-type 254 -pass in inet proto icmp from any to any icmp-type 253 code 254 -pass in inet proto icmp from any to any icmp-type unreach code 15 -pass in inet proto icmp from any to any icmp-type unreach code 13 -pass in inet proto icmp from any to any icmp-type unreach code 8 -pass in inet proto icmp from any to any icmp-type unreach code 4 -pass in inet proto icmp from any to any icmp-type unreach code 9 -pass in inet proto icmp from any to any icmp-type unreach code 11 -pass in inet proto icmp from any to any icmp-type unreach code 14 -pass in inet proto icmp from any to any icmp-type unreach code 10 -pass in inet proto icmp from any to any icmp-type unreach code 12 -pass in inet proto icmp from any to any icmp-type unreach code 7 -pass in inet proto icmp from any to any icmp-type unreach code 1 -pass in inet proto icmp from any to any icmp-type unreach code 6 -pass in inet proto icmp from any to any icmp-type unreach code 0 -pass in inet proto icmp from any to any icmp-type unreach code 3 -pass in inet proto icmp from any to any icmp-type unreach code 2 -pass in inet proto icmp from any to any icmp-type unreach code 5 -pass in inet proto icmp from any to any icmp-type echo -pass in inet proto icmp from any to any icmp-type echorep -pass in inet proto icmp from any to any icmp-type inforeq -pass in inet proto icmp from any to any icmp-type inforep -pass in inet proto icmp from any to any icmp-type maskrep -pass in inet proto icmp from any to any icmp-type maskreq -pass in inet proto icmp from any to any icmp-type paramprob -pass in inet proto icmp from any to any icmp-type redir -pass in inet proto icmp from any to any icmp-type unreach -pass in inet proto icmp from any to any icmp-type routerad -pass in inet proto icmp from any to any icmp-type routersol -pass in inet proto icmp from any to any icmp-type squench -pass in inet proto icmp from any to any icmp-type timest -pass in inet proto icmp from any to any icmp-type timestrep -pass in inet proto icmp from any to any icmp-type timex diff --git a/contrib/ipfilter/test/expected/i9 b/contrib/ipfilter/test/expected/i9 deleted file mode 100644 index deecd17..0000000 --- a/contrib/ipfilter/test/expected/i9 +++ /dev/null @@ -1,17 +0,0 @@ -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with short,frag -block in from any to any with ipopts -pass in inet from any to any with opt nop,rr,zsu -pass in inet from any to any with opt nop,rr,zsu not opt lsrr,ssrr -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with not frag -pass in inet from 127.0.0.1/32 to 127.0.0.1/32 with frag,frag-body -pass in proto tcp from any to any flags S/FSRPAU with not oow keep state # count 0 -block in proto tcp from any to any with oow -pass in proto tcp from any to any flags S/FSRPAU with not bad,bad-src,bad-nat -block in proto tcp from any to any flags S/FSRPAU with bad,not bad-src,not bad-nat -pass in quick from any to any with not short -block in quick from any to any with not nat -pass in quick from any to any with not frag-body -block in quick from any to any with not lowttl -pass in from any to any with not ipopts,mbcast,not bcast,mcast,not state -block in from any to any with not mbcast,bcast,not mcast,state -pass in inet from any to any with opt mtup,mtur,encode,ts,tr,sec,e-sec,cipso,satid,ssrr,addext,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump diff --git a/contrib/ipfilter/test/expected/in1 b/contrib/ipfilter/test/expected/in1 deleted file mode 100644 index 2f1cf31..0000000 --- a/contrib/ipfilter/test/expected/in1 +++ /dev/null @@ -1,31 +0,0 @@ -map le0 0/0 -> 0/32 -map le0 0.0.0.1/32 -> 0.0.0.1/32 -map le0 128.0.0.0/1 -> 0/0 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 0.0.0.5/0.0.0.255 -> 1.2.3.0/24 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 -map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto -map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp auto -map ppp0 192.168.0.0/16 -> 0/32 proxy port 21 ftp/tcp -map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp -map le0 0/0 -> 0/32 frag -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag -map ppp0 192.168.0.0/16 -> 0/32 proxy port 21 ftp/tcp frag -map le0 0/0 -> 0/32 age 10/10 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30/30 -map le0 0/0 -> 0/32 frag age 10/10 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30/30 -map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp -map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere -map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000 -map ppp0,adsl0 0/0 -> 0/32 -map ppp0 from 192.168.0.0/16 to 0/0 port = 123 -> 0/32 age 30/1 udp diff --git a/contrib/ipfilter/test/expected/in100 b/contrib/ipfilter/test/expected/in100 deleted file mode 100644 index dcf3097..0000000 --- a/contrib/ipfilter/test/expected/in100 +++ /dev/null @@ -1,3 +0,0 @@ -rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32; -rewrite out on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.4/32; -rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.0/24; diff --git a/contrib/ipfilter/test/expected/in101 b/contrib/ipfilter/test/expected/in101 deleted file mode 100644 index 04e234c..0000000 --- a/contrib/ipfilter/test/expected/in101 +++ /dev/null @@ -1,4 +0,0 @@ -rewrite in on bge0 proto icmp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32; -rewrite in on bge0 proto udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.3/32 dst 4.4.4.4/32; -rewrite out on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.4/32; -rewrite in on bge0 proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24,20202 dst 4.4.4.0/24,10101; diff --git a/contrib/ipfilter/test/expected/in102 b/contrib/ipfilter/test/expected/in102 deleted file mode 100644 index 0a1b612..0000000 --- a/contrib/ipfilter/test/expected/in102 +++ /dev/null @@ -1,5 +0,0 @@ -rewrite in on bge0 proto tcp from 0/0 to 0/0 -> src 0/0 dst dstlist/a; -rewrite in on bge0 proto tcp from 1.1.1.1/32 to 0/0 -> src 0/0 dst dstlist/bee; -rewrite in on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2/32 -> src 0/0 dst dstlist/cat; -rewrite in on bge0 proto tcp from pool/a to 2.2.2.2/32 -> src 0/0 dst dstlist/bat; -rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant; diff --git a/contrib/ipfilter/test/expected/in2 b/contrib/ipfilter/test/expected/in2 deleted file mode 100644 index dc8f4ac..0000000 --- a/contrib/ipfilter/test/expected/in2 +++ /dev/null @@ -1,71 +0,0 @@ -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip -rdr le0 9.8.0.0/16 -> 1.1.1.1/32 ip -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 0/0 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 udp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp/udp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp/udp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20/20 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp round-robin frag age 30/30 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40/40 sticky mssclamp 1000 tag nattagcacheline -rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1/32 port 21 tcp proxy ftp -rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1/32 port 21 tcp proxy ftp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port 5555 tcp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port = 5555 tcp -rdr le0 0/0 -> 254.220.186.152/32 ip -rdr le0 0/0 -> 254.220.186.152,254.220.186.152 ip -rdr adsl0,ppp0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1/32 port 5555-7777 tcp diff --git a/contrib/ipfilter/test/expected/in3 b/contrib/ipfilter/test/expected/in3 deleted file mode 100644 index dac97c7..0000000 --- a/contrib/ipfilter/test/expected/in3 +++ /dev/null @@ -1,5 +0,0 @@ -bimap le0 0/0 -> 0/32 -bimap le0 0.0.0.1/32 -> 0.0.0.1/32 -bimap le0 128.0.0.0/1 -> 0/0 -bimap le0 10.0.0.0/8 -> 1.2.3.0/24 -bimap le0 10.0.5.0/24 -> 1.2.3.0/24 diff --git a/contrib/ipfilter/test/expected/in4 b/contrib/ipfilter/test/expected/in4 deleted file mode 100644 index ac8dce1..0000000 --- a/contrib/ipfilter/test/expected/in4 +++ /dev/null @@ -1,5 +0,0 @@ -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 256 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports auto -map-block le0 10.0.0.0/16 -> 203.1.1.0/24 ports auto diff --git a/contrib/ipfilter/test/expected/in5 b/contrib/ipfilter/test/expected/in5 deleted file mode 100644 index b7c6ef5..0000000 --- a/contrib/ipfilter/test/expected/in5 +++ /dev/null @@ -1,24 +0,0 @@ -map le0 from 9.8.7.6/32 port > 1024 to 0/0 -> 1.1.1.1/32 portmap tcp 10000:20000 -map le0 from 9.8.7.6/32 port > 1024 ! to 1.2.3.4/32 -> 1.1.1.1/32 portmap tcp 10000:20000 -rdr le0 from 0/0 to 9.8.7.6/32 port = 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 ! from 1.2.3.4/32 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 udp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp/udp -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp frag -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin frag -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/10 -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 ip frag age 10/20 -rdr le0 from 0/0 to 9.8.7.6/32 -> 1.1.1.1/32 icmp frag age 10/10 -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20/20 -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1/32 port 888 tcp round-robin frag age 30/30 -rdr le0 from 0/0 to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40/40 diff --git a/contrib/ipfilter/test/expected/in6 b/contrib/ipfilter/test/expected/in6 deleted file mode 100644 index fefc052..0000000 --- a/contrib/ipfilter/test/expected/in6 +++ /dev/null @@ -1,8 +0,0 @@ -map foo0 from 0/0 port = 1 to 0/0 port != 0 -> 0/32 udp -map foo0 from 0/0 port = 1 to 0/0 port != 0 -> 0/32 udp -map foo0 from 0/0 port < 1 to 0/0 port > 0 -> 0/32 tcp -map foo0 from 0/0 port < 1 to 0/0 port > 0 -> 0/32 tcp -map foo0 from 0/0 port <= 1 to 0/0 port >= 0 -> 0/32 tcp/udp -map foo0 from 0/0 port <= 1 to 0/0 port >= 0 -> 0/32 tcp/udp -map foo0 from 0/0 port 1 >< 20 to 0/0 port 20 <> 40 -> 0/32 tcp/udp -map foo0 from 0/0 port 10:20 to 0/0 port 30:40 -> 0/32 tcp/udp diff --git a/contrib/ipfilter/test/expected/in7 b/contrib/ipfilter/test/expected/in7 deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/expected/in7 +++ /dev/null diff --git a/contrib/ipfilter/test/expected/ip1 b/contrib/ipfilter/test/expected/ip1 deleted file mode 100644 index cee7831..0000000 --- a/contrib/ipfilter/test/expected/ip1 +++ /dev/null @@ -1,68 +0,0 @@ -table role=ipf type=tree number=1 - {; }; -table role=ipf type=tree number=100 - { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -table role=nat type=tree number=110 - { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -table role=auth type=tree number=120 - { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -table role=count type=tree number=130 - { 1.2.3.4/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -table role=ipf type=hash number=2 size=1 - {; }; -table role=ipf type=hash number=200 size=5 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=210 size=5 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=220 size=5 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=230 size=5 - { 0/0; 4/32; 1.2.3.4/32; }; -table role=ipf type=hash number=240 size=5 seed=101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=250 size=5 seed=101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=260 size=5 seed=101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=270 size=5 seed=101 - { 0/0; 4/32; 1.2.3.4/32; }; -table role=ipf type=hash number=2000 size=1001 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=2000 size=1001 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=2000 size=1001 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=2000 size=1001 - { 0/0; 4/32; 1.2.3.4/32; }; -table role=ipf type=hash number=100 size=1001 seed=101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role=nat type=hash number=100 size=1001 seed=101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role=auth type=hash number=100 size=1001 seed=101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role=count type=hash number=100 size=1001 seed=101 - { 0/0; 4/32; 1.2.3.4/32; }; -group-map in role=ipf number=300 size=5 - { 0/0, group=303; 5/32, group=303; 1.2.3.4/32, group=303; }; -group-map in role=nat number=300 size=5 - { 0/0, group=303; 6/32, group=303; 1.2.3.4/32, group=303; }; -group-map in role=auth number=300 size=5 - { 0/0, group=303; 7/32, group=303; 1.2.3.4/32, group=303; }; -group-map in role=count number=300 size=5 - { 0/0, group=303; 8/32, group=303; 1.2.3.4/32, group=303; }; -group-map out role=ipf number=400 size=5 - { 0/0, group=303; 5/32, group=303; 1.2.3.4/32, group=606; }; -group-map out role=nat number=400 size=5 - { 0/0, group=303; 6/32, group=303; 1.2.3.4/32, group=606; }; -group-map out role=auth number=400 size=5 - { 0/0, group=303; 7/32, group=303; 1.2.3.4/32, group=606; }; -group-map out role=count number=400 size=5 - { 0/0, group=303; 8/32, group=303; 1.2.3.4/32, group=606; }; -group-map in role=ipf number=500 size=5 - { 0/0, group=10; 5/32, group=800; 1.2.3.4/32, group=606; }; -group-map in role=nat number=500 size=5 - { 0/0, group=10; 6/32, group=800; 1.2.3.4/32, group=606; }; -group-map in role=auth number=500 size=5 - { 0/0, group=10; 7/32, group=800; 1.2.3.4/32, group=606; }; -group-map in role=count number=500 size=5 - { 0/0, group=10; 8/32, group=800; 1.2.3.4/32, group=606; }; diff --git a/contrib/ipfilter/test/expected/ip2 b/contrib/ipfilter/test/expected/ip2 deleted file mode 100644 index 3de3c47..0000000 --- a/contrib/ipfilter/test/expected/ip2 +++ /dev/null @@ -1,2 +0,0 @@ -table role=ipf type=tree name=letters - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; }; diff --git a/contrib/ipfilter/test/expected/ip3 b/contrib/ipfilter/test/expected/ip3 deleted file mode 100644 index 48dd074..0000000 --- a/contrib/ipfilter/test/expected/ip3 +++ /dev/null @@ -1,14 +0,0 @@ -pool ipf/dstlist (name fred; policy round-robin;) - { 3.3.3.3; }; -pool ipf/dstlist (name jack; policy weighting connection;) - { 4.4.4.4; bge0:5.5.5.5; }; -pool ipf/dstlist (name jill; policy random;) - { 1.1.1.1; bge0:2.2.2.2; }; -table role=nat type=hash name=noproxy size=3 - { 1.1.1.1/32; 2.2.2.2/32; }; -table role=nat type=tree name=raw - { 1.1.1.1/32; 2.2.2.2/32; }; -pool all/dstlist (name jill; policy random;) - { 1.1.1.1; bge0:2.2.2.2; }; -table role=all type=hash name=noproxy size=3 - { 1.1.1.1/32; 2.2.2.2/32; }; diff --git a/contrib/ipfilter/test/expected/ipv6.1 b/contrib/ipfilter/test/expected/ipv6.1 deleted file mode 100644 index 9fd5437..0000000 --- a/contrib/ipfilter/test/expected/ipv6.1 +++ /dev/null @@ -1,4 +0,0 @@ -pass -pass -nomatch --------- diff --git a/contrib/ipfilter/test/expected/ipv6.2 b/contrib/ipfilter/test/expected/ipv6.2 deleted file mode 100644 index ba1581b..0000000 --- a/contrib/ipfilter/test/expected/ipv6.2 +++ /dev/null @@ -1,15 +0,0 @@ -nomatch -block -nomatch -block --------- -block -nomatch -block -nomatch --------- -pass -pass -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/ipv6.3 b/contrib/ipfilter/test/expected/ipv6.3 deleted file mode 100644 index 58cddec..0000000 --- a/contrib/ipfilter/test/expected/ipv6.3 +++ /dev/null @@ -1,6 +0,0 @@ -pass -nomatch -nomatch -nomatch -pass --------- diff --git a/contrib/ipfilter/test/expected/ipv6.4 b/contrib/ipfilter/test/expected/ipv6.4 deleted file mode 100644 index e3ae842..0000000 --- a/contrib/ipfilter/test/expected/ipv6.4 +++ /dev/null @@ -1,51 +0,0 @@ -pass -pass -nomatch -nomatch -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -pass -pass -pass -pass -pass -pass -pass -pass -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch --------- -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -nomatch -pass -pass -block -nomatch -nomatch -nomatch -pass -pass --------- diff --git a/contrib/ipfilter/test/expected/ipv6.5 b/contrib/ipfilter/test/expected/ipv6.5 deleted file mode 100644 index 3133a7f..0000000 --- a/contrib/ipfilter/test/expected/ipv6.5 +++ /dev/null @@ -1,6 +0,0 @@ -pass -nomatch --------- -block -nomatch --------- diff --git a/contrib/ipfilter/test/expected/ipv6.6 b/contrib/ipfilter/test/expected/ipv6.6 deleted file mode 100644 index efd0421..0000000 --- a/contrib/ipfilter/test/expected/ipv6.6 +++ /dev/null @@ -1,10 +0,0 @@ -pass -pass -pass -pass --------- -nomatch -nomatch -block -nomatch --------- diff --git a/contrib/ipfilter/test/expected/l1 b/contrib/ipfilter/test/expected/l1 deleted file mode 100644 index e4a081d..0000000 --- a/contrib/ipfilter/test/expected/l1 +++ /dev/null @@ -1,56 +0,0 @@ -log in all -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- -pass in on anon0 all head 100 --------- -pass in log quick from 3.3.3.3 to any group 100 --------- -pass in log body quick from 2.2.2.2 to any -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN --------- -pass in log quick proto tcp from 1.1.1.1 to any flags S keep state -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN --------- -pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @100:1 p 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- diff --git a/contrib/ipfilter/test/expected/l1.b b/contrib/ipfilter/test/expected/l1.b deleted file mode 100644 index e06e486..0000000 --- a/contrib/ipfilter/test/expected/l1.b +++ /dev/null @@ -1,56 +0,0 @@ -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- --------- --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d ............ -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d 0e 0f 40 61 ..............@a -42 63 44 65 46 67 48 69 4a 6b 4c 6d BcDeFgHiJkLm -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:1 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @0:1 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN --------- -missed 1 ipf log entries: 0 1 -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -S K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A K-S IN -01/01/1970 00:00:00.000000 anon0 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -AS K-S IN -01/01/1970 00:00:00.000000 e1 @0:4 p 2.2.2.2,25 -> 1.1.1.1,1025 PR tcp len 20 40 -A K-S OUT -01/01/1970 00:00:00.000000 anon0 @0:4 p 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -AF K-S IN -01/01/1970 00:00:00.000000 2x anon0 @-1:-1 L 1.1.1.1,1025 -> 2.2.2.2,25 PR tcp len 20 40 -A IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 40 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d ............ -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2,1 -> 4.4.4.4,53 PR udp len 20 56 IN -01 02 03 04 05 06 07 08 09 0a 0b 0d 0e 0f 40 61 ..............@a -42 63 44 65 46 67 48 69 4a 6b 4c 6d BcDeFgHiJkLm -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @0:3 p 2.2.2.2 -> 4.4.4.4 PR ip len 20 (20) IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @100:1 p 3.3.3.3,1023 -> 1.1.1.1,2049 PR udp len 20 28 IN -01/01/1970 00:00:00.000000 anon0 @-1:-1 L 1.1.1.1,2049 -> 3.3.3.3,1023 PR udp len 20 28 IN --------- diff --git a/contrib/ipfilter/test/expected/n1 b/contrib/ipfilter/test/expected/n1 deleted file mode 100644 index 20eaedc..0000000 --- a/contrib/ipfilter/test/expected/n1 +++ /dev/null @@ -1,197 +0,0 @@ -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.2.2.2 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -List of active MAP/Redirect filters: -map zx0 10.1.1.1/32 -> 10.2.2.2/32 - -List of active sessions: -MAP 10.1.1.1 <- -> 10.2.2.2 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.1.1.2] - -Hostmap table: -10.1.1.1,10.4.3.2 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.2 -15 -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 48(20) 1 10.3.4.5 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -> zx0 ip #0 20(20) 34 10.3.4.5 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.3.4.5 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.1.1.2 -15 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.3.4.5 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 - -List of active sessions: -MAP 10.1.1.3 <- -> 10.3.4.5 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.3.4.5 [10.4.3.2] -MAP 10.1.1.2 1026 <- -> 10.3.4.5 1026 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 1025 [10.1.1.1 1025] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.1.1.1] -MAP 10.1.1.0 <- -> 10.3.4.5 [10.1.1.2] - -Hostmap table: -10.1.1.3,10.4.3.4 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.4 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 3) -10.1.1.0,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.2 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.3 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.3,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.3,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.3.4.3 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.4 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.3 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.3.4.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.4 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.3.4.4 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.0/24 - -List of active sessions: -MAP 10.1.1.3 <- -> 10.3.4.4 [10.4.3.4] -MAP 10.1.1.3 <- -> 10.3.4.4 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.3 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.3 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.3.4.3 [10.4.3.2] -MAP 10.1.1.2 1026 <- -> 10.3.4.3 1026 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.3 1025 [10.1.1.1 1025] -MAP 10.1.1.2 <- -> 10.3.4.3 [10.1.1.1] -MAP 10.1.1.1 <- -> 10.3.4.2 [10.1.1.2] -MAP 10.1.1.0 <- -> 10.3.4.1 [10.1.1.2] - -Hostmap table: -10.1.1.3,10.4.3.4 -> 10.3.4.4,0.0.0.0 (use = 2) -10.1.1.2,10.4.3.4 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.2 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.3,0.0.0.0 (use = 3) -10.1.1.1,10.1.1.2 -> 10.3.4.2,0.0.0.0 (use = 1) -10.1.1.0,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n10 b/contrib/ipfilter/test/expected/n10 deleted file mode 100644 index 0c03ff0..0000000 --- a/contrib/ipfilter/test/expected/n10 +++ /dev/null @@ -1,72 +0,0 @@ -4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 655d 0000 0204 0064 - -List of active MAP/Redirect filters: -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100 - -List of active sessions: -MAP 192.168.1.3 32818 <- -> 203.203.203.203 32818 [150.203.224.2 21] - -Hostmap table: -192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 61d9 0000 0204 03e8 - -List of active MAP/Redirect filters: -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000 - -List of active sessions: -MAP 192.168.1.3 32818 <- -> 203.203.203.203 32818 [150.203.224.2 21] - -Hostmap table: -192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -4500 002c 10c9 4000 ff06 5c9d cbcb cbcb 96cb e002 8032 0015 bd6b c9c8 0000 0000 6002 2238 600d 0000 0204 05b4 - -List of active MAP/Redirect filters: -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000 - -List of active sessions: -MAP 192.168.1.3 32818 <- -> 203.203.203.203 32818 [150.203.224.2 21] - -Hostmap table: -192.168.1.3,150.203.224.2 -> 203.203.203.203,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n100 b/contrib/ipfilter/test/expected/n100 deleted file mode 100644 index 80f00a1..0000000 --- a/contrib/ipfilter/test/expected/n100 +++ /dev/null @@ -1,33 +0,0 @@ -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.1 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.2 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.3 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.4 -> zx0 ip #0 20(20) 255 4.4.4.4 > 6.6.0.1 -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,101 > 6.6.0.5,203 -List of active MAP/Redirect filters: -rewrite out on zx0 from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 101 6.6.0.5 203 -RWR-MAP 1.1.1.1 2.2.2.4 <- -> 4.4.4.4 6.6.0.4 -RWR-MAP 1.2.1.2 2.2.2.3 <- -> 4.4.4.4 6.6.0.3 -RWR-MAP 1.1.1.2 2.2.2.3 <- -> 4.4.4.4 6.6.0.2 -RWR-MAP 1.1.1.1 2.2.2.3 <- -> 4.4.4.4 6.6.0.1 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n101 b/contrib/ipfilter/test/expected/n101 deleted file mode 100644 index ad0ad97..0000000 --- a/contrib/ipfilter/test/expected/n101 +++ /dev/null @@ -1,29 +0,0 @@ -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.2.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.4 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,101 > 6.6.0.1,203 -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 101 6.6.0.1 203 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n102 b/contrib/ipfilter/test/expected/n102 deleted file mode 100644 index a2f130e..0000000 --- a/contrib/ipfilter/test/expected/n102 +++ /dev/null @@ -1,29 +0,0 @@ -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.3.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.2.1.2 > 2.2.2.3 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.4 -> zx0 ip #0 20(20) 255 1.1.1.1 > 2.2.2.3 -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,203 -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-2000 dst 6.6.0.0/16; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 1000 6.6.0.1 203 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n103 b/contrib/ipfilter/test/expected/n103 deleted file mode 100644 index 31ed740..0000000 --- a/contrib/ipfilter/test/expected/n103 +++ /dev/null @@ -1,33 +0,0 @@ -> zx0 ip #0 40(20) 6 1.1.1.1,101 > 2.3.2.3,203 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.1,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.1,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.2,4000 -> zx0 ip #0 40(20) 6 4.4.4.4,1001 > 6.6.0.2,4001 -< zx0 ip #0 40(20) 6 2.2.2.3,4000 > 4.4.4.4,1000 -> zx0 ip #0 40(20) 6 4.4.4.4,1000 > 6.6.0.2,4001 -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,4000-4001; - -List of active sessions: -RWR-MAP 7.7.7.7 101 2.2.2.3 203 <- -> 4.4.4.4 1000 6.6.0.2 4001 -RWR-MAP 5.5.5.5 101 2.2.2.3 203 <- -> 4.4.4.4 1001 6.6.0.2 4001 -RWR-MAP 10.10.10.10 101 2.2.2.3 203 <- -> 4.4.4.4 1001 6.6.0.2 4000 -RWR-MAP 1.1.1.2 101 2.2.2.3 203 <- -> 4.4.4.4 1001 6.6.0.1 4000 -RWR-MAP 1.1.1.1 101 2.2.2.3 203 <- -> 4.4.4.4 1000 6.6.0.1 4000 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n104 b/contrib/ipfilter/test/expected/n104 deleted file mode 100644 index 3b8a9de..0000000 --- a/contrib/ipfilter/test/expected/n104 +++ /dev/null @@ -1,50 +0,0 @@ -4500 0028 0001 0000 ff06 b1c3 0404 0001 0606 0001 03e8 0fa0 0000 0001 1000 0001 5010 2000 623f 0000 - -4500 0028 0002 0000 ff06 b5c8 0202 0202 0101 0101 00cb 0065 0000 0001 1000 0001 5010 2000 789d 0000 - -4500 0028 0003 0000 ff06 b1c0 0404 0002 0606 0001 03e8 0fa0 0000 0001 1000 0001 5010 2000 623e 0000 - -4500 0028 0004 0000 ff06 b5c6 0202 0202 0101 0101 00cb 0066 0000 0001 1000 0001 5010 2000 789c 0000 - -4500 0028 0005 0000 ff06 b1be 0404 0002 0606 0001 03e9 0fa0 0000 0001 1000 0001 5010 2000 623d 0000 - -4500 0028 0006 0000 ff06 b5c4 0202 0202 0101 0101 00cb 0067 0000 0001 1000 0001 5010 2000 789b 0000 - -4500 0028 0007 0000 ff06 b1bb 0404 0002 0606 0002 03e9 0fa0 0000 0001 1000 0001 5010 2000 623c 0000 - -4500 0028 0008 0000 ff06 b5c2 0202 0202 0101 0101 00cb 0068 0000 0001 1000 0001 5010 2000 789a 0000 - -4500 0028 0009 0000 ff06 b1b9 0404 0002 0606 0002 03e9 0fa1 0000 0001 1000 0001 5010 2000 623b 0000 - -4500 0028 000a 0000 ff06 b5c0 0202 0202 0101 0101 00cb 0069 0000 0001 1000 0001 5010 2000 7899 0000 - -4500 0028 000b 0000 ff06 b1b6 0404 0003 0606 0002 03e9 0fa1 0000 0001 1000 0001 5010 2000 623a 0000 - -4500 0028 000c 0000 ff06 b5be 0202 0202 0101 0101 00cb 006a 0000 0001 1000 0001 5010 2000 7898 0000 - -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.0.0/24,1000-1001 dst 6.6.0.0/16,4000-4001; - -List of active sessions: -RWR-MAP 1.1.1.1 106 2.2.2.2 203 <- -> 4.4.0.3 1001 6.6.0.2 4001 -RWR-MAP 1.1.1.1 105 2.2.2.2 203 <- -> 4.4.0.2 1001 6.6.0.2 4001 -RWR-MAP 1.1.1.1 104 2.2.2.2 203 <- -> 4.4.0.2 1001 6.6.0.2 4000 -RWR-MAP 1.1.1.1 103 2.2.2.2 203 <- -> 4.4.0.2 1001 6.6.0.1 4000 -RWR-MAP 1.1.1.1 102 2.2.2.2 203 <- -> 4.4.0.2 1000 6.6.0.1 4000 -RWR-MAP 1.1.1.1 101 2.2.2.2 203 <- -> 4.4.0.1 1000 6.6.0.1 4000 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n105 b/contrib/ipfilter/test/expected/n105 deleted file mode 100644 index d45a4af..0000000 --- a/contrib/ipfilter/test/expected/n105 +++ /dev/null @@ -1,25 +0,0 @@ -4500 0028 0001 0000 ff06 adc0 0404 0404 0606 0001 03e8 0c38 0000 0001 1000 0001 5010 2000 61a4 0000 - -4500 0028 0001 0000 ff06 b5c9 0202 0202 0101 0101 0050 0065 0000 0001 1000 0001 5010 2000 7918 0000 - -List of active MAP/Redirect filters: -rewrite in on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,port = 3128; - -List of active sessions: -RWR-RDR 1.1.1.1 101 2.2.2.2 80 <- -> 4.4.4.4 1000 6.6.0.1 3128 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n106 b/contrib/ipfilter/test/expected/n106 deleted file mode 100644 index d466e65..0000000 --- a/contrib/ipfilter/test/expected/n106 +++ /dev/null @@ -1,25 +0,0 @@ -4500 0028 0001 0000 ff06 adc0 0404 0404 0606 0001 03e8 0c38 0000 0001 1000 0001 5010 2000 61a4 0000 - -4500 0028 0001 0000 ff06 b5c9 0202 0202 0101 0101 0050 0065 0000 0001 1000 0001 5010 2000 7918 0000 - -List of active MAP/Redirect filters: -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,port = 3128; - -List of active sessions: -RWR-MAP 1.1.1.1 101 2.2.2.2 80 <- -> 4.4.4.4 1000 6.6.0.1 3128 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n11 b/contrib/ipfilter/test/expected/n11 deleted file mode 100644 index ea11b93..0000000 --- a/contrib/ipfilter/test/expected/n11 +++ /dev/null @@ -1,124 +0,0 @@ -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 1.6.7.8 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -List of active MAP/Redirect filters: -bimap zx0 10.1.1.1/32 -> 1.6.7.8/32 - -List of active sessions: -BIMAP 10.1.1.1 <- -> 1.6.7.8 [10.1.1.2] - -Hostmap table: -10.1.1.1,10.1.1.2 -> 1.6.7.8,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2 -15 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.1 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.1.1.0 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -List of active MAP/Redirect filters: -bimap zx0 10.1.1.0/24 -> 10.2.2.2/32 - -List of active sessions: -BIMAP 10.1.1.0 <- -> 10.2.2.2 [10.2.3.4] -BIMAP 10.1.1.2 <- -> 10.2.2.2 [10.1.1.1] -BIMAP 10.1.1.0 <- -> 10.2.2.2 [10.1.1.2] - -Hostmap table: -10.1.1.2,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.0,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.3.4.2 > 10.1.1.1 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.5 -List of active MAP/Redirect filters: -bimap zx0 10.1.1.0/24 -> 10.3.4.0/24 - -List of active sessions: -BIMAP 10.1.1.5 <- -> 10.3.4.5 [10.1.1.2] -BIMAP 10.1.1.5 <- -> 10.3.4.5 [10.1.1.1] -BIMAP 10.1.1.5 <- -> 10.3.4.5 [10.1.1.0] -BIMAP 10.1.1.2 <- -> 10.3.4.2 [10.1.1.1] -BIMAP 10.1.1.1 <- -> 10.3.4.1 [10.1.1.2] -BIMAP 10.1.1.0 <- -> 10.3.4.0 [10.1.1.2] - -Hostmap table: -10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.0,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n11_6 b/contrib/ipfilter/test/expected/n11_6 deleted file mode 100644 index f1c80de..0000000 --- a/contrib/ipfilter/test/expected/n11_6 +++ /dev/null @@ -1,124 +0,0 @@ -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 1:0:0:0:0:6:7:8 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -List of active MAP/Redirect filters: -bimap zx0 inet6 10:1:1::1/128 -> 1::6:7:8/128 - -List of active sessions: -BIMAP 10:1:1::1 <- -> 1::6:7:8 [10:1:1::2] - -Hostmap table: -10:1:1::1,10:1:1::2 -> 1::6:7:8,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 -16 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -List of active MAP/Redirect filters: -bimap zx0 inet6 10:1:1::/112 -> 10::2:2:2/128 - -List of active sessions: -BIMAP 10:1:1:: <- -> 10::2:2:2 [10::2:3:4] -BIMAP 10:1:1::2 <- -> 10::2:2:2 [10:1:1::1] -BIMAP 10:1:1:: <- -> 10::2:2:2 [10:1:1::2] - -Hostmap table: -10:1:1::2,10:1:1::1 -> 10::2:2:2,any (use = 1) -10:1:1::,10:1:1::2 -> 10::2:2:2,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:5 -List of active MAP/Redirect filters: -bimap zx0 inet6 10:1:1::/112 -> 10::3:4:0/112 - -List of active sessions: -BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::2] -BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::1] -BIMAP 10:1:1::5 <- -> 10::3:4:5 [10:1:1::] -BIMAP 10:1:1::2 <- -> 10::3:4:2 [10:1:1::1] -BIMAP 10:1:1::1 <- -> 10::3:4:1 [10:1:1::2] -BIMAP 10:1:1:: <- -> 10::3:4:0 [10:1:1::2] - -Hostmap table: -10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1) -10:1:1::,10:1:1::2 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n12 b/contrib/ipfilter/test/expected/n12 deleted file mode 100644 index 56b3a78..0000000 --- a/contrib/ipfilter/test/expected/n12 +++ /dev/null @@ -1,28 +0,0 @@ -4510 0040 2020 4000 4006 9478 c0a8 01bc c0a8 0303 2710 0017 4e33 298e 0000 0000 b002 4000 6ff8 0000 0204 05b4 0101 0402 0103 0300 0101 080a 0c72 549e 0000 0000 - -4500 003c 00b0 4000 fe06 7964 c0a8 0303 c0a8 7e53 0017 12c2 f674 e02c 4e33 298f a012 2798 7ace 0000 0101 080a 2c05 b797 0c72 549e 0103 0300 0204 05b4 - -4510 0034 493b 4000 4006 6b69 c0a8 01bc c0a8 0303 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797 - -List of active MAP/Redirect filters: -map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 192.168.126.83 4802 <- -> 192.168.1.188 10000 [192.168.3.3 23] - -Hostmap table: -192.168.126.83,192.168.3.3 -> 0.0.0.0,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n12_6 b/contrib/ipfilter/test/expected/n12_6 deleted file mode 100644 index 9ef040a..0000000 --- a/contrib/ipfilter/test/expected/n12_6 +++ /dev/null @@ -1,28 +0,0 @@ -6000 0000 002c 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298e 0000 0000 b002 4000 6ff8 0000 0204 05b4 0101 0402 0103 0300 0101 080a 0c72 549e 0000 0000 - -6000 0000 0028 06fe c0a8 0300 0000 0000 0000 0000 0000 0003 c0a8 7e00 0000 0000 0000 0000 0000 0053 0017 12c2 f674 e02c 4e33 298f a012 2798 7ace 0000 0101 080a 2c05 b797 0c72 549e 0103 0300 0204 05b4 - -6000 0000 0020 0640 c0a8 0100 0000 0000 0000 0000 0000 00bc c0a8 0300 0000 0000 0000 0000 0000 0003 2710 0017 4e33 298f f674 e02d 8010 4000 f673 0000 0101 080a 0c72 549e 2c05 b797 - -List of active MAP/Redirect filters: -map le0 inet6 c0a8:7e00::/112 -> ::/128 portmap tcp/udp 10000:20000 - -List of active sessions: -MAP c0a8:7e00::53 4802 <- -> c0a8:100::bc 10000 [c0a8:300::3 23] - -Hostmap table: -c0a8:7e00::53,c0a8:300::3 -> any,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n13 b/contrib/ipfilter/test/expected/n13 deleted file mode 100644 index e6d26b2..0000000 --- a/contrib/ipfilter/test/expected/n13 +++ /dev/null @@ -1,32 +0,0 @@ -> le0 ip #0 20(20) 0 203.1.1.23 > 150.1.1.1 -> le0 ip #0 20(20) 0 203.1.1.23 > 150.1.1.2 -> le0 ip #0 20(20) 0 203.1.1.24 > 150.1.1.2 -> le0 ip #0 20(20) 0 203.1.1.25 > 150.1.1.1 -List of active MAP/Redirect filters: -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 - -List of active sessions: -MAP 192.168.1.3 <- -> 203.1.1.25 [150.1.1.1] -MAP 192.168.1.2 <- -> 203.1.1.24 [150.1.1.2] -MAP 192.168.1.1 <- -> 203.1.1.23 [150.1.1.2] -MAP 192.168.1.1 <- -> 203.1.1.23 [150.1.1.1] - -Hostmap table: -192.168.1.3,150.1.1.1 -> 203.1.1.25,0.0.0.0 (use = 1) -192.168.1.2,150.1.1.2 -> 203.1.1.24,0.0.0.0 (use = 1) -192.168.1.1,150.1.1.2 -> 203.1.1.23,0.0.0.0 (use = 1) -192.168.1.1,150.1.1.1 -> 203.1.1.23,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n13_6 b/contrib/ipfilter/test/expected/n13_6 deleted file mode 100644 index d3b5fe7..0000000 --- a/contrib/ipfilter/test/expected/n13_6 +++ /dev/null @@ -1,32 +0,0 @@ -> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:23 > 150.1.1.1 -> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:23 > 150.1.1.2 -> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:24 > 150.1.1.2 -> le0 ip6/0 1 0 41 203:0:1:0:0:0:1:25 > 150.1.1.1 -List of active MAP/Redirect filters: -map le0 inet6 192:168:0::0/48 -> range 203:0:1::1:23-203:0:1::3:45 - -List of active sessions: -MAP 192.168.1.3 <- -> 203:0:1::1:25 [150.1.1.1] -MAP 192.168.1.2 <- -> 203:0:1::1:24 [150.1.1.2] -MAP 192.168.1.1 <- -> 203:0:1::1:23 [150.1.1.2] -MAP 192.168.1.1 <- -> 203:0:1::1:23 [150.1.1.1] - -Hostmap table: -192.168.1.3,150.1.1.1 -> 203:0:1:0:0:0:1:25,any (use = 1) -192.168.1.2,150.1.1.2 -> 203:0:1:0:0:0:1:24,any (use = 1) -192.168.1.1,150.1.1.2 -> 203:0:1:0:0:0:1:23,any (use = 1) -192.168.1.1,150.1.1.1 -> 203:0:1:0:0:0:1:23,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n14 b/contrib/ipfilter/test/expected/n14 deleted file mode 100644 index 7b1a19e..0000000 --- a/contrib/ipfilter/test/expected/n14 +++ /dev/null @@ -1,30 +0,0 @@ -< gre0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.254,80 -< gre0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.1.253,80 -< gre0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.1.254,80 -15 -List of active MAP/Redirect filters: -rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky - -List of active sessions: -RDR 10.1.1.254 80 <- -> 203.1.1.1 80 [10.2.2.7 2000] -RDR 10.1.1.253 80 <- -> 203.1.1.1 80 [10.2.2.6 2000] -RDR 10.1.1.254 80 <- -> 203.1.1.1 80 [10.2.2.5 2000] - -Hostmap table: -10.2.2.7,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) -10.2.2.6,203.1.1.1 -> 253.1.1.10,0.0.0.0 (use = 1) -10.2.2.5,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n14_6 b/contrib/ipfilter/test/expected/n14_6 deleted file mode 100644 index b999ee97..0000000 --- a/contrib/ipfilter/test/expected/n14_6 +++ /dev/null @@ -1,30 +0,0 @@ -< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2000 > 10:1:1:0:0:0:0:254,80 -< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:6,2000 > 10:1:1:0:0:0:0:253,80 -< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:7,2000 > 10:1:1:0:0:0:0:254,80 -< gre0 ip6/0 20 0 6 10:0:0:0:0:2:2:5,2001 > 203:0:1:0:0:0:1:1,80 -List of active MAP/Redirect filters: -rdr gre0 inet6 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky - -List of active sessions: -RDR 10:1:1::254 80 <- -> 203:0:1::1:1 80 [10::2:2:7 2000] -RDR 10:1:1::253 80 <- -> 203:0:1::1:1 80 [10::2:2:6 2000] -RDR 10:1:1::254 80 <- -> 203:0:1::1:1 80 [10::2:2:5 2000] - -Hostmap table: -10::2:2:7,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 1) -10::2:2:6,203:0:1:0:0:0:1:1 -> 253:0:1:0:0:0:1:10,any (use = 1) -10::2:2:5,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n15 b/contrib/ipfilter/test/expected/n15 deleted file mode 100644 index 3889f82..0000000 --- a/contrib/ipfilter/test/expected/n15 +++ /dev/null @@ -1,47 +0,0 @@ -< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80 -15 -List of active MAP/Redirect filters: -rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80 tcp - -List of active sessions: -RDR 3.3.3.3 80 <- -> 5.5.5.5 80 [9.9.9.9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,80 -< le0 ip #0 40(20) 6 9.9.9.9,10011 > 3.3.3.3,81 -List of active MAP/Redirect filters: -rdr le0 0/0 port 80 -> 3.3.3.3/32 port 80-88 tcp - -List of active sessions: -RDR 3.3.3.3 81 <- -> 2.2.2.2 80 [9.9.9.9 10011] -RDR 3.3.3.3 80 <- -> 5.5.5.5 80 [9.9.9.9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n15_6 b/contrib/ipfilter/test/expected/n15_6 deleted file mode 100644 index f01b72b..0000000 --- a/contrib/ipfilter/test/expected/n15_6 +++ /dev/null @@ -1,47 +0,0 @@ -< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80 -16 -List of active MAP/Redirect filters: -rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80 tcp - -List of active sessions: -RDR 3:0:3::3:3 80 <- -> 5:5::5:5 80 [9:9:9::9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,80 -< le0 ip6/0 20 0 6 9:9:9:0:0:0:0:9,10011 > 3:0:3:0:0:0:3:3,81 -List of active MAP/Redirect filters: -rdr le0 inet6 any port 80 -> 3:0:3::3:3/128 port 80-88 tcp - -List of active sessions: -RDR 3:0:3::3:3 81 <- -> 2::2:2:2 80 [9:9:9::9 10011] -RDR 3:0:3::3:3 80 <- -> 5:5::5:5 80 [9:9:9::9 10011] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n16 b/contrib/ipfilter/test/expected/n16 deleted file mode 100644 index 0eb3954..0000000 --- a/contrib/ipfilter/test/expected/n16 +++ /dev/null @@ -1,29 +0,0 @@ -4520 0068 17e4 0000 6b11 cbba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33 0303 4ca1 0000 0000 4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 1194 07dd 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -4500 0084 ee0f 0000 8001 4a21 45f8 4fc1 c05b ac33 0303 bf85 0000 0000 4520 0068 17e4 0000 6a11 3639 c05b ac33 45f8 4fc1 1194 94f8 0054 0000 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -List of active MAP/Redirect filters: -rdr vlan0 from 0/0 to 69.248.79.193/32 port = 38136 -> 172.31.83.24/32 port 2013 udp - -List of active sessions: -RDR 172.31.83.24 2013 <- -> 69.248.79.193 38136 [192.91.172.51 4500] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n17 b/contrib/ipfilter/test/expected/n17 deleted file mode 100644 index f336bb0..0000000 --- a/contrib/ipfilter/test/expected/n17 +++ /dev/null @@ -1,24 +0,0 @@ -4500 00a0 0000 0100 3f06 7555 0101 0101 0201 0101 0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 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 00a0 0000 0100 3f06 7553 0201 0101 0101 0103 0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -List of active MAP/Redirect filters: -bimap zx0 0/0 -> 1.1.1.3/32 - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n18 b/contrib/ipfilter/test/expected/n18 deleted file mode 100644 index c51c11c..0000000 --- a/contrib/ipfilter/test/expected/n18 +++ /dev/null @@ -1,111 +0,0 @@ -> z0 ip #0 40(20) 6 1.1.1.1,1 > 3.3.3.3,30 -> z0 ip #0 40(20) 6 1.1.1.1,2 > 3.3.3.3,31 -> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,32 -> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,33 -> z0 ip #0 40(20) 6 1.1.1.1,1 > 3.3.3.3,34 -> z0 ip #0 40(20) 6 1.1.1.1,2 > 3.3.3.3,35 -> z0 ip #0 40(20) 6 1.1.1.1,3 > 3.3.3.3,36 -> z0 ip #0 40(20) 6 1.1.1.1,4 > 3.3.3.3,37 -List of active MAP/Redirect filters: -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential - -List of active sessions: -MAP 2.2.2.2 29 <- -> 1.1.1.1 4 [3.3.3.3 37] -MAP 2.2.2.2 28 <- -> 1.1.1.1 3 [3.3.3.3 36] -MAP 2.2.2.2 27 <- -> 1.1.1.1 2 [3.3.3.3 35] -MAP 2.2.2.2 26 <- -> 1.1.1.1 1 [3.3.3.3 34] -MAP 2.2.2.2 25 <- -> 1.1.1.1 4 [3.3.3.3 33] -MAP 2.2.2.2 24 <- -> 1.1.1.1 3 [3.3.3.3 32] -MAP 2.2.2.2 23 <- -> 1.1.1.1 2 [3.3.3.3 31] -MAP 2.2.2.2 22 <- -> 1.1.1.1 1 [3.3.3.3 30] - -Hostmap table: -2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> z0 ip #0 40(20) 6 1.1.1.1,1000 > 3.3.3.3,30 -> z0 ip #0 40(20) 6 1.1.1.1,1001 > 3.3.3.3,31 -> z0 ip #0 40(20) 6 1.1.1.1,1002 > 3.3.3.3,32 -> z0 ip #0 40(20) 6 1.1.1.1,1003 > 3.3.3.3,33 -> z0 ip #0 40(20) 6 1.1.1.1,1004 > 3.3.3.3,34 -> z0 ip #0 40(20) 6 1.1.1.1,1005 > 3.3.3.3,35 -> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36 -> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37 -List of active MAP/Redirect filters: -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential - -List of active sessions: -MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37] -MAP 2.2.2.2 28 <- -> 1.1.1.1 1006 [3.3.3.3 36] -MAP 2.2.2.2 27 <- -> 1.1.1.1 1005 [3.3.3.3 35] -MAP 2.2.2.2 26 <- -> 1.1.1.1 1004 [3.3.3.3 34] -MAP 2.2.2.2 25 <- -> 1.1.1.1 1003 [3.3.3.3 33] -MAP 2.2.2.2 24 <- -> 1.1.1.1 1002 [3.3.3.3 32] -MAP 2.2.2.2 23 <- -> 1.1.1.1 1001 [3.3.3.3 31] -MAP 2.2.2.2 22 <- -> 1.1.1.1 1000 [3.3.3.3 30] - -Hostmap table: -2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> z0 ip #0 40(20) 6 1.1.1.1,1000 > 3.3.3.3,30 -> z0 ip #0 40(20) 6 1.1.1.1,1001 > 3.3.3.3,31 -> z0 ip #0 40(20) 6 1.1.1.1,1002 > 3.3.3.3,32 -> z0 ip #0 40(20) 6 1.1.1.1,1003 > 3.3.3.3,33 -> z0 ip #0 40(20) 6 1.1.1.1,1004 > 3.3.3.3,34 -> z0 ip #0 40(20) 6 1.1.1.1,1005 > 3.3.3.3,35 -> z0 ip #0 40(20) 6 1.1.1.1,1006 > 3.3.3.3,36 -> z0 ip #0 40(20) 6 1.1.1.1,1007 > 3.3.3.3,37 -List of active MAP/Redirect filters: -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential - -List of active sessions: -MAP 2.2.2.2 29 <- -> 1.1.1.1 1007 [3.3.3.3 37] -MAP 2.2.2.2 28 <- -> 1.1.1.1 1006 [3.3.3.3 36] -MAP 2.2.2.2 27 <- -> 1.1.1.1 1005 [3.3.3.3 35] -MAP 2.2.2.2 26 <- -> 1.1.1.1 1004 [3.3.3.3 34] -MAP 2.2.2.2 25 <- -> 1.1.1.1 1003 [3.3.3.3 33] -MAP 2.2.2.2 24 <- -> 1.1.1.1 1002 [3.3.3.3 32] -MAP 2.2.2.2 23 <- -> 1.1.1.1 1001 [3.3.3.3 31] -MAP 2.2.2.2 22 <- -> 1.1.1.1 1000 [3.3.3.3 30] - -Hostmap table: -2.2.2.2,3.3.3.3 -> 1.1.1.1,0.0.0.0 (use = 8) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n1_6 b/contrib/ipfilter/test/expected/n1_6 deleted file mode 100644 index 347bf4a..0000000 --- a/contrib/ipfilter/test/expected/n1_6 +++ /dev/null @@ -1,197 +0,0 @@ -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:2:2:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 - -List of active sessions: -MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:1::2] - -Hostmap table: -10:1:1::1,10:4:3::2 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 -16 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:1:1:0:0:0:0:2 -16 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:5 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 - -List of active sessions: -MAP 10:1:1::3 <- -> 10::3:4:5 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::3:4:5 [10:4:3::2] -MAP 10:1:1::2 1026 <- -> 10::3:4:5 1026 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 1025 [10:1:1::1 1025] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:1:1::1] -MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2] - -Hostmap table: -10:1:1::3,10:4:3::4 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:4:3::4 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:4:3::2 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 3) -10:1:1::,10:1:1::2 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:2 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:3 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:4 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:0/112 - -List of active sessions: -MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4] -MAP 10:1:1::3 <- -> 10::3:4:4 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:3 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:3 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::3:4:3 [10:4:3::2] -MAP 10:1:1::2 1026 <- -> 10::3:4:3 1026 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:3 1025 [10:1:1::1 1025] -MAP 10:1:1::2 <- -> 10::3:4:3 [10:1:1::1] -MAP 10:1:1::1 <- -> 10::3:4:2 [10:1:1::2] -MAP 10:1:1:: <- -> 10::3:4:1 [10:1:1::2] - -Hostmap table: -10:1:1::3,10:4:3::4 -> 10::3:4:4,any (use = 2) -10:1:1::2,10:4:3::4 -> 10::3:4:3,any (use = 1) -10:1:1::2,10:4:3::2 -> 10::3:4:3,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::3:4:3,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:3,any (use = 3) -10:1:1::1,10:1:1::2 -> 10::3:4:2,any (use = 1) -10:1:1::,10:1:1::2 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n2 b/contrib/ipfilter/test/expected/n2 deleted file mode 100644 index 836608a..0000000 --- a/contrib/ipfilter/test/expected/n2 +++ /dev/null @@ -1,191 +0,0 @@ -> zx0 ip #0 40(20) 6 10.2.2.2,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.2.2.2,10001 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.1 1025 <- -> 10.2.2.2 10001 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.2.2.2 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.5 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10003 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.3 2003 <- -> 10.3.4.1 10008 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.1 10007 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.1 10006 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.1 10005 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10004 [10.1.1.1 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.1 10003 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10002 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10001 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.3,10.1.4.1 -> 10.3.4.1,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 3) -10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -15 -> zx0 ip #0 28(20) 17 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.1.1.3,2000 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10.1.1.3 2003 <- -> 10.3.4.5 40000 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.5 40001 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.5 40000 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.5 40001 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40001 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40001 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n200 b/contrib/ipfilter/test/expected/n200 deleted file mode 100644 index 0f3c6a5..0000000 --- a/contrib/ipfilter/test/expected/n200 +++ /dev/null @@ -1,25 +0,0 @@ -4500 0044 0000 0000 ff11 bda6 7f00 0001 7f00 0001 2775 2775 0030 0000 4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - -4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - -List of active MAP/Redirect filters: -divert in on bar0 proto tcp from 0/0 to 0/0 -> src 127.0.0.1/32,10101 dst 127.0.0.1/32,10101 udp; - -List of active sessions: -DIV-RDR 127.0.0.1 10101 <- -> 88.88.88.88 80 [99.99.99.99 909] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n2_6 b/contrib/ipfilter/test/expected/n2_6 deleted file mode 100644 index 08abc8f..0000000 --- a/contrib/ipfilter/test/expected/n2_6 +++ /dev/null @@ -1,191 +0,0 @@ -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,10001 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::1 1025 <- -> 10::2:2:2 10001 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::2:2:2 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::2:2:2,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:5 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10003 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10004 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10005 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10006 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10007 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10008 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::3 2003 <- -> 10::3:4:1 10008 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:1 10007 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:1 10006 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:1 10005 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10004 [10:1:1::1 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:1 10003 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10002 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10001 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::3,10:1:4::1 -> 10::3:4:1,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:1,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:1,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 3) -10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -16 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:1:1:0:0:0:0:3,2000 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10:1:1::3 2003 <- -> 10::3:4:5 40000 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:5 40001 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:5 40000 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:5 40001 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40001 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40001 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 2) -10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n3 b/contrib/ipfilter/test/expected/n3 deleted file mode 100644 index 66ada76..0000000 --- a/contrib/ipfilter/test/expected/n3 +++ /dev/null @@ -1,66 +0,0 @@ -> zz0 ip #0 40(20) 6 192.168.2.1,1488 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.2.1,1276 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.2.1,1032 > 203.1.1.1,80 -> zz0 ip #0 28(20) 17 192.168.2.1,1032 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.2.1,65299 > 203.1.1.1,80 -List of active MAP/Redirect filters: -map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto - -List of active sessions: -MAP 10.1.255.255 65535 <- -> 192.168.2.1 65299 [203.1.1.1 80] -MAP 10.1.0.0 32768 <- -> 192.168.2.1 1032 [203.1.1.1 80] -MAP 10.1.0.0 32768 <- -> 192.168.2.1 1032 [203.1.1.1 80] -MAP 10.1.1.1 252 <- -> 192.168.2.1 1276 [203.1.1.1 80] -MAP 10.1.1.1 5000 <- -> 192.168.2.1 1488 [203.1.1.1 80] - -Hostmap table: -10.1.255.255,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 1) -10.1.0.0,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 2) -10.1.1.1,203.1.1.1 -> 192.168.2.1,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zz0 ip #0 40(20) 6 192.168.1.1,1488 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.1.1,1276 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.1.0,1032 > 203.1.1.1,80 -> zz0 ip #0 28(20) 17 192.168.1.0,1032 > 203.1.1.1,80 -> zz0 ip #0 40(20) 6 192.168.1.255,65299 > 203.1.1.1,80 -List of active MAP/Redirect filters: -map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252 - -List of active sessions: -MAP-BLOCK 10.1.255.255 65535 <- -> 192.168.1.255 65299 [203.1.1.1 80] -MAP-BLOCK 10.1.0.0 32768 <- -> 192.168.1.0 1032 [203.1.1.1 80] -MAP-BLOCK 10.1.0.0 32768 <- -> 192.168.1.0 1032 [203.1.1.1 80] -MAP-BLOCK 10.1.1.1 252 <- -> 192.168.1.1 1276 [203.1.1.1 80] -MAP-BLOCK 10.1.1.1 5000 <- -> 192.168.1.1 1488 [203.1.1.1 80] - -Hostmap table: -10.1.255.255,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 1) -10.1.0.0,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 2) -10.1.1.1,203.1.1.1 -> 192.168.1.1,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n4 b/contrib/ipfilter/test/expected/n4 deleted file mode 100644 index 746ef7e..0000000 --- a/contrib/ipfilter/test/expected/n4 +++ /dev/null @@ -1,190 +0,0 @@ -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.1.1,23 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.2.2.1,10023 -> zx0 ip #0 40(20) 6 10.1.0.0,23 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 0/0 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.0.0 23 [10.3.3.3 12346] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053 -> zx0 ip #0 28(20) 17 10.1.1.0,53 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 40(20) 6 10.2.2.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1/32 port 10053 udp - -List of active sessions: -RDR 10.2.2.1 10053 <- -> 10.1.1.0 53 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -15 -> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1/32 port 0 tcp - -List of active sessions: -RDR 10.2.2.1 53 <- -> 10.1.1.1 53 [10.3.3.3 12345] -RDR 10.2.2.1 23 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,53 -> zx0 ip #0 40(20) 6 10.2.2.1,10053 > 10.3.3.3,12345 -< zx0 ip #0 40(20) 6 10.3.3.3,12346 > 10.1.0.0,23 -> zx0 ip #0 40(20) 6 10.2.2.1,10023 > 10.3.3.3,12346 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,53 -> zx0 ip #0 28(20) 17 10.2.2.1,10053 > 10.3.3.3,12345 -15 -> zx0 ip #0 40(20) 6 10.1.1.1,53 > 10.3.3.3,12345 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 -> 10.2.2.1/32 ip - -List of active sessions: -RDR 10.2.2.1 53 <- -> 10.1.1.0 53 [10.3.3.3 12345] -RDR 10.2.2.1 53 <- -> 10.1.1.1 53 [10.3.3.3 12345] -RDR 10.2.2.1 23 <- -> 10.1.1.1 23 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n4_6 b/contrib/ipfilter/test/expected/n4_6 deleted file mode 100644 index e9a5ce3..0000000 --- a/contrib/ipfilter/test/expected/n4_6 +++ /dev/null @@ -1,190 +0,0 @@ -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,23 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:0:0:0:0:2:2:1,10023 -> zx0 ip6/0 20 0 6 10:1:0:0:0:0:0:0,23 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 any port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:: 23 [10:3:3::3 12346] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10053 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:0,53 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 53 -> 10::2:2:1/128 port 10053 udp - -List of active sessions: -RDR 10::2:2:1 10053 <- -> 10:1:1:: 53 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -16 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 0 -> 10::2:2:1/128 port 0 tcp - -List of active sessions: -RDR 10::2:2:1 53 <- -> 10:1:1::1 53 [10:3:3::3 12345] -RDR 10::2:2:1 23 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12346 > 10:1:0:0:0:0:0:0,23 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:1,10023 > 10:3:3:0:0:0:0:3,12346 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,53 -> zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:1,10053 > 10:3:3:0:0:0:0:3,12345 -16 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,53 > 10:3:3:0:0:0:0:3,12345 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 -> 10::2:2:1/128 ip - -List of active sessions: -RDR 10::2:2:1 53 <- -> 10:1:1:: 53 [10:3:3::3 12345] -RDR 10::2:2:1 53 <- -> 10:1:1::1 53 [10:3:3::3 12345] -RDR 10::2:2:1 23 <- -> 10:1:1::1 23 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n5 b/contrib/ipfilter/test/expected/n5 deleted file mode 100644 index 423bf48..0000000 --- a/contrib/ipfilter/test/expected/n5 +++ /dev/null @@ -1,533 +0,0 @@ -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.2.2.2 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.1.1.1 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.2.2.2 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.2.2.2,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.2.2.2,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.1/32 -> 10.2.2.2/32 - -List of active sessions: -MAP 10.1.1.1 1025 <- -> 10.2.2.2 1025 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.2.2.2 1026 [10.3.4.5 40000] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.1.2.1] -MAP 10.1.1.1 1025 <- -> 10.2.2.2 1025 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.2.2.2 1025 [10.1.1.1 1025] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.2.2.2 [10.1.1.2] - -Hostmap table: -10.1.1.1,10.3.4.5 -> 10.2.2.2,0.0.0.0 (use = 2) -10.1.1.1,10.1.2.1 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.2.2.2,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.2.2.2,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.2 -15 -> zx0 ip #0 20(20) 255 10.3.4.5 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.0 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -15 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.3.4.5 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.3.4.5 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32 - -List of active sessions: -MAP 10.1.1.3 2003 <- -> 10.3.4.5 2003 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.5 2002 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.5 2001 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.5 2000 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 1025 [10.1.1.1 1025] -MAP 10.1.1.1 <- -> 10.3.4.5 [10.1.2.1] -MAP 10.1.1.0 <- -> 10.3.4.5 [10.1.1.2] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 1025 [10.1.1.2 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.5 1026 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 1025 [10.1.1.1 1025] -MAP 10.1.1.2 <- -> 10.3.4.5 [10.1.1.1] -MAP 10.1.1.0 <- -> 10.3.4.5 [10.1.1.2] - -Hostmap table: -10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 4) -10.1.1.0,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.3.4.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.1 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.3.4.1 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.3.4.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.3.4.2 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.3,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.3.4.3,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.3.4.3,1025 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24 - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.3 1025 [10.3.4.5 40001] -MAP 10.1.1.1 1025 <- -> 10.3.4.3 1025 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.3.4.3 1026 [10.3.4.5 40000] -MAP 10.1.1.3 <- -> 10.3.4.2 [10.4.3.4] -MAP 10.1.1.3 <- -> 10.3.4.2 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.1 [10.4.3.4] -MAP 10.1.1.2 <- -> 10.3.4.1 [10.4.3.2] -MAP 10.1.1.1 <- -> 10.3.4.1 [10.4.3.2] - -Hostmap table: -10.1.1.2,10.3.4.5 -> 10.3.4.3,0.0.0.0 (use = 1) -10.1.1.1,10.3.4.5 -> 10.3.4.3,0.0.0.0 (use = 2) -10.1.1.3,10.4.3.4 -> 10.3.4.2,0.0.0.0 (use = 2) -10.1.1.2,10.4.3.4 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.4.3.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.4.3.2 -> 10.3.4.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1025 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.2,1026 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.1.1.3,2000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2002 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.1.1.3,2003 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.3.4.5,10001 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.5 10001 [10.3.4.5 40001] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.2,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -> zx0 ip #0 40(20) 6 10.3.4.1,10002 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10003 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10001 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.1,10004 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.1,10005 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10006 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10007 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.1,10008 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.1,10009 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.3.4.1,10010 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,40000 -> zx0 ip #0 28(20) 17 10.3.4.1,10011 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.3.4.1,10012 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10.1.2.1 80 <- -> 10.3.4.1 10012 [10.3.4.5 40001] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10011 [10.3.4.5 40001] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10010 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.3.4.1 10009 [10.3.4.5 40000] -MAP 10.1.1.3 2003 <- -> 10.3.4.1 10008 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.1 10007 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.1 10006 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.1 10005 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10004 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10003 [10.1.1.2 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.1 10002 [10.1.1.1 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.1 10001 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.1 10000 [10.1.1.1 1025] - -Hostmap table: -10.1.2.1,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.3.4.5 -> 10.3.4.1,0.0.0.0 (use = 2) -10.1.1.3,10.1.4.1 -> 10.3.4.1,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.1,0.0.0.0 (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip #0 20(20) 255 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -> zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 20(20) 255 10.2.2.1 > 10.1.2.1 -> zx0 ip #0 20(20) 255 10.2.2.2 > 10.1.2.1 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.2.1 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.2 > 10.2.1.1 -< zx0 ip #0 20(20) 255 10.2.2.3 > 10.1.1.1 -< zx0 ip #0 20(20) 255 10.2.3.4 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.2.2.2 -< zx0 ip #0 20(20) 255 10.1.1.0 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.1 > 10.3.4.5 -< zx0 ip #0 20(20) 255 10.1.1.2 > 10.3.4.5 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.3.4.5,1025 -> zx0 ip #0 48(20) 1 10.1.1.1 > 10.4.3.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.2.2.2 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.3 -< zx0 ip #0 48(20) 1 10.4.3.2 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.2 -< zx0 ip #0 20(20) 34 10.4.3.2 > 10.3.4.4 -> zx0 ip #0 20(20) 34 10.1.1.2 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.5 -> zx0 ip #0 20(20) 34 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 34 10.4.3.4 > 10.3.4.6 -> zx0 ip #0 20(20) 35 10.1.1.3 > 10.4.3.4 -< zx0 ip #0 20(20) 35 10.4.3.4 > 10.3.4.7 -15 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.2,1025 -> zx0 ip #0 20(20) 0 10.1.1.0 > 10.1.1.2 -> zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.2.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,40001 > 10.1.1.1,1025 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.2.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.3.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.1.4.1,80 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.1.4.1,80 -< zx0 ip #0 20(20) 0 10.1.1.1 > 10.1.1.2 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -< zx0 ip #0 20(20) 0 10.1.1.2 > 10.1.1.1 -> zx0 ip #0 40(20) 6 10.3.4.5,40000 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1026 > 10.3.4.5,40000 -> zx0 ip #0 40(20) 6 10.3.4.5,40001 > 10.3.4.5,40000 -< zx0 ip #0 40(20) 6 10.1.1.1,1025 > 10.1.1.2,1025 -> zx0 ip #0 28(20) 17 10.3.4.5,40000 > 10.3.4.5,40001 -< zx0 ip #0 28(20) 17 10.1.1.2,1025 > 10.3.4.5,40001 -> zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -< zx0 ip #0 40(20) 6 10.1.2.1,80 > 10.3.4.5,40001 -List of active MAP/Redirect filters: -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.3.4.5 40001] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40001 [10.3.4.5 40000] -MAP 10.1.1.1 1026 <- -> 10.3.4.5 40000 [10.3.4.5 40000] -MAP 10.1.1.3 2003 <- -> 10.3.4.5 40001 [10.1.4.1 80] -MAP 10.1.1.3 2002 <- -> 10.3.4.5 40000 [10.1.4.1 80] -MAP 10.1.1.3 2001 <- -> 10.3.4.5 40001 [10.1.3.1 80] -MAP 10.1.1.3 2000 <- -> 10.3.4.5 40000 [10.1.2.1 80] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40001 [10.1.1.1 1025] -MAP 10.1.1.1 1025 <- -> 10.3.4.5 40000 [10.1.1.2 1025] -MAP 10.1.1.2 1026 <- -> 10.3.4.5 40001 [10.1.1.1 1025] -MAP 10.1.1.2 1025 <- -> 10.3.4.5 40000 [10.1.1.1 1025] - -Hostmap table: -10.1.1.2,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.3.4.5 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.4.1 -> 10.3.4.5,0.0.0.0 (use = 2) -10.1.1.3,10.1.3.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.3,10.1.2.1 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.1,10.1.1.2 -> 10.3.4.5,0.0.0.0 (use = 1) -10.1.1.2,10.1.1.1 -> 10.3.4.5,0.0.0.0 (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n5_6 b/contrib/ipfilter/test/expected/n5_6 deleted file mode 100644 index 1e7bc8e..0000000 --- a/contrib/ipfilter/test/expected/n5_6 +++ /dev/null @@ -1,533 +0,0 @@ -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:2:2:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::1/128 -> 10::2:2:2/128 - -List of active sessions: -MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::2:2:2 1026 [10::3:4:5 40000] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:2::1] -MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::2:2:2 1025 [10:1:1::1 1025] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::2:2:2 [10:1:1::2] - -Hostmap table: -10:1:1::1,10::3:4:5 -> 10::2:2:2,any (use = 2) -10:1:1::1,10:1:2::1 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::2:2:2,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::2:2:2,any (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 -16 -> zx0 ip6/0 1 0 255 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:0 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -16 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:0:0:0:0:3:4:5 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128 - -List of active sessions: -MAP 10:1:1::3 2003 <- -> 10::3:4:5 2003 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:5 2002 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:5 2001 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:5 2000 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 1025 [10:1:1::1 1025] -MAP 10:1:1::1 <- -> 10::3:4:5 [10:1:2::1] -MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 1025 [10:1:1::2 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:5 1026 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 1025 [10:1:1::1 1025] -MAP 10:1:1::2 <- -> 10::3:4:5 [10:1:1::1] -MAP 10:1:1:: <- -> 10::3:4:5 [10:1:1::2] - -Hostmap table: -10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 4) -10:1:1::,10:1:1::2 -> 10::3:4:5,any (use = 2) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:1 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:0:0:0:0:3:4:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:0:0:0:0:3:4:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:3,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:3,1025 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112 - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:3 1025 [10::3:4:5 40001] -MAP 10:1:1::1 1025 <- -> 10::3:4:3 1025 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::3:4:3 1026 [10::3:4:5 40000] -MAP 10:1:1::3 <- -> 10::3:4:2 [10:4:3::4] -MAP 10:1:1::3 <- -> 10::3:4:2 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:1 [10:4:3::4] -MAP 10:1:1::2 <- -> 10::3:4:1 [10:4:3::2] -MAP 10:1:1::1 <- -> 10::3:4:1 [10:4:3::2] - -Hostmap table: -10:1:1::2,10::3:4:5 -> 10::3:4:3,any (use = 1) -10:1:1::1,10::3:4:5 -> 10::3:4:3,any (use = 2) -10:1:1::3,10:4:3::4 -> 10::3:4:2,any (use = 2) -10:1:1::2,10:4:3::4 -> 10::3:4:1,any (use = 1) -10:1:1::2,10:4:3::2 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:4:3::2 -> 10::3:4:1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1025 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:2,1026 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2002 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:3,2003 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,10001 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:5 10001 [10::3:4:5 40001] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::2,10::3:4:5 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10002 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10003 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10004 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10005 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10006 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10007 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10008 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10009 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10010 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:1,10011 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:1,10012 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential - -List of active sessions: -MAP 10:1:2::1 80 <- -> 10::3:4:1 10012 [10::3:4:5 40001] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10011 [10::3:4:5 40001] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10010 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::3:4:1 10009 [10::3:4:5 40000] -MAP 10:1:1::3 2003 <- -> 10::3:4:1 10008 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:1 10007 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:1 10006 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:1 10005 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10004 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10003 [10:1:1::2 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:1 10002 [10:1:1::1 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:1 10001 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:1 10000 [10:1:1::1 1025] - -Hostmap table: -10:1:2::1,10::3:4:5 -> 10::3:4:1,any (use = 1) -10:1:1::2,10::3:4:5 -> 10::3:4:1,any (use = 1) -10:1:1::1,10::3:4:5 -> 10::3:4:1,any (use = 2) -10:1:1::3,10:1:4::1 -> 10::3:4:1,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:1,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:1,any (use = 1) -10:1:1::1,10:1:1::1 -> 10::3:4:1,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:1,any (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:1:2:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:1 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:2 > 10:0:0:0:0:2:1:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:2:3 > 10:1:1:0:0:0:0:1 -< zx0 ip6/0 1 0 255 10:0:0:0:0:2:3:4 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:0 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:1 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 1 0 255 10:1:1:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:0:0:0:0:3:4:5,1025 -> zx0 ip6/0 88 0 58 10:1:1:0:0:0:0:1 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:2:2:2 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:3 -< zx0 ip6/0 88 0 58 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:2 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:2 > 10:0:0:0:0:3:4:4 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:2 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:5 -> zx0 ip6/0 1 0 34 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 34 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:6 -> zx0 ip6/0 1 0 35 10:1:1:0:0:0:0:3 > 10:4:3:0:0:0:0:4 -< zx0 ip6/0 1 0 35 10:4:3:0:0:0:0:4 > 10:0:0:0:0:3:4:7 -16 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:0 > 10:1:1:0:0:0:0:2 -> zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:2:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40001 > 10:1:1:0:0:0:0:1,1025 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:2:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:3:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:1:4:0:0:0:0:1,80 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:1:4:0:0:0:0:1,80 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:1 > 10:1:1:0:0:0:0:2 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -< zx0 ip6/0 1 0 41 10:1:1:0:0:0:0:2 > 10:1:1:0:0:0:0:1 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40000 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1026 > 10:0:0:0:0:3:4:5,40000 -> zx0 ip6/0 20 0 6 10:0:0:0:0:3:4:5,40001 > 10:0:0:0:0:3:4:5,40000 -< zx0 ip6/0 20 0 6 10:1:1:0:0:0:0:1,1025 > 10:1:1:0:0:0:0:2,1025 -> zx0 ip6/0 8 0 17 10:0:0:0:0:3:4:5,40000 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 8 0 17 10:1:1:0:0:0:0:2,1025 > 10:0:0:0:0:3:4:5,40001 -> zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -< zx0 ip6/0 20 0 6 10:1:2:0:0:0:0:1,80 > 10:0:0:0:0:3:4:5,40001 -List of active MAP/Redirect filters: -map zx0 inet6 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential - -List of active sessions: -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10::3:4:5 40001] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40001 [10::3:4:5 40000] -MAP 10:1:1::1 1026 <- -> 10::3:4:5 40000 [10::3:4:5 40000] -MAP 10:1:1::3 2003 <- -> 10::3:4:5 40001 [10:1:4::1 80] -MAP 10:1:1::3 2002 <- -> 10::3:4:5 40000 [10:1:4::1 80] -MAP 10:1:1::3 2001 <- -> 10::3:4:5 40001 [10:1:3::1 80] -MAP 10:1:1::3 2000 <- -> 10::3:4:5 40000 [10:1:2::1 80] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40001 [10:1:1::1 1025] -MAP 10:1:1::1 1025 <- -> 10::3:4:5 40000 [10:1:1::2 1025] -MAP 10:1:1::2 1026 <- -> 10::3:4:5 40001 [10:1:1::1 1025] -MAP 10:1:1::2 1025 <- -> 10::3:4:5 40000 [10:1:1::1 1025] - -Hostmap table: -10:1:1::2,10::3:4:5 -> 10::3:4:5,any (use = 1) -10:1:1::1,10::3:4:5 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:4::1 -> 10::3:4:5,any (use = 2) -10:1:1::3,10:1:3::1 -> 10::3:4:5,any (use = 1) -10:1:1::3,10:1:2::1 -> 10::3:4:5,any (use = 1) -10:1:1::1,10:1:1::2 -> 10::3:4:5,any (use = 1) -10:1:1::2,10:1:1::1 -> 10::3:4:5,any (use = 3) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n6 b/contrib/ipfilter/test/expected/n6 deleted file mode 100644 index 1afd94e..0000000 --- a/contrib/ipfilter/test/expected/n6 +++ /dev/null @@ -1,173 +0,0 @@ -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.2.2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -15 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 from 0/0 to 10.1.1.0/24 port = 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.2.2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.2.2.1,10023 -15 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.2.2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -15 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.3.3.3 12345] -RDR 10.2.2.1 10023 <- -> 10.1.2.2 23 [10.3.0.1 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.1.2.2,23 -< zx0 ip #0 40(20) 6 10.3.0.1,12345 > 10.2.2.2,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.1,53 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.0.0,23 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.0.0,23 -< zx0 ip #0 28(20) 17 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 28(20) 17 10.3.3.3,12345 > 10.2.2.1,10053 -< zx0 ip #0 40(20) 6 10.2.2.2,12345 > 10.1.1.0,53 -< zx0 ip #0 40(20) 6 10.3.3.3,12345 > 10.1.1.0,53 -List of active MAP/Redirect filters: -rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1/32 port 10053 udp - -List of active sessions: -RDR 10.2.2.1 10053 <- -> 10.1.1.0 53 [10.3.3.3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n6_6 b/contrib/ipfilter/test/expected/n6_6 deleted file mode 100644 index e10f9bd..0000000 --- a/contrib/ipfilter/test/expected/n6_6 +++ /dev/null @@ -1,173 +0,0 @@ -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 -16 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 from any to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:0:0:0:0:2:2:1,10023 -16 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:2:2 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -16 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10:3:3::3 12345] -RDR 10::2:2:1 10023 <- -> 10:1:2::2 23 [10:3::1 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:1:2:0:0:0:0:2,23 -< zx0 ip6/0 20 0 6 10:3:0:0:0:0:0:1,12345 > 10:0:0:0:0:2:2:2,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:1,53 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:0:0:0:0:0:0,23 -< zx0 ip6/0 8 0 17 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 8 0 17 10:3:3:0:0:0:0:3,12345 > 10:0:0:0:0:2:2:1,10053 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:2:2,12345 > 10:1:1:0:0:0:0:0,53 -< zx0 ip6/0 20 0 6 10:3:3:0:0:0:0:3,12345 > 10:1:1:0:0:0:0:0,53 -List of active MAP/Redirect filters: -rdr zx0 inet6 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1/128 port 10053 udp - -List of active sessions: -RDR 10::2:2:1 10053 <- -> 10:1:1:: 53 [10:3:3::3 12345] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n7 b/contrib/ipfilter/test/expected/n7 deleted file mode 100644 index 11b8115..0000000 --- a/contrib/ipfilter/test/expected/n7 +++ /dev/null @@ -1,98 +0,0 @@ -< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10050 -< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10079 -< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1/32 port 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10079 <- -> 10.1.1.1 79 [10.2.3.1 1233] -RDR 10.2.2.1 10050 <- -> 10.1.1.1 50 [10.2.3.1 1232] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.3.1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.2.2.1,10023 -< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.1.1.1,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 10.1.1.2,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.1.1.3,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 10.1.1.4,80 -< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.1.1.4,80 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1/32 port = 10023 tcp - -List of active sessions: -RDR 10.2.2.1 10023 <- -> 10.1.1.1 79 [10.2.3.1 1233] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 50 [10.2.3.1 1232] -RDR 10.2.2.1 10023 <- -> 10.1.1.1 23 [10.2.3.1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip #0 40(20) 6 10.2.3.1,1230 > 10.1.1.1,22 -< zx0 ip #0 40(20) 6 10.2.3.1,1231 > 10.1.1.1,23 -< zx0 ip #0 40(20) 6 10.2.3.1,1232 > 10.1.1.1,50 -< zx0 ip #0 40(20) 6 10.2.3.1,1233 > 10.1.1.1,79 -< zx0 ip #0 40(20) 6 10.2.3.1,1234 > 10.2.2.1,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1235 > 1.2.2.129,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1236 > 10.2.2.1,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1237 > 1.2.2.129,3128 -< zx0 ip #0 40(20) 6 10.2.3.1,1238 > 10.2.2.1,3128 -List of active MAP/Redirect filters: -rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp - -List of active sessions: -RDR 10.2.2.1 3128 <- -> 10.1.1.4 80 [10.2.3.1 1238] -RDR 1.2.2.129 3128 <- -> 10.1.1.4 80 [10.2.3.1 1237] -RDR 10.2.2.1 3128 <- -> 10.1.1.3 80 [10.2.3.1 1236] -RDR 1.2.2.129 3128 <- -> 10.1.1.2 80 [10.2.3.1 1235] -RDR 10.2.2.1 3128 <- -> 10.1.1.1 80 [10.2.3.1 1234] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n7_6 b/contrib/ipfilter/test/expected/n7_6 deleted file mode 100644 index 2563033..0000000 --- a/contrib/ipfilter/test/expected/n7_6 +++ /dev/null @@ -1,98 +0,0 @@ -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:0:0:0:0:2:2:1,10050 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:0:0:0:0:2:2:1,10079 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:1:1:0:0:0:0:1,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 10:1:1:0:0:0:0:2,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:1:1:0:0:0:0:3,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10079 <- -> 10:1:1::1 79 [10::2:3:1 1233] -RDR 10::2:2:1 10050 <- -> 10:1:1::1 50 [10::2:3:1 1232] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:3:1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:0:0:0:0:2:2:1,10023 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:1:1:0:0:0:0:1,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 10:1:1:0:0:0:0:2,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:1:1:0:0:0:0:3,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 10:1:1:0:0:0:0:4,80 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:1:1:0:0:0:0:4,80 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::1/128 port 23-79 -> 10::2:2:1/128 port = 10023 tcp - -List of active sessions: -RDR 10::2:2:1 10023 <- -> 10:1:1::1 79 [10::2:3:1 1233] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 50 [10::2:3:1 1232] -RDR 10::2:2:1 10023 <- -> 10:1:1::1 23 [10::2:3:1 1231] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1230 > 10:1:1:0:0:0:0:1,22 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1231 > 10:1:1:0:0:0:0:1,23 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1232 > 10:1:1:0:0:0:0:1,50 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1233 > 10:1:1:0:0:0:0:1,79 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1234 > 10:0:0:0:0:2:2:1,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1235 > 1:0:0:0:0:2:2:129,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1236 > 10:0:0:0:0:2:2:1,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1237 > 1:0:0:0:0:2:2:129,3128 -< zx0 ip6/0 20 0 6 10:0:0:0:0:2:3:1,1238 > 10:0:0:0:0:2:2:1,3128 -List of active MAP/Redirect filters: -rdr zx0 inet6 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp - -List of active sessions: -RDR 10::2:2:1 3128 <- -> 10:1:1::4 80 [10::2:3:1 1238] -RDR 1::2:2:129 3128 <- -> 10:1:1::4 80 [10::2:3:1 1237] -RDR 10::2:2:1 3128 <- -> 10:1:1::3 80 [10::2:3:1 1236] -RDR 1::2:2:129 3128 <- -> 10:1:1::2 80 [10::2:3:1 1235] -RDR 10::2:2:1 3128 <- -> 10:1:1::1 80 [10::2:3:1 1234] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n8 b/contrib/ipfilter/test/expected/n8 deleted file mode 100644 index a5e938f..0000000 --- a/contrib/ipfilter/test/expected/n8 +++ /dev/null @@ -1,30 +0,0 @@ -4500 0054 8bc1 0000 ff01 13d5 0a0a 0a01 0404 0404 0800 efdf 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 8bc1 0000 ff01 13d5 0a0a 0a01 0404 0404 0800 efde 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -map icmp0 2.2.2.0/24 -> 10.10.10.0/24 - -List of active sessions: -MAP 2.2.2.2 <- -> 10.10.10.1 [4.4.4.4] - -Hostmap table: -2.2.2.2,4.4.4.4 -> 10.10.10.1,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n8_6 b/contrib/ipfilter/test/expected/n8_6 deleted file mode 100644 index 4d08efe..0000000 --- a/contrib/ipfilter/test/expected/n8_6 +++ /dev/null @@ -1,30 +0,0 @@ -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7724 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0004 0004 0004 0000 0000 0000 0000 0004 8000 7723 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -map icmp0 inet6 2::2:2:0/112 -> 10:10:10::/112 - -List of active sessions: -MAP 2::2:2:2 <- -> 10:10:10::1 [4:4:4::4] - -Hostmap table: -2::2:2:2,4:4:4::4 -> 10:10:10::1,any (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n9 b/contrib/ipfilter/test/expected/n9 deleted file mode 100644 index 2c762be..0000000 --- a/contrib/ipfilter/test/expected/n9 +++ /dev/null @@ -1,29 +0,0 @@ -4500 0054 8bc1 0000 ff01 17d9 0202 0202 0a0a 0a01 0800 efdf 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7df 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 8bc1 0000 ff01 17d9 0202 0202 0a0a 0a01 0800 efde 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -4500 0054 3fd5 4000 ff01 2fc8 0404 0404 0202 0202 0000 f7de 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -rdr icmp0 4.4.4.0/24 -> 10.10.10.1/32 ip - -List of active sessions: -RDR 10.10.10.1 <- -> 4.4.4.4 [2.2.2.2] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/n9_6 b/contrib/ipfilter/test/expected/n9_6 deleted file mode 100644 index 134d74c..0000000 --- a/contrib/ipfilter/test/expected/n9_6 +++ /dev/null @@ -1,29 +0,0 @@ -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772c 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764d 6220 0000 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0010 0010 0010 0000 0000 0000 0000 0001 8000 772b 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0002 0000 0000 0000 0000 0002 0002 0002 8100 764c 6220 0001 3f6f 6e80 000b 0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 - -List of active MAP/Redirect filters: -rdr icmp0 inet6 4:4:4::/112 -> 10:10:10::1/128 ip - -List of active sessions: -RDR 10:10:10::1 <- -> 4:4:4::4 [2::2:2:2] - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni1 b/contrib/ipfilter/test/expected/ni1 deleted file mode 100644 index d4e2de2..0000000 --- a/contrib/ipfilter/test/expected/ni1 +++ /dev/null @@ -1,19 +0,0 @@ -4500 0028 0000 4000 0111 65b2 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 0000 4000 0111 6dba 0202 0202 0404 0404 afc9 829e 0014 6b10 - -4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 afc9 829e 0014 6b10 0402 0000 3be5 468d 000a cfc3 - -4500 0028 0001 4000 0111 65b0 0606 0607 0404 0404 4e20 829e 0014 c4b0 0402 0000 3be5 468d 000a cfc3 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 5773 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 0800 829e 0014 12da - -4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 0800 829e 0014 12da 0402 0000 3be5 468d 000a cfc3 - -4500 0028 0002 4000 0111 65ae 0606 0608 0404 0404 07d0 829e 0014 0b00 0402 0000 3be5 468d 000a cfc3 - -4500 0038 809a 0000 ff01 3121 0303 0303 0202 0202 0b00 ff6a 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 5000 829e 0014 22e2 - -4500 0044 809a 0000 ff01 3115 0303 0303 0202 0202 0b00 0131 0000 0000 4500 0028 0000 4000 0111 6dba 0202 0202 0404 0404 5000 829e 0014 cad9 0402 0000 3be5 468d 000a cfc3 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni10 b/contrib/ipfilter/test/expected/ni10 deleted file mode 100644 index 050fb40..0000000 --- a/contrib/ipfilter/test/expected/ni10 +++ /dev/null @@ -1,8 +0,0 @@ -4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606 5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 afb9 0202 0202 0404 0404 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 5000 0050 0000 0001 - -4500 0058 0001 0000 ff01 af98 0202 0202 0404 0404 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni11 b/contrib/ipfilter/test/expected/ni11 deleted file mode 100644 index 6ed8ecc..0000000 --- a/contrib/ipfilter/test/expected/ni11 +++ /dev/null @@ -1,8 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 - -4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni12 b/contrib/ipfilter/test/expected/ni12 deleted file mode 100644 index 590ec23..0000000 --- a/contrib/ipfilter/test/expected/ni12 +++ /dev/null @@ -1,8 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 - -4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni13 b/contrib/ipfilter/test/expected/ni13 deleted file mode 100644 index 897bef3..0000000 --- a/contrib/ipfilter/test/expected/ni13 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -4500 002c 0000 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 0001 4000 4006 d6dd c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 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 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 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 0048 0002 4000 4006 d758 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 0003 0000 ff2f 5856 c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff - -4500 0028 0004 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -4500 0038 0005 0000 ff2f 583c c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 0006 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 0007 0000 ff2f 5838 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 0008 0000 ff2f 583f c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 ff2f 5832 c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 000a 0000 ff2f 582b c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 000b 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 000c 0000 ff2f 5841 c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 000d 0000 ff2f 582a c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 000e 0000 ff2f 583b c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 000f 0000 ff2f 5840 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni14 b/contrib/ipfilter/test/expected/ni14 deleted file mode 100644 index 5ad5a1b..0000000 --- a/contrib/ipfilter/test/expected/ni14 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 5e11 4000 8006 ec0b c0a8 7101 7f00 0001 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 d44b 0000 0204 05b4 0101 0402 - -4500 002c 0000 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -4500 00c4 5e12 4000 8006 eb76 c0a8 7101 7f00 0001 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 954b 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 0001 4000 4006 d6dd c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 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 00d0 5e13 4000 8006 eb69 c0a8 7101 7f00 0001 05e7 06bb abf0 4b42 a564 6977 5018 fa54 5eb2 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 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 0048 0002 4000 4006 d758 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 5e14 4000 8006 ebf8 c0a8 7101 7f00 0001 05e7 06bb abf0 4bea a564 6997 5018 fa34 9abb 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 5e15 0000 802f 2bd6 c0a8 7101 7f00 0001 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 0003 0000 ff2f 5856 c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff - -4500 0028 0004 4000 4006 d776 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -4500 0038 0005 0000 ff2f 583c c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 0006 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 5e16 0000 802f 2bd2 c0a8 7101 7f00 0001 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 5e17 0000 802f 2bd7 c0a8 7101 7f00 0001 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 0007 0000 ff2f 5838 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 0008 0000 ff2f 583f c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 5e18 4000 8006 ebf4 c0a8 7101 7f00 0001 05e7 06bb abf0 4c02 a564 6997 5018 fa34 9aa3 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 5e19 0000 802f 2bd3 c0a8 7101 7f00 0001 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 ff2f 5832 c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 5e1a 0000 802f 2bcc c0a8 7101 7f00 0001 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 000a 0000 ff2f 582b c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 5e1b 0000 802f 2bd9 c0a8 7101 7f00 0001 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 000b 0000 ff2f 5844 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 000c 0000 ff2f 5841 c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 5e1c 0000 802f 2bc0 c0a8 7101 7f00 0001 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 000d 0000 ff2f 582a c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 5e1d 0000 802f 2bd7 c0a8 7101 7f00 0001 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 000e 0000 ff2f 583b c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 5e1e 0000 802f 2bdc c0a8 7101 7f00 0001 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 5e1f 0000 802f 2bd3 c0a8 7101 7f00 0001 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 000f 0000 ff2f 5840 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni15 b/contrib/ipfilter/test/expected/ni15 deleted file mode 100644 index 3820d56..0000000 --- a/contrib/ipfilter/test/expected/ni15 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 0000 4000 8006 9772 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -4500 00c4 0001 4000 8006 96dd c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 69a7 4000 4006 6d37 c0a8 7103 c0a8 7101 06bb 05e7 a564 68db abf0 4b42 5018 832c cecf 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 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 00d0 0002 4000 8006 96d0 c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 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 0048 69a8 4000 4006 6db2 c0a8 7103 c0a8 7101 06bb 05e7 a564 6977 abf0 4bea 5018 832c 36fa 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 0003 4000 8006 975f c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 0004 0000 802f d73c c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 c0a8 7101 2081 880b 0000 4000 ffff ffff - -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -4500 0038 69ab 0000 ff2f ee95 c0a8 7103 c0a8 7101 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 c0a8 7101 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 0005 0000 802f d738 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 0006 0000 802f d73d c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 69ad 0000 ff2f ee91 c0a8 7103 c0a8 7101 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 69ae 0000 ff2f ee98 c0a8 7103 c0a8 7101 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 0007 4000 8006 975b c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 0008 0000 802f d739 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 69af 0000 ff2f ee8b c0a8 7103 c0a8 7101 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 802f d732 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 69b0 0000 ff2f ee84 c0a8 7103 c0a8 7101 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 000a 0000 802f d73f c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 c0a8 7101 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 000b 0000 802f d726 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 69b3 0000 ff2f ee83 c0a8 7103 c0a8 7101 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 000c 0000 802f d73d c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 c0a8 7101 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 000d 0000 802f d742 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 000e 0000 802f d739 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 69b5 0000 ff2f ee99 c0a8 7103 c0a8 7101 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni16 b/contrib/ipfilter/test/expected/ni16 deleted file mode 100644 index 2c34f5c..0000000 --- a/contrib/ipfilter/test/expected/ni16 +++ /dev/null @@ -1,63 +0,0 @@ -4500 0030 0000 4000 8006 9772 c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -4500 002c 69a6 4000 4006 9376 c0a8 7103 0a02 0202 06bb 05e7 a564 68da abf0 4aa6 6012 8000 c8ee 0000 0204 05b4 - -4500 00c4 0001 4000 8006 96dd c0a8 7101 c0a8 7103 05e7 06bb abf0 4aa6 a564 68db 5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d 0001 0000 0100 0000 0000 0001 0000 0001 0000 0a28 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 4d69 6372 6f73 6f66 7420 5769 6e64 6f77 7320 4e54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 - -4500 00c4 69a7 4000 4006 92dd c0a8 7103 0a02 0202 06bb 05e7 a564 68db abf0 4b42 5018 832c f475 0000 009c 0001 1a2b 3c4d 0002 0000 0100 0100 0000 0000 0000 0000 0001 0001 6c6f 6361 6c00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6c69 6e75 7800 0000 0000 0000 0000 0000 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 00d0 0002 4000 8006 96d0 c0a8 7101 c0a8 7103 05e7 06bb abf0 4b42 a564 6977 5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d 0007 0000 4000 1331 0000 012c 05f5 e100 0000 0003 0000 0003 0040 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 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 0048 69a8 4000 4006 9358 c0a8 7103 0a02 0202 06bb 05e7 a564 6977 abf0 4bea 5018 832c 5ca0 0000 0020 0001 1a2b 3c4d 0008 0000 0000 4000 0100 0000 05f5 e100 0040 0000 0000 0000 - -4500 0040 0003 4000 8006 975f c0a8 7101 c0a8 7103 05e7 06bb abf0 4bea a564 6997 5018 fa34 e810 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 ffff ffff ffff ffff - -4500 0039 0004 0000 802f d73c c0a8 7101 c0a8 7103 3001 880b 0019 0000 0000 0000 ff03 c021 0100 0015 0104 0578 0506 577f 7c5b 0702 0802 0d03 06 - -4500 0020 69a9 0000 ff2f 1456 c0a8 7103 0a02 0202 2081 880b 0000 4000 ffff ffff - -4500 0028 69aa 4000 4006 9376 c0a8 7103 0a02 0202 06bb 05e7 a564 6997 abf0 4c02 5010 832c db67 0000 - -4500 0038 69ab 0000 ff2f 143c c0a8 7103 0a02 0202 3001 880b 0018 4000 0000 0000 ff03 c021 0101 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 002f 69ac 0000 ff2f 1444 c0a8 7103 0a02 0202 3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -4500 003c 0005 0000 802f d738 c0a8 7101 c0a8 7103 3081 880b 0018 0000 0000 0001 0000 0001 ff03 c021 0201 0014 0206 0000 0000 0506 22d9 0cfa 0702 0802 - -4500 0036 0006 0000 802f d73d c0a8 7101 c0a8 7103 3001 880b 0016 0000 0000 0002 ff03 c021 0101 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 003a 69ad 0000 ff2f 1438 c0a8 7103 0a02 0202 3081 880b 0016 4000 0000 0002 0000 0002 ff03 c021 0201 0012 0104 0578 0506 577f 7c5b 0702 0802 - -4500 0032 69ae 0000 ff2f 143f c0a8 7103 0a02 0202 3001 880b 0012 4000 0000 0003 8021 0101 0010 0306 c0a8 0001 0206 002d 0f01 - -4500 0040 0007 4000 8006 975b c0a8 7101 c0a8 7103 05e7 06bb abf0 4c02 a564 6997 5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d 000f 0000 0000 0000 0000 0000 ffff ffff - -4500 0038 0008 0000 802f d739 c0a8 7101 c0a8 7103 3081 880b 0014 0000 0000 0003 0000 0003 c021 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 69af 0000 ff2f 1432 c0a8 7103 0a02 0202 3081 880b 001a 4000 0000 0004 0000 0003 ff03 c021 0702 0016 0c02 0012 577f 7c5b 4d53 5241 5356 352e 3130 - -4500 003e 0009 0000 802f d732 c0a8 7101 c0a8 7103 3081 880b 001a 0000 0000 0004 0000 0004 c021 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0044 69b0 0000 ff2f 142b c0a8 7103 0a02 0202 3081 880b 0020 4000 0000 0005 0000 0004 ff03 c021 0703 001c 0c03 0018 577f 7c5b 4d53 5241 532d 302d 434c 4159 4d4f 4f52 - -4500 0030 000a 0000 802f d73f c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0005 0000 0005 80fd 0104 000a 1206 0100 0001 - -4500 002a 69b1 0000 ff2f 1444 c0a8 7103 0a02 0202 3081 880b 0006 4000 0000 0006 0000 0005 80fd 0101 0004 - -4500 002c 69b2 0000 ff2f 1441 c0a8 7103 0a02 0202 3001 880b 000c 4000 0000 0007 80fd 0404 000a 1206 0100 0001 - -4500 0048 000b 0000 802f d726 c0a8 7101 c0a8 7103 3081 880b 0024 0000 0000 0006 0000 0007 8021 0105 0022 0306 0000 0000 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0042 69b3 0000 ff2f 142a c0a8 7103 0a02 0202 3081 880b 001e 4000 0000 0008 0000 0006 8021 0405 001c 8106 0000 0000 8206 0000 0000 8306 0000 0000 8406 0000 0000 - -4500 0030 000c 0000 802f d73d c0a8 7101 c0a8 7103 3081 880b 000c 0000 0000 0007 0000 0008 8021 0401 000a 0206 002d 0f01 - -4500 0030 69b4 0000 ff2f 143b c0a8 7103 0a02 0202 3081 880b 000c 4000 0000 0009 0000 0007 8021 0102 000a 0306 c0a8 0001 - -4500 002a 000d 0000 802f d742 c0a8 7101 c0a8 7103 3081 880b 0006 0000 0000 0008 0000 0009 80fd 0201 0004 - -4500 0032 000e 0000 802f d739 c0a8 7101 c0a8 7103 3001 880b 0012 0000 0000 0009 80fd 0506 0010 577f 7c5b 003c cd74 0000 02dc - -4500 002a 69b5 0000 ff2f 1440 c0a8 7103 0a02 0202 3081 880b 0006 4000 0000 000a 0000 0009 80fd 0606 0004 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni17 b/contrib/ipfilter/test/expected/ni17 deleted file mode 100644 index 74eb4dd..0000000 --- a/contrib/ipfilter/test/expected/ni17 +++ /dev/null @@ -1,7 +0,0 @@ -< le0 ip #0 40(20) 6 10.2.2.5,2000 > 10.1.1.252,3128 -< le0 ip #0 40(20) 6 10.2.2.6,2000 > 10.1.2.252,3128 -< le0 ip #0 40(20) 6 10.2.2.7,2000 > 10.1.3.252,3128 -< le0 ip #0 40(20) 6 10.2.2.7,2001 > 10.1.3.252,3128 -< le0 ip #0 40(20) 6 10.2.2.8,2000 > 10.1.1.253,3128 -< le0 ip #0 40(20) 6 10.2.2.9,2000 > 10.1.2.253,3128 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni18 b/contrib/ipfilter/test/expected/ni18 deleted file mode 100644 index defc59c..0000000 --- a/contrib/ipfilter/test/expected/ni18 +++ /dev/null @@ -1,5 +0,0 @@ -< hme0 ip #0 40(20) 6 2.2.2.2,3000 > 1.1.1.1,80 -< hme0 ip #0 40(20) 6 2.2.2.2,3000 > 192.168.1.1,80 -> hme1 ip #0 40(20) 6 203.1.1.1,10000 > 4.5.6.7,80 -> hme1 ip #0 40(20) 6 10.1.1.2,5050 > 4.5.6.7,80 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni19 b/contrib/ipfilter/test/expected/ni19 deleted file mode 100644 index e55c75d..0000000 --- a/contrib/ipfilter/test/expected/ni19 +++ /dev/null @@ -1,43 +0,0 @@ -4500 0040 e3fc 4000 4006 40b5 0a01 0101 0a01 0104 03f1 0202 6523 90b2 0000 0000 b002 8000 a431 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 - -4500 0034 0000 4000 4006 fe13 0a01 0104 c0a8 7103 0202 03f1 915a a5c4 6523 90b3 8012 16d0 e89c 0000 0204 05b4 0101 0402 0103 0302 - -4500 0028 e3fd 4000 4006 40cc 0a01 0101 0a01 0104 03f1 0202 6523 90b3 915a a5c5 5010 832c e3b7 0000 - -4500 002d e3fe 4000 4006 40c6 0a01 0101 0a01 0104 03f1 0202 6523 90b3 915a a5c5 5018 832c 8242 0000 3130 3038 00 - -4500 0028 7ce5 4000 4006 813a 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90b8 5010 05b4 3a81 0000 - -4500 003c 1186 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 a002 16d0 b8c0 0000 0204 05b4 0402 080a 0039 d924 0000 0000 0103 0302 - -4500 0040 e3ff 4000 4006 40b2 0a01 0101 0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 b012 8000 452f 0000 0204 05b4 0103 0300 0101 080a 0000 0000 0039 d924 0402 0101 - -4500 0034 1188 4000 4006 ec8b 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8010 05b4 d99b 0000 0101 080a 0039 d925 0000 0000 - -4500 0030 e400 4000 4006 40c1 0a01 0101 0a01 0104 03f1 0202 6523 90b8 915a a5c5 5018 832c 3560 0000 6461 7272 656e 7200 - -4500 0028 7ce7 4000 4006 8138 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90c0 5010 05b4 3a79 0000 - -4500 0053 e401 4000 4006 409d 0a01 0101 0a01 0104 03f1 0202 6523 90c0 915a a5c5 5018 832c cce7 0000 6461 7272 656e 7200 7368 202d 6320 2265 6368 6f20 666f 6f20 3e26 313b 2065 6368 6f20 6261 7220 3e26 3222 00 - -4500 0028 7ce9 4000 4006 8136 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5010 05b4 3a4e 0000 - -4500 0029 7ceb 4000 4006 8133 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5018 05b4 3a45 0000 00 - -4500 0028 e403 4000 4006 40c6 0a01 0101 0a01 0104 03f1 0202 6523 90eb 915a a5c6 5010 832c e37e 0000 - -4500 002c 7ced 4000 4006 812e 0a01 0104 c0a8 7103 0202 03f1 915a a5c6 6523 90eb 5018 05b4 64c7 0000 666f 6f0a - -4500 0038 118a 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8018 05b4 00dd 0000 0101 080a 0039 dd6c 0000 0000 6261 720a - -4500 0028 7cef 4000 4006 8130 0a01 0104 c0a8 7103 0202 03f1 915a a5ca 6523 90eb 5011 05b4 3a48 0000 - -4500 0034 118c 4000 4006 ec87 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 8011 05b4 d54e 0000 0101 080a 0039 dd6d 0000 0000 - -0 -0 -0 -0 -0 -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni2 b/contrib/ipfilter/test/expected/ni2 deleted file mode 100644 index 69a5272..0000000 --- a/contrib/ipfilter/test/expected/ni2 +++ /dev/null @@ -1,19 +0,0 @@ -4510 002c 0000 4000 3e06 78df 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 0001 4000 3e06 78e2 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 0002 4000 3e06 78e1 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 - -4510 002e 0003 4000 3e06 78da 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 0004 4000 4001 76e4 0101 0101 c0a8 0133 0304 444f 0000 05a0 4500 05dc e483 4000 7e06 4ebb c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni20 b/contrib/ipfilter/test/expected/ni20 deleted file mode 100644 index 913ef0b..0000000 --- a/contrib/ipfilter/test/expected/ni20 +++ /dev/null @@ -1,69 +0,0 @@ -4500 0040 e3fc 4000 4006 f362 c0a8 7103 c0a8 7104 03f1 0202 6523 90b2 0000 0000 b002 8000 56df 0000 0204 05b4 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 - -4500 0034 0000 4000 4006 fe13 0a01 0104 c0a8 7103 0202 03f1 915a a5c4 6523 90b3 8012 16d0 e89c 0000 0204 05b4 0101 0402 0103 0302 - -4500 0028 e3fd 4000 4006 f379 c0a8 7103 c0a8 7104 03f1 0202 6523 90b3 915a a5c5 5010 832c 9665 0000 - -4500 002d e3fe 4000 4006 f373 c0a8 7103 c0a8 7104 03f1 0202 6523 90b3 915a a5c5 5018 832c 34f0 0000 3130 3038 00 - -4500 0028 7ce5 4000 4006 813a 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90b8 5010 05b4 3a81 0000 - -4500 003c 1186 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 a002 16d0 b8c0 0000 0204 05b4 0402 080a 0039 d924 0000 0000 0103 0302 - -4500 0040 e3ff 4000 4006 f35f c0a8 7103 c0a8 7104 03f0 03ff 66e5 b810 91d4 c8a3 b012 8000 f7dc 0000 0204 05b4 0103 0300 0101 080a 0000 0000 0039 d924 0402 0101 - -4500 0034 1188 4000 4006 ec8b 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8010 05b4 d99b 0000 0101 080a 0039 d925 0000 0000 - -4500 0030 e400 4000 4006 f36e c0a8 7103 c0a8 7104 03f1 0202 6523 90b8 915a a5c5 5018 832c e80d 0000 6461 7272 656e 7200 - -4500 0028 7ce7 4000 4006 8138 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90c0 5010 05b4 3a79 0000 - -4500 0053 e401 4000 4006 f34a c0a8 7103 c0a8 7104 03f1 0202 6523 90c0 915a a5c5 5018 832c 7f95 0000 6461 7272 656e 7200 7368 202d 6320 2265 6368 6f20 666f 6f20 3e26 313b 2065 6368 6f20 6261 7220 3e26 3222 00 - -4500 0028 7ce9 4000 4006 8136 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5010 05b4 3a4e 0000 - -4500 0029 7ceb 4000 4006 8133 0a01 0104 c0a8 7103 0202 03f1 915a a5c5 6523 90eb 5018 05b4 3a45 0000 00 - -4500 0028 e403 4000 4006 f373 c0a8 7103 c0a8 7104 03f1 0202 6523 90eb 915a a5c6 5010 832c 962c 0000 - -4500 002c 7ced 4000 4006 812e 0a01 0104 c0a8 7103 0202 03f1 915a a5c6 6523 90eb 5018 05b4 64c7 0000 666f 6f0a - -4500 0038 118a 4000 4006 ec85 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 8018 05b4 00dd 0000 0101 080a 0039 dd6c 0000 0000 6261 720a - -4500 0028 7cef 4000 4006 8130 0a01 0104 c0a8 7103 0202 03f1 915a a5ca 6523 90eb 5011 05b4 3a48 0000 - -4500 0034 118c 4000 4006 ec87 0a01 0104 c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 8011 05b4 d54e 0000 0101 080a 0039 dd6d 0000 0000 - -0 -0 -0 -0 -0 -0 -List of active MAP/Redirect filters: -rdr bge0 10.1.1.4/32 port 514 -> 192.168.113.4/32 port 514 tcp proxy rcmd - -List of active sessions: -MAP 192.168.113.4 1023 <- -> 10.1.1.4 1023 [192.168.113.3 1008] -RDR 192.168.113.4 514 <- -> 10.1.1.4 514 [192.168.113.3 1009] - proxy active - -Hostmap table: -192.168.113.4,192.168.113.3 -> 10.1.1.4,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -5 block in all -1 pass in quick on bge0 proto tcp from any to any port = 514 flags S/FSRPAU keep state -Rules configured (set 0, out) -2 block out all -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni21 b/contrib/ipfilter/test/expected/ni21 deleted file mode 100644 index 53e64a5..0000000 --- a/contrib/ipfilter/test/expected/ni21 +++ /dev/null @@ -1,6 +0,0 @@ -> eri0 ip #0 20(20) 0 4.4.4.4 > 3.3.3.3 -0 -< lan0 ip #0 20(20) 0 3.3.3.3 > 2.2.2.2 -> eri0 ip #0 20(20) 0 4.4.4.4 > 3.3.3.3 -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni23 b/contrib/ipfilter/test/expected/ni23 deleted file mode 100644 index 586373c..0000000 --- a/contrib/ipfilter/test/expected/ni23 +++ /dev/null @@ -1,37 +0,0 @@ -> ppp0 ip #0 28(20) 17 4.4.4.4,6700 > 2.2.2.2,4500 -0 -< hme0 ip #0 28(20) 17 2.2.2.2,4500 > 3.3.3.1,6700 -> bge0 ip #0 28(20) 17 1.1.2.3,4500 > 3.3.3.1,6700 -List of active MAP/Redirect filters: -rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2/32 ip -map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32 - -List of active sessions: -MAP 3.3.3.1 6700 <- -> 4.4.4.4 6700 [2.2.2.2 4500] -RDR 2.2.2.2 4500 <- -> 1.1.2.3 4500 [3.3.3.1 6700] - -Hostmap table: -3.3.3.1,2.2.2.2 -> 4.4.4.4,0.0.0.0 (use = 1) -List of active state sessions: -4:udp src:3.3.3.1,6700 dst:2.2.2.2,4500 24 - FWD: IN pkts 1 bytes 28 OUT pkts 1 bytes 28 - REV: IN pkts 1 bytes 28 OUT pkts 1 bytes 28 - tag 0 pass 0x2008402 = pass in keep state - interfaces: in X[le0],X[hme0] out X[ppp0],X[bge0] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in all -1 pass in on le0,hme0 to ppp0:3.3.3.254 out-via ppp0,bge0 inet proto udp from any to any keep state -Rules configured (set 0, out) -0 block out all -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni3 b/contrib/ipfilter/test/expected/ni3 deleted file mode 100644 index 107d5d9..0000000 --- a/contrib/ipfilter/test/expected/ni3 +++ /dev/null @@ -1,7 +0,0 @@ -4500 003c 0000 4000 ff06 67a8 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 --git a/contrib/ipfilter/test/expected/ni4 b/contrib/ipfilter/test/expected/ni4 deleted file mode 100644 index 627aa19..0000000 --- a/contrib/ipfilter/test/expected/ni4 +++ /dev/null @@ -1,7 +0,0 @@ -4500 003c 0000 4000 ff06 67a8 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 acac 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 --git a/contrib/ipfilter/test/expected/ni5 b/contrib/ipfilter/test/expected/ni5 deleted file mode 100644 index 14d9837..0000000 --- a/contrib/ipfilter/test/expected/ni5 +++ /dev/null @@ -1,96 +0,0 @@ -4500 002c 0000 4000 ff06 02fc 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 0001 4000 ff06 02ff 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 - -ipf_p_ftp_servert_valid:i(0) < 5 -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 0002 4000 ff06 02fe 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000 - -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 0003 4000 ff06 02fd 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 - -4500 0038 0004 4000 ff06 02ec 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 0005 4000 ff06 02fb 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5010 269c 5966 0000 - -4500 0036 0006 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9d9 3786 77ef 5018 269c 373f 0000 5041 5353 2061 7661 6c6f 6e40 0d0a - -ipf_p_ftp_servert_valid:i(0) < 5 -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 0007 4000 ff06 02f9 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 0008 4000 ff06 02f8 0101 0101 96cb e002 8032 0015 bd6b c9e7 3786 7897 5010 269c 58b0 0000 - -4500 0030 0009 4000 ff06 02ef 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 000a 4000 ff06 02f6 0101 0101 96cb e002 8032 0015 bd6b c9ef 3786 78a7 5010 269c 5898 0000 - -4500 003d 000b 4000 ff06 02e0 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 000c 4000 ff06 02ec 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 000d 4000 ff06 02ed 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 000e 4000 ff06 02ee 0101 0101 96cb e002 8033 0014 bd78 5c12 d9f8 11d5 6012 02f8 96de 0000 0204 0584 - -4500 0028 ffe8 4000 ef06 536d 96cb e002 c0a8 0103 0014 8033 d9f8 11d5 bd78 5c13 5010 269c cb1d 0000 - -4500 005d ffe9 4000 ef06 5337 96cb e002 c0a8 0103 0015 8032 3786 78d5 bd6b ca1a 5018 269c eed0 0000 3135 3020 4f70 656e 696e 6720 4153 4349 4920 6d6f 6465 2064 6174 6120 636f 6e6e 6563 7469 6f6e 2066 6f72 202f 6269 6e2f 6c73 2e0d 0a - -4500 0028 000f 4000 ff06 02f1 0101 0101 96cb e002 8033 0014 bd78 5c13 d9f8 11d5 5010 6348 4e1b 0000 - -4500 003d 0010 4000 ff06 02db 0101 0101 96cb e002 8032 0015 bd6b ca12 3786 78d5 5018 269c 4a16 0000 504f 5254 2031 2c31 2c31 2c31 2c31 3238 2c35 320d 0a - -4500 0046 ffea 4000 ef06 534d 96cb e002 c0a8 0103 0015 8032 3786 78d5 bd6b ca37 5018 269c db6a 0000 3230 3020 504f 5254 2063 6f6d 6d61 6e64 2073 7563 6365 7373 6675 6c2e 0d0a - -4500 0030 0011 4000 ff06 02e7 0101 0101 96cb e002 8032 0015 bd6b ca27 3786 78f3 5018 269c 861a 0000 5459 5045 2041 0d0a - -4500 0038 ffeb 4000 ef06 535a 96cb e002 c0a8 0103 0015 8032 3786 78f3 bd6b ca3f 5018 269c 5ef2 0000 3230 3020 5479 7065 206f 6b61 793e 0d0a - -4500 002e 0012 4000 ff06 02e8 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 7903 5018 269c a943 0000 4e4c 5354 0d0a - -4500 002c ffec 4000 ef06 5365 96cb e002 c0a8 0103 0014 8034 d9f8 11d4 0000 0000 6002 2238 d18f 0000 0204 0584 - -4500 002c 0013 4000 ff06 02e9 0101 0101 96cb e002 8034 0014 bd78 5c12 d9f8 11d5 6012 02f8 96dd 0000 0204 0584 - -4500 0028 ffec 4000 ef06 5369 96cb e002 c0a8 0103 0014 8034 d9f8 11d4 0000 0000 5010 2238 e90d 0000 - -0 -0 -0 -0 -0 -0 -4500 0040 fff0 4000 ef06 534d 96cb e002 c0a8 0103 0015 8032 3786 7903 bd6b ca3f 5018 269c 7c80 0000 3232 3620 4c69 7374 696e 6720 636f 6d70 6c65 7465 642e 0d0a - -4500 0028 0014 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 791b 5010 269c 57e4 0000 - -4500 002e 0015 4000 ff06 02e5 0101 0101 96cb e002 8032 0015 bd6b ca2f 3786 791b 5018 269c b022 0000 5155 4954 0d0a - -4500 0036 fff2 4000 ef06 5355 96cb e002 c0a8 0103 0015 8032 3786 791b bd6b ca45 5018 269c a936 0000 3232 3120 476f 6f64 6279 652e 0d0a - -4500 0028 0016 4000 ff06 02ea 0101 0101 96cb e002 8032 0015 bd6b ca35 3786 7929 5011 269c 57cf 0000 - -0 -0 -0 -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni6 b/contrib/ipfilter/test/expected/ni6 deleted file mode 100644 index e70412b..0000000 --- a/contrib/ipfilter/test/expected/ni6 +++ /dev/null @@ -1,63 +0,0 @@ -< nf0 ip #52618 84(20) 17 192.168.6.1,32885 > 192.168.7.1,111 -> qfe0 ip #0 84(20) 17 192.168.7.2,32885 > 192.168.7.1,111 -< qfe0 ip #52611 56(20) 17 192.168.7.1,111 > 192.168.6.1,32885 -> nf0 ip #1 56(20) 17 192.168.6.2,111 > 192.168.6.1,32885 -< nf0 ip #54694 68(20) 17 192.168.6.1,32991 > 192.168.7.1,2049 -> qfe0 ip #2 68(20) 17 192.168.7.2,32991 > 192.168.7.1,2049 -< qfe0 ip #0 52(20) 17 192.168.7.1,2049 > 192.168.6.1,32991 -> nf0 ip #3 52(20) 17 192.168.6.2,2049 > 192.168.6.1,32991 -List of active MAP/Redirect filters: -rdr nf0 192.168.6.2/32 port 111 -> 192.168.7.1/32 port 111 udp proxy rpcbu -rdr nf0 192.168.6.2/32 port 111 -> 192.168.7.1/32 port 111 tcp proxy rpcbt -map qfe0 192.168.6.0/24 -> 192.168.7.2/32 - -List of active sessions: -MAP 192.168.6.1 32991 <- -> 192.168.7.2 32991 [192.168.7.1 2049] -RDR 192.168.7.1 2049 <- -> 192.168.6.2 2049 [192.168.6.1 32991] -RDR CLONE 192.168.7.1 2049 <- -> 192.168.6.2 2049 [192.168.6.1 0] -MAP 192.168.6.1 32885 <- -> 192.168.7.2 32885 [192.168.7.1 111] -RDR 192.168.7.1 111 <- -> 192.168.6.2 111 [192.168.6.1 32885] - proxy active - -Hostmap table: -192.168.6.1,192.168.7.1 -> 192.168.7.2,0.0.0.0 (use = 2) -List of active state sessions: -4:udp src:192.168.6.1,32991 dst:192.168.7.1,2049 24 - FWD: IN pkts 2 bytes 96 OUT pkts 1 bytes 68 - REV: IN pkts 1 bytes 52 OUT pkts 1 bytes 52 - tag 0 pass 0x502 = pass in quick keep state - interfaces: in X[nf0],X[qfe0] out X[qfe0],X[nf0] - Sync status: not synchronized -4:udp src:192.168.6.1,* dst:192.168.7.1,2049 240 CLONE - FWD: IN pkts 1 bytes 28 OUT pkts 0 bytes 0 - REV: IN pkts 0 bytes 0 OUT pkts 0 bytes 0 - tag 0 pass 0x502 = pass in quick keep state - interfaces: in X[nf0],X[] out X[],X[] - Sync status: not synchronized -4:udp src:192.168.6.1,32885 dst:192.168.7.1,111 24 - FWD: IN pkts 1 bytes 84 OUT pkts 1 bytes 84 - REV: IN pkts 1 bytes 56 OUT pkts 1 bytes 56 - tag 0 pass 0x2008502 = pass in quick keep state - interfaces: in X[nf0],X[qfe0] out X[qfe0],X[nf0] - Sync status: not synchronized -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -0 pass in quick on nf0 proto tcp from any to any port = 111 flags S/FSRPAU keep state -1 pass in quick on nf0 proto udp from any to any port = 111 keep state -0 block return-rst in log quick on nf0 proto tcp from any to any -0 block in log quick on nf0 inet from 192.168.7.0/24 to any -0 block return-rst in log quick on qfe0 proto tcp from any to any -0 block in log quick on qfe0 inet from 192.168.6.0/24 to any -Rules configured (set 0, out) -0 block out log quick on qfe0 inet from 192.168.7.0/24 to any -0 block out log quick on nf0 inet from 192.168.6.0/24 to any -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni7 b/contrib/ipfilter/test/expected/ni7 deleted file mode 100644 index 38c39ab..0000000 --- a/contrib/ipfilter/test/expected/ni7 +++ /dev/null @@ -1,5 +0,0 @@ -4500 0028 4706 4000 0111 1eac 0404 0404 0606 0606 afc9 829e 0014 6308 0402 0000 3be5 468d 000a cfc3 - -4500 0038 0000 0000 ff01 afb9 0202 0202 0404 0404 0b00 f91c 0000 0000 4500 0028 4706 4000 0111 26b4 0404 0404 0202 0202 afc9 829e 0014 c966 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni8 b/contrib/ipfilter/test/expected/ni8 deleted file mode 100644 index e0d5182..0000000 --- a/contrib/ipfilter/test/expected/ni8 +++ /dev/null @@ -1,9 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 a7b9 0a02 0202 0404 0404 0303 a7fc 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 - -4500 0058 0001 0000 ff01 a798 0a02 0202 0404 0404 0303 1137 0000 0000 4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0002 0000 ff01 abb3 0303 0303 0505 0505 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/ni9 b/contrib/ipfilter/test/expected/ni9 deleted file mode 100644 index 1eb6fbc..0000000 --- a/contrib/ipfilter/test/expected/ni9 +++ /dev/null @@ -1,9 +0,0 @@ -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0000 0000 ff01 adb7 0303 0303 0404 0404 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 - -4500 0058 0001 0000 ff01 ad96 0303 0303 0404 0404 0303 0735 0000 0000 4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -4500 0038 0002 0000 ff01 abb3 0303 0303 0505 0505 0303 0fa3 0000 0000 4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 - -------------------------------- diff --git a/contrib/ipfilter/test/expected/p1 b/contrib/ipfilter/test/expected/p1 deleted file mode 100644 index 58dc681..0000000 --- a/contrib/ipfilter/test/expected/p1 +++ /dev/null @@ -1,30 +0,0 @@ -nomatch -pass -nomatch -nomatch -nomatch -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=ipf type=tree number=100 - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; ef00::5/128; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in from pool/100 to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p10 b/contrib/ipfilter/test/expected/p10 deleted file mode 100644 index 9f09502..0000000 --- a/contrib/ipfilter/test/expected/p10 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.9,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.9 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.5 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.5 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.9 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.4 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.9 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.2 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.9 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p11 b/contrib/ipfilter/test/expected/p11 deleted file mode 100644 index e907fbb..0000000 --- a/contrib/ipfilter/test/expected/p11 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.5,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.5 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.5 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.5 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.5 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.5 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.5 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.5 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.5 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.5 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.5 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p12 b/contrib/ipfilter/test/expected/p12 deleted file mode 100644 index d097d51..0000000 --- a/contrib/ipfilter/test/expected/p12 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.5,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.5 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.9 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.9 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.4 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.9 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.4 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.4 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.5 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p13 b/contrib/ipfilter/test/expected/p13 deleted file mode 100644 index aa529ea..0000000 --- a/contrib/ipfilter/test/expected/p13 +++ /dev/null @@ -1,30 +0,0 @@ -nomatch -pass -nomatch -nomatch -nomatch -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=all type=tree number=100 - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; ef00::5/128; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -2 pass in from pool/100 to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p2 b/contrib/ipfilter/test/expected/p2 deleted file mode 100644 index 5388742..0000000 --- a/contrib/ipfilter/test/expected/p2 +++ /dev/null @@ -1,35 +0,0 @@ -block -nomatch -pass -nomatch -nomatch -nomatch -nomatch -pass -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -# 'anonymous' table refs 2 -table role=ipf type=hash number=2147483650 size=3 - { 127.0.0.1/32; 4.4.0.0/16; }; -# 'anonymous' table refs 2 -table role=ipf type=hash number=2147483649 size=3 - { 127.0.0.1/32; 4.4.0.0/16; }; -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in from hash/2147483650 to any -Rules configured (set 0, out) -2 pass out from hash/2147483649 to any -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p3 b/contrib/ipfilter/test/expected/p3 deleted file mode 100644 index c1e0343..0000000 --- a/contrib/ipfilter/test/expected/p3 +++ /dev/null @@ -1,45 +0,0 @@ -pass -nomatch -nomatch -nomatch -nomatch -pass -block -nomatch -nomatch -pass -nomatch -block -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -group-map out role=ipf number=2010 size=5 - { 2.2.2.2/32, group=2020; 4.4.0.0/16, group=2020; 5.0.0.0/8, group=2040; }; -group-map in role=ipf number=1010 size=3 - { 1.1.1.1/32, group=1020; 3.3.0.0/16, group=1030; }; -List of groups configured (set 0) -Dev.0. Group 1020 Ref 2 Flags 0x8000 -2 pass in all group 1020 -Dev.0. Group 1030 Ref 2 Flags 0x8000 -2 block in all group 1030 -Dev.0. Group 2020 Ref 3 Flags 0x4000 -4 pass out all group 2020 -Dev.0. Group 2040 Ref 2 Flags 0x4000 -2 block out all group 2040 -List of groups configured (set 1) -Rules configured (set 0, in) -6 call now srcgrpmap/1010 in all -Rules configured (set 0, out) -6 call now dstgrpmap/2010 out all -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p4 b/contrib/ipfilter/test/expected/p4 deleted file mode 100644 index e7aa73f..0000000 --- a/contrib/ipfilter/test/expected/p4 +++ /dev/null @@ -1,38 +0,0 @@ -< anon0 ip #0 20(20) 0 127.0.0.1 > 127.0.0.1 -< anon0 ip #0 20(20) 0 1.1.1.1 > 1.2.1.1 -> anon0 ip #0 20(20) 0 127.0.0.1 > 127.0.0.1 -> anon0 ip #0 20(20) 0 1.2.3.4 > 1.2.1.1 -< anon0 ip #0 20(20) 0 2.3.0.1 > 1.2.1.1 -< anon0 ip #0 20(20) 0 2.2.2.1 > 1.2.1.1 -< anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.1 -15 -> anon0 ip #0 20(20) 0 1.2.3.4 > 1.2.1.2 -> anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.1 -> anon0 ip #0 20(20) 0 2.2.0.1 > 1.2.1.3 -> anon0 ip #0 20(20) 0 4.4.1.1 > 1.2.1.1 -List of active MAP/Redirect filters: -map * from pool/100 to 0/0 -> 1.2.3.4/32 - -List of active sessions: -MAP 2.2.2.1 <- -> 1.2.3.4 [1.2.1.2] -MAP 1.1.1.1 <- -> 1.2.3.4 [1.2.1.1] - -Hostmap table: -2.2.2.1,1.2.1.2 -> 1.2.3.4,0.0.0.0 (use = 1) -1.1.1.1,1.2.1.1 -> 1.2.3.4,0.0.0.0 (use = 1) -List of active state sessions: -List of configured pools -table role=nat type=tree number=100 - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p5 b/contrib/ipfilter/test/expected/p5 deleted file mode 100644 index b56c3bc..0000000 --- a/contrib/ipfilter/test/expected/p5 +++ /dev/null @@ -1,21 +0,0 @@ -nomatch -pass -nomatch -nomatch -nomatch -pass -nomatch -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=ipf type=tree name=letters - { 1.1.1.1/32; ! 2.2.0.0/16; 2.2.2.0/24; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p6 b/contrib/ipfilter/test/expected/p6 deleted file mode 100644 index 413f94b..0000000 --- a/contrib/ipfilter/test/expected/p6 +++ /dev/null @@ -1,24 +0,0 @@ -block -nomatch -List of active MAP/Redirect filters: - -List of active sessions: - -Hostmap table: -List of active state sessions: -List of configured pools -table role=ipf type=tree name=microsoft - { 131.107.0.0/16; 192.92.90.0/24; 198.105.232.0/22; 204.231.58.0/24; 204.140.77.0/24; 204.140.80.0/22; 199.60.28.0/24; 199.103.90.0/23; 199.103.122.0/24; 204.79.101.0/24; 192.237.67.0/24; 198.137.97.0/24; 204.79.135.0/24; 204.79.179.0/24; 204.79.180.0/23; 204.79.188.0/24; 204.79.7.0/24; 204.79.27.0/24; 198.180.74.0/23; 204.231.236.0/24; 205.163.63.0/24; 205.163.62.0/24; 205.163.144.0/20; 205.248.50.0/23; 205.248.72.0/24; 205.248.212.0/22; 205.248.228.0/24; 205.248.235.0/24; 204.231.76.0/24; 204.231.192.0/24; 207.78.80.0/24; 207.78.81.0/24; 207.78.82.0/24; 207.117.3.0/24; 207.18.117.0/24; 208.139.27.0/24; 209.28.213.0/24; 207.209.68.0/24; 204.95.96.0/20; 207.158.93.192/27; 207.240.123.192/27; 208.26.205.0/24; 192.197.157.0/24; 204.133.231.0/24; 216.72.96.0/22; 207.229.166.152/29; 204.95.149.0/24; 209.192.213.72/29; 206.73.203.0/24; 206.73.118.0/24; 208.45.54.16/29; 208.45.54.8/29; 206.73.31.0/24; 63.161.50.128/25; 63.161.50.0/25; 207.240.8.224/28; 208.45.89.248/29; 206.182.69.0/24; 206.182.240.0/24; 206.182.241.0/24; 206.73.67.0/24; 206.182.251.0/24; 206.182.247.0/24; 206.182.236.0/24; 63.236.198.64/29; 63.236.198.152/29; 165.121.253.232/29; 63.236.170.64/29; 63.236.186.64/29; 63.236.187.104/29; 63.236.187.128/29; 63.236.187.160/29; 199.2.137.0/24; 216.222.104.224/28; 63.151.87.64/29; 64.77.82.96/29; 64.77.93.80/28; 65.52.0.0/14; 207.46.0.0/16; 204.182.144.0/20; 206.107.34.0/24; 205.240.158.0/23; 204.79.252.0/24; 64.200.211.16/28; 12.178.163.0/27; 69.44.126.80/28; 63.173.42.128/25; 12.28.108.0/25; 65.170.29.0/29; 67.132.133.96/29; 8.6.176.0/24; 63.148.123.240/29; 64.41.193.0/24; 64.85.70.32/28; 64.85.81.96/29; 64.85.81.104/29; 216.32.168.224/27; 206.79.74.32/28; 216.32.175.224/27; 216.32.180.0/22; 216.33.229.224/27; 216.33.236.0/22; 216.33.240.0/22; 216.32.240.0/22; 216.34.51.0/24; 209.1.112.0/24; 209.1.113.0/24; 209.1.15.0/24; 216.34.53.176/28; 216.35.8.224/28; 209.185.128.0/22; 65.114.175.128/27; 64.15.229.96/27; 64.15.177.0/24; 64.15.170.192/29; 209.143.238.0/24; 64.15.178.0/24; 66.35.209.120/29; 66.35.211.128/26; 66.35.208.48/28; 216.33.148.0/22; 216.35.66.88/29; 12.230.32.160/29; 12.53.124.0/27; 12.232.18.96/27; 12.190.158.0/24; 12.71.196.32/28; 209.240.192.0/19; 70.37.128.0/23; 70.37.135.0/24; 12.49.87.192/26; 74.93.205.144/29; 74.93.205.152/29; 74.93.206.64/29; 70.89.139.120/29; 206.71.119.0/24; 206.71.117.0/24; 206.71.118.0/24; 209.154.155.112/29; 65.68.62.152/29; 67.39.208.168/29; 65.242.67.0/24; 204.71.191.0/24; 63.194.155.144/29; 66.136.85.192/29; 64.124.184.72/29; 216.200.206.0/24; 63.80.93.0/25; 67.192.225.208/28; 69.74.162.0/24; 65.221.5.0/24; 65.248.85.0/24; 199.243.157.192/27; 199.243.157.112/29; 65.194.210.224/27; 208.194.139.0/24; 208.204.49.128/25; 208.205.26.0/24; 208.217.184.0/22; 208.222.172.0/24; 208.224.200.64/27; 208.229.100.0/23; 208.241.19.0/28; 208.241.19.16/28; 208.241.9.224/28; 208.244.108.0/28; 208.245.16.0/27; 208.249.17.160/28; 63.104.216.0/25; 63.69.245.0/24; 68.90.141.72/29; 63.198.123.160/29; 68.248.48.64/29; 68.248.48.72/29; 99.49.8.248/29; 65.38.172.72/29; 65.38.172.96/28; 75.149.174.16/29; 75.151.100.240/28; 64.81.8.96/27; 67.112.255.144/29; 63.240.201.176/28; 206.16.209.208/28; 63.240.195.208/28; 206.16.204.64/28; 206.16.223.0/24; 63.240.216.0/22; 63.240.220.0/22; 206.16.246.24/29; 63.240.195.192/28; 206.16.224.160/27; 67.192.39.48/28; 72.32.240.160/28; 72.32.201.152/29; 67.39.81.152/29; 69.20.127.32/29; 216.52.28.0/24; 70.42.230.0/23; 63.251.97.0/24; 67.120.132.128/29; 67.120.132.152/29; 67.120.132.192/28; }; -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -1 block in from pool/microsoft to any -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p7 b/contrib/ipfilter/test/expected/p7 deleted file mode 100644 index 89bfc11..0000000 --- a/contrib/ipfilter/test/expected/p7 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.4,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.4 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.2 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.9 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.5 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.2 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.9 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.5 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.4 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/expected/p9 b/contrib/ipfilter/test/expected/p9 deleted file mode 100644 index 89bfc11..0000000 --- a/contrib/ipfilter/test/expected/p9 +++ /dev/null @@ -1,40 +0,0 @@ -< bge0 ip #0 40(20) 6 5.5.5.5,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.5.6,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.5.7,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.5.8,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.5.9,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.5,10000 > 1.1.1.4,80 -< bge0 ip #0 40(20) 6 5.5.6.6,10000 > 1.1.1.5,80 -< bge0 ip #0 40(20) 6 5.5.6.7,10000 > 1.1.1.9,80 -< bge0 ip #0 40(20) 6 5.5.6.8,10000 > 1.1.1.2,80 -< bge0 ip #0 40(20) 6 5.5.6.9,10000 > 1.1.1.4,80 -List of active MAP/Redirect filters: -rewrite in on bge0 proto tcp from 0/0 to 0/0 port = 80 -> src 0/0 dst dstlist/servers; - -List of active sessions: -RWR-RDR 5.5.6.9 10000 9.9.9.9 80 <- -> 5.5.6.9 10000 1.1.1.4 80 -RWR-RDR 5.5.6.8 10000 9.9.9.9 80 <- -> 5.5.6.8 10000 1.1.1.2 80 -RWR-RDR 5.5.6.7 10000 9.9.9.9 80 <- -> 5.5.6.7 10000 1.1.1.9 80 -RWR-RDR 5.5.6.6 10000 9.9.9.9 80 <- -> 5.5.6.6 10000 1.1.1.5 80 -RWR-RDR 5.5.6.5 10000 9.9.9.9 80 <- -> 5.5.6.5 10000 1.1.1.4 80 -RWR-RDR 5.5.5.9 10000 9.9.9.9 80 <- -> 5.5.5.9 10000 1.1.1.2 80 -RWR-RDR 5.5.5.8 10000 9.9.9.9 80 <- -> 5.5.5.8 10000 1.1.1.9 80 -RWR-RDR 5.5.5.7 10000 9.9.9.9 80 <- -> 5.5.5.7 10000 1.1.1.5 80 -RWR-RDR 5.5.5.6 10000 9.9.9.9 80 <- -> 5.5.5.6 10000 1.1.1.4 80 -RWR-RDR 5.5.5.5 10000 9.9.9.9 80 <- -> 5.5.5.5 10000 1.1.1.2 80 - -Hostmap table: -List of active state sessions: -List of configured pools -List of configured hash tables -List of groups configured (set 0) -List of groups configured (set 1) -Rules configured (set 0, in) -Rules configured (set 0, out) -Rules configured (set 1, in) -Rules configured (set 1, out) -Accounting rules configured (set 0, in) -Accounting rules configured (set 0, out) -Accounting rules configured (set 1, in) -Accounting rules configured (set 1, out) -------------------------------- diff --git a/contrib/ipfilter/test/h4to6 b/contrib/ipfilter/test/h4to6 deleted file mode 100644 index e31f7c4..0000000 --- a/contrib/ipfilter/test/h4to6 +++ /dev/null @@ -1,135 +0,0 @@ -@P=(); -$line = 0; -while (<>) { - s/\=192.168.1.188/\=c0a8:0100::bc/g; - s/\=192.168.1.188/\=c0a8:0100::bc/g; - @F = split; - if (/^#/) { - @P[$nline++] = join(" ",@F); - next; - } - $line = 0 if (/^\[/); - if ($line == 1) { - $len = hex($F[1]) - 20; - $pr = hex($F[4]) & 0xff; - $pr = 58 if ($pr == 1); - $ttl = hex($F[4]) >> 8; - &replaceip($_, $len, $pr, $ttl); - $ipline = $nline; - $err = 0; - } elsif ($line == 2) { - if ($pr == 58) { - # - # Map the ICMP type codes from IPv4 to IPv6 - # and update the checksum to compensate. - # - if ($F[0] =~ /^0800/) { - $F[0] =~ s/^0800/8000/; - $d = 0x7800; - } - if ($F[0] =~ /^0000/) { - $F[0] =~ s/^0000/8100/; - $d = 0x8100; - } - if ($F[0] =~ /^0304/) { - $F[0] =~ s/^0304/0200/; - $d = 0xfefc; - $err = 1; - } - if ($F[0] =~ /^03/) { - $F[0] =~ s/^03/01/; - $d = 0xfe00; - $err = 1; - } - if ($F[0] =~ /^0b/) { - $F[0] =~ s/^0b/03/; - $d = 0xf800; - $err = 1; - } - if ($F[0] =~ /^0c/) { - $F[0] =~ s/^0c/04/; - $d = 0xf800; - $err = 1; - } - $F[1] = sprintf "%04x", hex($F[1]) - $d; - } - @P[$nline++] = join(" ",@F); - } elsif ($line == 3) { - if ($pr == 58 && $err == 1 && $F[0] =~ /^45/) { - local($l) = hex($F[1]) - 20; - local($p) = hex($F[4]) & 0xff; - $p = 58 if ($p == 1); - local($t) = hex($F[4]) >> 8; - &replaceip(join(" ", @F), $l, $p, $t); - @H = split(/ /, $P[$ipline]); - $H[2] += 20; - $P[$ipline] = join(" ",@H); - } else { - @P[$nline++] = join(" ",@F); - } - } else { - @P[$nline++] = join(" ",@F); - } - $line++; -} - -for ($li = 0; $li < $nline; $li++) { - print "$P[$li]\n"; -} - -exit(0); - -sub replaceip { - local(@G) = split(/\s/,$_[0]); - local($p) = ""; - - $p = sprintf "6000 0000 %04x %02x%02x", $_[1], $_[2], $_[3]; - if ($G[6] =~ /^c0a8/) { - $fmt = " %02x%02x %02x00 0000 0000 0000 0000 0000 00%02x"; - } else { - if ($G[6] =~ /^0[4a]../) { - $fmt = " 00%02x 00%02x 00%02x 0000 0000 0000 0000 00%02x"; - } else { - $fmt = " 00%02x 0000 0000 0000 0000 00%02x 00%02x 00%02x"; - } - if ($G[6] =~ /^0a/) { - $G[6] =~ s/^0a/10/; - } - if ($G[6] =~ /0a$/) { - $G[6] =~ s/0a$/10/; - } - if ($G[7] =~ /^0a/) { - $G[7] =~ s/^0a/10/; - } - if ($G[7] =~ /0a$/) { - $G[7] =~ s/0a$/10/; - } - } - $p = $p.sprintf $fmt, hex($G[6]) >> 8, hex($G[6]) & 0xff, - hex($G[7]) >> 8, hex($G[7]) & 0xff; - - if ($G[6] =~ /^c0a8/) { - $fmt = " %02x%02x %02x00 0000 0000 0000 0000 0000 00%02x"; - } else { - if ($G[8] =~ /^0[4a]../) { - $fmt = " 00%02x 00%02x 00%02x 0000 0000 0000 0000 00%02x"; - } else { - $fmt = " 00%02x 0000 0000 0000 0000 00%02x 00%02x 00%02x"; - } - if ($G[8] =~ /^0a/) { - $G[8] =~ s/^0a/10/; - } - if ($G[8] =~ /0a$/) { - $G[8] =~ s/0a$/10/; - } - if ($G[9] =~ /^0a/) { - $G[9] =~ s/^0a/10/; - } - if ($G[9] =~ /0a$/) { - $G[9] =~ s/0a$/10/; - } - } - $p = $p.sprintf $fmt, hex($G[8]) >> 8, hex($G[8]) & 0xff, - hex($G[9]) >> 8, hex($G[9]) & 0xff; - $P[$nline++] = $p; -} diff --git a/contrib/ipfilter/test/i4to6 b/contrib/ipfilter/test/i4to6 deleted file mode 100644 index b1208fd..0000000 --- a/contrib/ipfilter/test/i4to6 +++ /dev/null @@ -1,12 +0,0 @@ -sed \ --e 's/in /in6 /g' \ --e 's/icmp/58/g' \ --e 's/out /out6 /g' \ --e 's/10\.4\.\([0-9]\)\.\([0-9]\)/10:4:\1::\2/g' \ --e 's/10\.3\.4\.\([0-9]\)/10::3:4:\1/g' \ --e 's/10\.3\.\([0-9]\)\.\([0-9]\)/10:3:\1::\2/g' \ --e 's/10\.1\.\([0-9]\)\.\([0-9]\)/10:1:\1::\2/g' \ --e 's/10\.2\.\([0-9]\)\.\([0-9]\)/10::2:\1:\2/g' \ --e 's/9\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/9:\1:\2::\3/g' \ --e 's/5\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/5:\1::\2:\3/g' \ --e 's/2\.\([0-9]\)\.\([0-9]\)\.\([0-9]\)/2::\1:\2:\3/g' diff --git a/contrib/ipfilter/test/input/f1 b/contrib/ipfilter/test/input/f1 deleted file mode 100644 index 7c3ae8a..0000000 --- a/contrib/ipfilter/test/input/f1 +++ /dev/null @@ -1,4 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f10 b/contrib/ipfilter/test/input/f10 deleted file mode 100644 index 254cee7..0000000 --- a/contrib/ipfilter/test/input/f10 +++ /dev/null @@ -1,6 +0,0 @@ -in 1.1.1.1 2.1.1.1 opt lsrr -in 1.1.1.1 2.1.1.1 -in 1.1.1.1 2.1.1.1 opt ts -in 1.1.1.1 2.1.1.1 opt sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt ssrr,sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt sec diff --git a/contrib/ipfilter/test/input/f11 b/contrib/ipfilter/test/input/f11 deleted file mode 100644 index d558150..0000000 --- a/contrib/ipfilter/test/input/f11 +++ /dev/null @@ -1,16 +0,0 @@ -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 S seq=1 ack=0 -in on e0 tcp 1.1.1.1,1 2.1.2.2,24 SA seq=1 ack=1 -in on e1 tcp 2.1.2.2,23 1.1.1.1,2 SA seq=101 ack=2 -in on e1 tcp 2.1.2.2,23 1.1.1.1,1 SA seq=101 ack=2 -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A seq=2 ack=102 -in on e0 tcp 1.1.1.1,1 2.1.2.2,25 A seq=2 ack=102 -in on e1 tcp 2.1.2.2,23 1.1.1.1,1 A seq=102 ack=2 -in on e1 tcp 2.1.2.2,25 1.1.1.1,1 A seq=102 ack=2 -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 FA seq=2 ack=102 -in on e0 tcp 1.1.1.1,1 2.1.2.2,23 A seq=2 ack=102 -in on e0 tcp 1.1.1.1,2 2.1.2.2,23 A seq=2 ack=102 -in on e1 udp 1.1.1.1,1 4.4.4.4,53 -in on e1 udp 2.2.2.2,2 4.4.4.4,53 -in on e0 udp 4.4.4.4,53 1.1.1.1,1 -in on e0 udp 4.4.4.4,1023 1.1.1.1,2049 -in on e0 udp 4.4.4.4,2049 1.1.1.1,1023 diff --git a/contrib/ipfilter/test/input/f12 b/contrib/ipfilter/test/input/f12 deleted file mode 100644 index 52edde1..0000000 --- a/contrib/ipfilter/test/input/f12 +++ /dev/null @@ -1,44 +0,0 @@ -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF SYN -[] -4500 0028 0000 4000 3f06 36cd 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5002 2000 86c5 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF ACK -[] -4500 0028 0000 4000 3f06 36cd 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 ACK -[] -4500 0028 0000 6000 3f06 16cd 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 -[] -4500 001c 0000 6000 3f06 16d9 0101 0101 0201 0101 -0401 0019 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 ACK -[] -4500 001c 0000 6001 3f06 16d8 0101 0101 0201 0101 -0000 0000 5010 2000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 -[] -4500 0014 0000 6000 3f11 16d6 0101 0101 0201 0101 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[] -4500 0018 0000 2000 3f11 56d2 0101 0101 0201 0101 -0035 0035 - -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 -[] -4500 001c 0000 2000 3f11 56ce 0101 0101 0201 0101 -0001 0001 0004 fadc - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[] -4500 001c 0000 2000 3f11 56ce 0101 0101 0201 0101 -0035 0035 0004 fa74 - diff --git a/contrib/ipfilter/test/input/f13 b/contrib/ipfilter/test/input/f13 deleted file mode 100644 index ccd370a..0000000 --- a/contrib/ipfilter/test/input/f13 +++ /dev/null @@ -1,95 +0,0 @@ -# This checksum is deliberately incorrect. -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF,FO=0 SYN -[in] -4500 0028 0001 4000 3f06 36cc 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 50 02 2000 86bb 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP MF ACK -[in] -4500 0024 0002 2000 3f06 56cf 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP FO=2 ACK -[in] -4500 002c 0002 0002 3f06 76c5 0101 0101 0201 0101 -0000 0000 0001 0203 0405 0607 0809 0a0b 0c0d 0e0f 1011 1213 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF MF FO=0 SYN -[in] -4500 0028 0003 6000 3f06 16ca 0101 0101 0201 0101 -0400 0019 7000 0000 0000 0000 5002 2000 16c6 0000 - -# 1.1.1.1,1025 -> 2.1.1.1,25 TTL=63 TCP DF FO=0 -[in] -4500 001c 0004 6000 3f06 16d5 0101 0101 0201 0101 -0401 0019 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 TCP DF FO=1 SYN -[in] -4500 001c 0005 6001 3f06 16d3 0101 0101 0201 0101 -0000 0000 5010 2000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP DF MF FO=0 -[in] -4500 0014 0006 6000 3f11 16d0 0101 0101 0201 0101 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[in] -4500 0018 0007 2000 3f11 56cb 0101 0101 0201 0101 -0035 0035 - -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 -[in] -4500 001c 0008 2000 3f11 56c6 0101 0101 0201 0101 -0035 0035 0004 0000 - -# 1.1.1.1,53 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 (short) -[in] -4500 0018 0008 2000 3f11 56ca 0101 0101 0201 0101 -0035 0036 - -# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 -[in] -4500 001c 0008 2000 3f11 56c6 0101 0101 0201 0101 -0015 0036 0004 0000 - -# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 TCP MF FO=0 -[in] -4500 001c 0008 2000 3f06 56d1 0101 0101 0201 0101 -0015 0036 0000 0000 0000 0000 50 02 2000 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=3 -[in] -4500 001c 0008 0003 3f11 76c3 0101 0101 0201 0101 -0000 0000 0000 0000 - -# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=1 -[in] -4500 001c 0008 0001 3f11 76c5 0101 0101 0201 0101 -0000 0000 0000 0000 - -# 2.1.1.1,53 -> 1.1.1.1,53 TTL=63 UDP -[out] -4500 001c 0008 0000 3f11 76c6 0201 0101 0101 0101 -0035 0035 0004 0000 - -# 2.1.1.1,25 -> 1.1.1.1,1014 TTL=63 TCP DF SYN-ACK -[out] -4500 0028 0003 4000 3f06 36ca 0201 0101 0101 0101 -0019 0400 0000 0001 7000 0001 5012 2000 16b4 0000 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK (OOW) -[in] -4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101 -0400 0019 0040 0000 0000 0000 5010 2000 8678 0000 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK (out-of-order) -[in] -4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101 -0400 0019 7000 0004 0000 0002 5010 2000 16b2 0000 - -# 1.1.1.1,1024 -> 2.1.1.1,25 TTL=63 TCP DF ACK -[in] -4500 0028 0003 4000 3f06 36ca 0101 0101 0201 0101 -0400 0019 7000 0001 0000 0002 5010 2000 16b5 0000 - diff --git a/contrib/ipfilter/test/input/f14 b/contrib/ipfilter/test/input/f14 deleted file mode 100644 index 16a806f..0000000 --- a/contrib/ipfilter/test/input/f14 +++ /dev/null @@ -1,5 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -in 1.1.1.2 1.2.1.1 -in 1.1.2.2 1.2.1.1 -in 1.2.2.2 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f15 b/contrib/ipfilter/test/input/f15 deleted file mode 100644 index db547cb..0000000 --- a/contrib/ipfilter/test/input/f15 +++ /dev/null @@ -1,8 +0,0 @@ -in on hme0 tcp 10.1.2.3,1200 195.134.65.10,100 S -in on hme0 tcp 10.1.2.3,1200 195.134.65.10,22 S -in on hme0 udp 10.1.2.3,1200 195.134.65.10,100 -in on hme0 udp 10.1.2.3,53 195.134.65.10,53 -in on hme0 10.1.2.3 195.134.65.10 -in on hme1 195.134.65.10 10.1.2.3 -in on hme1 udp 195.134.65.10,53 10.1.2.3,53 -in on hme1 tcp 195.134.65.10,22 10.1.2.3,1200 SA diff --git a/contrib/ipfilter/test/input/f16 b/contrib/ipfilter/test/input/f16 deleted file mode 100644 index a17f41f..0000000 --- a/contrib/ipfilter/test/input/f16 +++ /dev/null @@ -1,8 +0,0 @@ -in 2.2.2.2 5.5.5.5 -in 2.2.2.2 1.1.1.1 -in udp 4.4.4.4,110 1.1.1.1,53 -in udp 4.4.4.9,101 1.1.1.3,35 -in udp 4.4.4.8,111 1.1.1.2,53 -in tcp 4.4.4.7,220 1.1.1.1,23 -in tcp 4.4.4.6,202 1.1.1.3,22 -in tcp 4.4.4.5,222 1.1.1.2,52 diff --git a/contrib/ipfilter/test/input/f17 b/contrib/ipfilter/test/input/f17 deleted file mode 100644 index a0d44d7..0000000 --- a/contrib/ipfilter/test/input/f17 +++ /dev/null @@ -1,39 +0,0 @@ -# TCP 1.1.1.1,54076 -> 2.2.2.2,27 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 - -# TCP 2.2.2.2,27 -> 1.1.1.1,54076 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 - -# TCP 1.1.1.1,54076 -> 2.2.2.2,27 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 - -# TCP 2.2.2.2,27 -> 1.1.1.1,54076 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 - -# TCP 1.1.1.1,54076 -> 2.2.2.2,27 ACK -[out,ppp0] -4500 0028 8262 0000 4006 f268 0101 0101 -0202 0202 d33c 0019 bfd0 898a ed67 4d4e -5010 4000 1268 0000 - -# TCP 2.2.2.2,27 -> 1.1.1.1,54076 ACK+data -[in,ppp0] -4500 002a 7442 4000 2906 d786 0202 0202 -0101 0101 0019 d33c ed67 4d4e bfd0 8990 -5012 2118 2f43 0000 0203 - diff --git a/contrib/ipfilter/test/input/f18 b/contrib/ipfilter/test/input/f18 deleted file mode 100644 index 9ecbb7f..0000000 --- a/contrib/ipfilter/test/input/f18 +++ /dev/null @@ -1,4 +0,0 @@ -in on le1 1.1.1.1 3.3.3.3 -in on le1 1.1.1.1 5.5.5.5 -out on le1 2.2.2.2 4.4.4.4 -out on le1 2.2.2.2 6.6.6.6 diff --git a/contrib/ipfilter/test/input/f19 b/contrib/ipfilter/test/input/f19 deleted file mode 100644 index 6cab988..0000000 --- a/contrib/ipfilter/test/input/f19 +++ /dev/null @@ -1,4 +0,0 @@ -in tcp 127.0.0.1,1 127.0.0.1,21 S -in tcp 127.0.0.1,2 127.0.0.1,21 S -in tcp 127.0.0.1,3 127.0.0.1,21 S -in tcp 127.0.0.1,4 127.0.0.1,21 S diff --git a/contrib/ipfilter/test/input/f2 b/contrib/ipfilter/test/input/f2 deleted file mode 100644 index f4e9d23..0000000 --- a/contrib/ipfilter/test/input/f2 +++ /dev/null @@ -1,6 +0,0 @@ -in tcp 127.0.0.1,1 127.0.0.1,ftp -in tcp 1.1.1.1,1 1.2.1.1,ftp -in udp 127.0.0.1,1 127.0.0.1,21 -in udp 1.1.1.1,1 1.2.1.1,21 -in icmp 127.0.0.1 127.0.0.1 -in icmp 1.1.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f20 b/contrib/ipfilter/test/input/f20 deleted file mode 100644 index 605ba7c..0000000 --- a/contrib/ipfilter/test/input/f20 +++ /dev/null @@ -1,2 +0,0 @@ -out on de0 1.1.1.1 2.2.2.2 -out on ab0 1.1.1.1 2.2.2.2 diff --git a/contrib/ipfilter/test/input/f21 b/contrib/ipfilter/test/input/f21 deleted file mode 100644 index 1135cbd..0000000 --- a/contrib/ipfilter/test/input/f21 +++ /dev/null @@ -1,31 +0,0 @@ -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -# IP 4.4.4.4 2.2.2.2 TCP(20480,80) -[out,df0] -4500 003c 4706 4000 ff06 28aa 0404 0404 -0202 0202 5000 0050 0000 0001 0000 0000 -a002 16d0 d8e2 0000 0204 05b4 0402 080a -0047 fbb0 0000 0000 0103 0300 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[in,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) REDIRECT -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0501 9a9d 0808 0808 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 5.5.5.5 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[in,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 -0505 0505 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - diff --git a/contrib/ipfilter/test/input/f22 b/contrib/ipfilter/test/input/f22 deleted file mode 100644 index a5221c1a..0000000 --- a/contrib/ipfilter/test/input/f22 +++ /dev/null @@ -1,31 +0,0 @@ -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -# IP 4.4.4.4 2.2.2.2 TCP(20480,80) -[in,df0] -4500 003c 4706 4000 ff06 28aa 0404 0404 -0202 0202 5000 0050 0000 0001 0000 0000 -a002 16d0 d8e2 0000 0204 05b4 0402 080a -0047 fbb0 0000 0000 0103 0300 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) REDIRECT -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 -0404 0404 0501 9a9d 0808 0808 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 5.5.5.5 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) UNREACH -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 -0505 0505 0303 acab 0000 0000 4500 003c -4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 - diff --git a/contrib/ipfilter/test/input/f24 b/contrib/ipfilter/test/input/f24 deleted file mode 100644 index 030772b..0000000 --- a/contrib/ipfilter/test/input/f24 +++ /dev/null @@ -1,27 +0,0 @@ -[out,hme0] -4500 003f 6e48 0000 4011 8816 c0a8 0101 -c0a8 01fe eb22 0035 002b d9e6 4a82 0100 -0001 0000 0000 0000 0663 6f6f 6d62 7303 -616e 7503 6564 7502 6175 0000 0100 01 - -[in,hme0] -4500 004c fc96 2000 4011 d9ba c0a8 01fe -c0a8 0101 0035 eb22 00a9 d7b9 4a82 8180 -0001 0001 0003 0003 0663 6f6f 6d62 7303 -616e 7503 6564 7502 6175 0000 0100 01c0 -0c00 0100 0100 0000 3c00 0496 - -[in,hme0] -4500 004c fc96 2007 4011 d9b3 c0a8 01fe -c0a8 0101 cbe7 50c0 1300 0200 0100 0078 -8c00 0603 6e73 31c0 13c0 1300 0200 0100 -0078 8c00 0e02 6e73 0861 6465 6c61 6964 -65c0 17c0 1300 0200 0100 0078 - -[in,hme0] -4500 004d fc96 000c 4011 f9ad c0a8 01fe -c0a8 0101 8c00 0603 756e 61c0 13c0 6b00 -0100 0100 0027 5800 0496 cb16 1cc0 5100 -0100 0100 0018 4700 0481 7f28 03c0 3f00 -0100 0100 0027 5800 0496 cb01 0a - diff --git a/contrib/ipfilter/test/input/f25 b/contrib/ipfilter/test/input/f25 deleted file mode 100644 index a4e3139..0000000 --- a/contrib/ipfilter/test/input/f25 +++ /dev/null @@ -1,41 +0,0 @@ -[in,hme0]+mcast -4500 0081 b02d 0000 0411 53b1 c0a8 01eb -efff fffa 1f48 076c 006d 1bd2 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -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 - -[out,hme0] -4500 0108 7aca 0000 4011 79e1 c0a8 01fe -c0a8 01eb 076c 1f48 00f4 5218 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - -[in,hme0]+mcast -4500 0081 b02d 0000 0411 53b1 c0a8 01eb -efff fffa 1f48 076c 006d 1bd2 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -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 - diff --git a/contrib/ipfilter/test/input/f26 b/contrib/ipfilter/test/input/f26 deleted file mode 100644 index 2151f72..0000000 --- a/contrib/ipfilter/test/input/f26 +++ /dev/null @@ -1,13 +0,0 @@ -in tcp 1.1.1.1,1001 2.2.2.2,22 S -in tcp 1.1.1.1,1002 2.2.2.2,22 S -in tcp 1.1.1.1,1003 2.2.2.2,22 S -in tcp 1.1.1.1,1004 2.2.2.2,22 S -in tcp 1.1.1.2,1002 2.2.2.2,22 S -in tcp 1.1.1.3,1003 2.2.2.2,22 S -in tcp 1.1.1.4,1004 2.2.2.2,22 S -in tcp 1.1.1.2,1005 2.2.2.2,22 S -in tcp 1.1.1.3,1006 2.2.2.2,22 S -in tcp 1.1.1.4,1007 2.2.2.2,22 S -in tcp 1.1.1.2,1008 2.2.2.2,22 S -in tcp 1.1.1.3,1009 2.2.2.2,22 S -in tcp 1.1.1.4,1010 2.2.2.2,22 S diff --git a/contrib/ipfilter/test/input/f27 b/contrib/ipfilter/test/input/f27 deleted file mode 100644 index f01bf7e..0000000 --- a/contrib/ipfilter/test/input/f27 +++ /dev/null @@ -1,84 +0,0 @@ -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03e9 0016 00000000 00000000 5002 0000 -a5de 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03ea 0016 00000000 00000000 5002 0000 -a5dd 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03eb 0016 00000000 00000000 5002 0000 -a5dc 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5ca -01010101 02020202 -03ec 0016 00000000 00000000 5002 0000 -a5db 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c9 -01010102 02020202 -03ed 0016 00000000 00000000 5002 0000 -a5d9 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c8 -01010103 02020202 -03ee 0016 00000000 00000000 5002 0000 -a5d7 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c7 -01010104 02020202 -03ef 0016 00000000 00000000 5002 0000 -a5d5 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c9 -01010102 02020202 -03f0 0016 00000000 00000000 5002 0000 -a5d6 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c8 -01010103 02020202 -03f1 0016 00000000 00000000 5002 0000 -a5d4 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c7 -01010104 02020202 -03f2 0016 00000000 00000000 5002 0000 -a5d2 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c9 -01010102 02020202 -03f3 0016 00000000 00000000 5002 0000 -a5d3 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c8 -01010103 02020202 -03f4 0016 00000000 00000000 5002 0000 -a5d1 0000 - -[in,hme0] -45000028 0000 0000 FF06 b5c7 -01010104 02020202 -03f5 0016 00000000 00000000 5002 0000 -a5cf 0000 - -[in,hme0] -6000 0000 0014 06FF -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -03f6 0016 0000 0000 0000 0000 5002 0000 292a 0000 - diff --git a/contrib/ipfilter/test/input/f28 b/contrib/ipfilter/test/input/f28 deleted file mode 100644 index 8849c14..0000000 --- a/contrib/ipfilter/test/input/f28 +++ /dev/null @@ -1,7 +0,0 @@ -in on nic1 4.4.0.1 4.2.0.2 -in on nic2 4.4.1.1 4.2.1.2 -in on nic3 4.4.2.1 4.2.2.2 -in on nic0 4.4.3.1 4.2.3.2 -in on nic0 4.4.1.1 4.2.1.2 -in on nic0 4.4.2.1 4.2.2.2 -in on nic0 4.4.3.1 4.2.3.2 diff --git a/contrib/ipfilter/test/input/f29 b/contrib/ipfilter/test/input/f29 deleted file mode 100644 index 2e717af..0000000 --- a/contrib/ipfilter/test/input/f29 +++ /dev/null @@ -1,11 +0,0 @@ -in on nic1 4.4.0.1 4.2.0.2 -in on nic2 4.4.1.1 4.2.1.2 -in on nic3 4.4.2.1 4.2.2.2 -in on nic0 udp 4.4.3.1,1000 4.2.3.2,2000 -in on nic0 udp 4.4.3.1,1000 4.2.3.2,2000 -in on nic0 udp 4.4.1.1,1001 4.2.1.2,2001 -in on nic0 udp 4.4.1.1,1001 4.2.1.2,2001 -in on nic0 udp 4.4.2.1,1002 4.2.2.2,2002 -in on nic0 udp 4.4.2.1,1002 4.2.2.2,2002 -in on nic0 udp 4.4.3.1,1003 4.2.3.2,2003 -in on nic0 udp 4.4.3.1,1003 4.2.3.2,2003 diff --git a/contrib/ipfilter/test/input/f3 b/contrib/ipfilter/test/input/f3 deleted file mode 100644 index 16a806f..0000000 --- a/contrib/ipfilter/test/input/f3 +++ /dev/null @@ -1,5 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -in 1.1.1.2 1.2.1.1 -in 1.1.2.2 1.2.1.1 -in 1.2.2.2 1.2.1.1 diff --git a/contrib/ipfilter/test/input/f30 b/contrib/ipfilter/test/input/f30 deleted file mode 100644 index ebf7dc0..0000000 --- a/contrib/ipfilter/test/input/f30 +++ /dev/null @@ -1,16 +0,0 @@ -in on hme0 udp 1.1.1.1,53 2.1.1.1,53 opt lsrr -in on hme1 udp 2.1.1.1,53 1.1.1.1,53 opt ts,lsrr -in on hme1 udp 2.1.1.1,53 1.1.1.1,53 opt lsrr -in on hme0 udp 1.1.1.1,53 2.1.1.1,53 -in on hme1 udp 2.1.1.1,53 1.1.1.1,53 -in on hme0 tcp 1.1.1.1,12345 2.1.1.1,22 S opt rr -in on hme0 tcp 1.1.1.1,12345 2.1.1.1,22 S -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA opt rr,ts -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA opt rr -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12345 SA -in on hme0 tcp 1.1.1.1,12346 2.1.1.1,22 S opt sec-class=secret -in on hme0 tcp 1.1.1.1,12346 2.1.1.1,22 S -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt sec-class=topsecret -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt ts,sec-class=secret -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA opt sec-class=secret -in on hme1 tcp 2.1.1.1,22 1.1.1.1,12346 SA diff --git a/contrib/ipfilter/test/input/f4 b/contrib/ipfilter/test/input/f4 deleted file mode 100644 index 2956d1b..0000000 --- a/contrib/ipfilter/test/input/f4 +++ /dev/null @@ -1,5 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.1.1.1 -in 1.1.1.1 1.1.1.2 -in 1.1.1.1 1.1.2.2 -in 1.1.1.1 1.2.2.2 diff --git a/contrib/ipfilter/test/input/f5 b/contrib/ipfilter/test/input/f5 deleted file mode 100644 index 41600c1..0000000 --- a/contrib/ipfilter/test/input/f5 +++ /dev/null @@ -1,28 +0,0 @@ -in tcp 1.1.1.1,0 2.2.2.2,2222 -in tcp 1.1.1.1,1 2.2.2.2,2222 -in tcp 1.1.1.1,23 2.2.2.2,2222 -in tcp 1.1.1.1,21 2.2.2.2,2222 -in tcp 1.1.1.1,1023 2.2.2.2,2222 -in tcp 1.1.1.1,1024 2.2.2.2,2222 -in tcp 1.1.1.1,1025 2.2.2.2,2222 -in tcp 1.1.1.1,32767 2.2.2.2,2222 -in tcp 1.1.1.1,32768 2.2.2.2,2222 -in tcp 1.1.1.1,65535 2.2.2.2,2222 -in tcp 1.1.1.1,5999 2.2.2.2,2222 -in tcp 1.1.1.1,6000 2.2.2.2,2222 -in tcp 1.1.1.1,6009 2.2.2.2,2222 -in tcp 1.1.1.1,6010 2.2.2.2,2222 -in udp 1.1.1.1,0 2.2.2.2,2222 -in udp 1.1.1.1,1 2.2.2.2,2222 -in udp 1.1.1.1,23 2.2.2.2,2222 -in udp 1.1.1.1,21 2.2.2.2,2222 -in udp 1.1.1.1,1023 2.2.2.2,2222 -in udp 1.1.1.1,1024 2.2.2.2,2222 -in udp 1.1.1.1,1025 2.2.2.2,2222 -in udp 1.1.1.1,32767 2.2.2.2,2222 -in udp 1.1.1.1,32768 2.2.2.2,2222 -in udp 1.1.1.1,65535 2.2.2.2,2222 -in udp 1.1.1.1,5999 2.2.2.2,2222 -in udp 1.1.1.1,6000 2.2.2.2,2222 -in udp 1.1.1.1,6009 2.2.2.2,2222 -in udp 1.1.1.1,6010 2.2.2.2,2222 diff --git a/contrib/ipfilter/test/input/f6 b/contrib/ipfilter/test/input/f6 deleted file mode 100644 index 21f0be3..0000000 --- a/contrib/ipfilter/test/input/f6 +++ /dev/null @@ -1,28 +0,0 @@ -in tcp 2.2.2.2,2222 1.1.1.1,0 -in tcp 2.2.2.2,2222 1.1.1.1,1 -in tcp 2.2.2.2,2222 1.1.1.1,23 -in tcp 2.2.2.2,2222 1.1.1.1,21 -in tcp 2.2.2.2,2222 1.1.1.1,1023 -in tcp 2.2.2.2,2222 1.1.1.1,1024 -in tcp 2.2.2.2,2222 1.1.1.1,1025 -in tcp 2.2.2.2,2222 1.1.1.1,32767 -in tcp 2.2.2.2,2222 1.1.1.1,32768 -in tcp 2.2.2.2,2222 1.1.1.1,65535 -in tcp 2.2.2.2,2222 1.1.1.1,5999 -in tcp 2.2.2.2,2222 1.1.1.1,6000 -in tcp 2.2.2.2,2222 1.1.1.1,6009 -in tcp 2.2.2.2,2222 1.1.1.1,6010 -in udp 2.2.2.2,2222 1.1.1.1,0 -in udp 2.2.2.2,2222 1.1.1.1,1 -in udp 2.2.2.2,2222 1.1.1.1,23 -in udp 2.2.2.2,2222 1.1.1.1,21 -in udp 2.2.2.2,2222 1.1.1.1,1023 -in udp 2.2.2.2,2222 1.1.1.1,1024 -in udp 2.2.2.2,2222 1.1.1.1,1025 -in udp 2.2.2.2,2222 1.1.1.1,32767 -in udp 2.2.2.2,2222 1.1.1.1,32768 -in udp 2.2.2.2,2222 1.1.1.1,65535 -in udp 2.2.2.2,2222 1.1.1.1,5999 -in udp 2.2.2.2,2222 1.1.1.1,6000 -in udp 2.2.2.2,2222 1.1.1.1,6009 -in udp 2.2.2.2,2222 1.1.1.1,6010 diff --git a/contrib/ipfilter/test/input/f7 b/contrib/ipfilter/test/input/f7 deleted file mode 100644 index dbc9e33..0000000 --- a/contrib/ipfilter/test/input/f7 +++ /dev/null @@ -1,15 +0,0 @@ -in icmp 1.1.1.1 2.1.1.1 echo -in icmp 1.1.1.1 2.1.1.1 echo,1 -in icmp 1.1.1.1 2.1.1.1 echo,3 -in icmp 1.1.1.1 2.1.1.1 unreach -in icmp 1.1.1.1 2.1.1.1 unreach,1 -in icmp 1.1.1.1 2.1.1.1 unreach,3 -in icmp 1.1.1.1 2.1.1.1 echorep -in icmp 1.1.1.1 2.1.1.1 echorep,1 -in icmp 1.1.1.1 2.1.1.1 echorep,3 -in icmp 2.2.2.2 3.3.3.3 maskreq -out icmp 3.3.3.3 2.2.2.2 maskrep -in icmp 4.4.4.4 5.5.5.5 timest -out icmp 5.5.5.5 4.4.4.4 timestrep -in icmp 6.6.6.6 7.7.7.7 inforeq -out icmp 7.7.7.7 6.6.6.6 inforep diff --git a/contrib/ipfilter/test/input/f8 b/contrib/ipfilter/test/input/f8 deleted file mode 100644 index cace511..0000000 --- a/contrib/ipfilter/test/input/f8 +++ /dev/null @@ -1,6 +0,0 @@ -in tcp 1.1.1.1,1 2.1.2.2,1 S -in tcp 1.1.1.1,1 2.1.2.2,1 SA -in tcp 1.1.1.1,1 2.1.2.2,1 SF -in tcp 1.1.1.1,1 2.1.2.2,1 SFPAUR -in tcp 1.1.1.1,1 2.1.2.2,1 PAU -in tcp 1.1.1.1,1 2.1.2.2,1 A diff --git a/contrib/ipfilter/test/input/f9 b/contrib/ipfilter/test/input/f9 deleted file mode 100644 index e64e299..0000000 --- a/contrib/ipfilter/test/input/f9 +++ /dev/null @@ -1,9 +0,0 @@ -in 1.1.1.1 2.1.1.1 opt lsrr -in 1.1.1.1 2.1.1.1 opt lsrr=1.1.1.1 -in 1.1.1.1 2.1.1.1 opt lsrr,ssrr -in 1.1.1.1 2.1.1.1 opt ts -in 1.1.1.1 2.1.1.1 opt satid -in 1.1.1.1 2.1.1.1 opt satid=234 -in 1.1.1.1 2.1.1.1 opt sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt ssrr,sec-class=topsecret -in 1.1.1.1 2.1.1.1 opt sec diff --git a/contrib/ipfilter/test/input/ip2.data b/contrib/ipfilter/test/input/ip2.data deleted file mode 100644 index ef34eb5..0000000 --- a/contrib/ipfilter/test/input/ip2.data +++ /dev/null @@ -1,3 +0,0 @@ -1.1.1.1/32 -!2.2.0.0/16 -2.2.2.0/24 diff --git a/contrib/ipfilter/test/input/ipv6.1 b/contrib/ipfilter/test/input/ipv6.1 deleted file mode 100644 index 6da8da0..0000000 --- a/contrib/ipfilter/test/input/ipv6.1 +++ /dev/null @@ -1,45 +0,0 @@ -# -# traceroute simulation -# -# UDP -# -[out,gif0] 6000 0000 0018 1101 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -8083 829a -0018 -f4c1 -0000 0344 0000 0004 f8f1 9d3c ddba 0e00 - -# -# ICMPV6 -# - Time exceeded -# -[in,gif0] 6000 0000 0048 3a40 -ef00 1001 0880 6cbf 0000 0000 0000 0001 -ef00 1001 2002 0001 0000 0000 0000 0070 -0300 f86f 0000 0000 -6000 0000 0018 1101 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -8083 829a -0018 -f427 -0000 0344 0000 0004 f8f1 9d3c ddba 0e00 - -# -# ICMPV6 -# - Time exceeded -# -[in,gif0] 6000 0000 0048 3a40 -ef00 1001 0880 6cbf 0000 0000 0000 0001 -ef00 1001 2002 0001 0000 0000 0000 0070 -0300 7266 0000 0000 -6000 0000 0018 1101 -ef00 1001 2002 1001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -8083 f8a3 -0018 -f427 -0000 0344 0000 0004 f8f1 9d3c ddba 0e00 - diff --git a/contrib/ipfilter/test/input/ipv6.2 b/contrib/ipfilter/test/input/ipv6.2 deleted file mode 100644 index 8cc2d17..0000000 --- a/contrib/ipfilter/test/input/ipv6.2 +++ /dev/null @@ -1,26 +0,0 @@ -[out,de0] -6000 0000 0020 3aff ef00 0000 0000 0000 -0000 0000 0001 0013 ff02 0000 0000 0000 -0000 0001 ff01 000b 8700 ea32 0000 0000 -ef00 0000 0000 0000 0000 0000 0001 000b -0101 0048 5487 5c6f - -[in,de0] -6000 0000 0020 3aff ef00 0000 0000 0000 -0000 0000 0001 000b ef00 0000 0000 0000 -0000 0000 0001 0013 8800 5322 6000 0000 -ef00 0000 0000 0000 0000 0000 0001 000b -0201 0800 2071 cce1 - -[out,de0] -6000 0000 0010 3a40 ef00 0000 0000 0000 -0000 0000 0001 0013 ef00 0000 0000 0000 -0000 0000 0001 000b 8000 3210 06ff 0002 -9ec3 3c3c 8a82 0300 - -[in,de0] -6000 0000 0010 3aff ef00 0000 0000 0000 -0000 0000 0001 000b ef00 0000 0000 0000 -0000 0000 0001 0013 8100 3110 06ff 0002 -9ec3 3c3c 8a82 0300 - diff --git a/contrib/ipfilter/test/input/ipv6.3 b/contrib/ipfilter/test/input/ipv6.3 deleted file mode 100644 index 3b2ef4d..0000000 --- a/contrib/ipfilter/test/input/ipv6.3 +++ /dev/null @@ -1,30 +0,0 @@ -[out,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4395 3ffe 8280 0000 2001 -0000 0000 0000 4394 8000 3f77 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4393 3ffe 8280 0000 2001 -0000 0000 0000 4395 8100 3e78 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4394 3ffe 8280 0000 2001 -0000 0000 0000 4395 8300 3c77 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4394 3ffe 8280 0000 2001 -0000 0000 0000 4395 8000 3f77 085c 0038 -0c06 b73d 1b3d 0d00 - -[in,gif0] -6000 0000 0010 3a40 3ffe 8280 0000 2001 -0000 0000 0000 4394 3ffe 8280 0000 2001 -0000 0000 0000 4395 8100 3e77 085c 0038 -0c06 b73d 1b3d 0d00 - diff --git a/contrib/ipfilter/test/input/ipv6.4 b/contrib/ipfilter/test/input/ipv6.4 deleted file mode 100644 index eb986ae..0000000 --- a/contrib/ipfilter/test/input/ipv6.4 +++ /dev/null @@ -1,522 +0,0 @@ -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (0|1448) icmp6: echo request -[in,eth0] -6000 0000 05b0 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 0001 0000 0008 -8000 f400 2c0a 0001 fd38 4a42 9e59 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f - -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (1448|160) -[in,eth0] -6000 0000 00a8 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 05a8 0000 0008 -a0a1 a2a3 a4a5 a6a7 a8a9 aaab acad aeaf -b0b1 b2b3 b4b5 b6b7 b8b9 babb bcbd bebf -c0c1 c2c3 c4c5 c6c7 c8c9 cacb cccd cecf -d0d1 d2d3 d4d5 d6d7 d8d9 dadb dcdd dedf -e0e1 e2e3 e4e5 e6e7 e8e9 eaeb eced eeef -f0f1 f2f3 f4f5 f6f7 f8f9 fafb fcfd feff -0001 0203 0405 0607 0809 0a0b 0c0d 0e0f -1011 1213 1415 1617 1819 1a1b 1c1d 1e1f -2021 2223 2425 2627 2829 2a2b 2c2d 2e2f -3031 3233 3435 3637 3839 3a3b 3c3d 3e3f - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (0|1232) icmp6: echo reply -[out,eth0] -6000 0000 04d8 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 0001 9c56 86dd -8100 f300 2c0a 0001 fd38 4a42 9e59 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (1232|376) -[out,eth0] -6000 0000 0180 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 04d0 9c56 86dd -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f - -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (0|1448) icmp6: echo request -[in,eth0] -6000 0000 05b0 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 0001 0000 0009 -8000 80fb 2c0a 0002 fe38 4a42 105e 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f - -# fe80::20c:29ff:fe13:6899 > fe80::20c:29ff:fe21:5742: frag (1448|160) -[in,eth0] -6000 0000 00a8 2c40 fe80 0000 0000 0000 -020c 29ff fe13 6899 fe80 0000 0000 0000 -020c 29ff fe21 5742 3a00 05a8 0000 0009 -a0a1 a2a3 a4a5 a6a7 a8a9 aaab acad aeaf -b0b1 b2b3 b4b5 b6b7 b8b9 babb bcbd bebf -c0c1 c2c3 c4c5 c6c7 c8c9 cacb cccd cecf -d0d1 d2d3 d4d5 d6d7 d8d9 dadb dcdd dedf -e0e1 e2e3 e4e5 e6e7 e8e9 eaeb eced eeef -f0f1 f2f3 f4f5 f6f7 f8f9 fafb fcfd feff -0001 0203 0405 0607 0809 0a0b 0c0d 0e0f -1011 1213 1415 1617 1819 1a1b 1c1d 1e1f -2021 2223 2425 2627 2829 2a2b 2c2d 2e2f -3031 3233 3435 3637 3839 3a3b 3c3d 3e3f - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (0|1232) icmp6: echo reply -[out,eth0] -6000 0000 04d8 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 0001 9889 f4c1 -8100 7ffb 2c0a 0002 fe38 4a42 105e 0900 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 - -# fe80::20c:29ff:fe21:5742 > fe80::20c:29ff:fe13:6899: frag (1232|376) -[out,eth0] -6000 0000 0180 2c40 fe80 0000 0000 0000 -020c 29ff fe21 5742 fe80 0000 0000 0000 -020c 29ff fe13 6899 3a00 04d0 9889 f4c1 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f 4041 4243 4445 4647 -4849 4a4b 4c4d 4e4f 5051 5253 5455 5657 -5859 5a5b 5c5d 5e5f 6061 6263 6465 6667 -6869 6a6b 6c6d 6e6f 7071 7273 7475 7677 -7879 7a7b 7c7d 7e7f 8081 8283 8485 8687 -8889 8a8b 8c8d 8e8f 9091 9293 9495 9697 -9899 9a9b 9c9d 9e9f a0a1 a2a3 a4a5 a6a7 -a8a9 aaab acad aeaf b0b1 b2b3 b4b5 b6b7 -b8b9 babb bcbd bebf c0c1 c2c3 c4c5 c6c7 -c8c9 cacb cccd cecf d0d1 d2d3 d4d5 d6d7 -d8d9 dadb dcdd dedf e0e1 e2e3 e4e5 e6e7 -e8e9 eaeb eced eeef f0f1 f2f3 f4f5 f6f7 -f8f9 fafb fcfd feff 0001 0203 0405 0607 -0809 0a0b 0c0d 0e0f 1011 1213 1415 1617 -1819 1a1b 1c1d 1e1f 2021 2223 2425 2627 -2829 2a2b 2c2d 2e2f 3031 3233 3435 3637 -3839 3a3b 3c3d 3e3f - -# frag: [0-7:nh][8-15:res][16-31:off][32-64:id] -# Case 4: ipv6,fragment[id=10,off=0,m=1],tcp -[in,eth0] -600a af74 0038 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0001 0000 0010 -fff3 0017 52ac fbab 0000 0000 c002 8000 d36b 0000 -0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 0000 0000 - -# Case 5: ipv6,fragment[id=10,off=5,m=1],data -[in,eth0] -600a af74 0010 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0030 0000 0010 -0000 0000 0000 0000 - -# Case 3: ipv6,fragment[id=10,off=1,m=0],tcp -[in,eth0] -600a af74 0034 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0008 0000 0010 -0000 0000 b002 8000 d36b 0000 -0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 - -# Case 1: ipv6,fragment[id=11,off=0,m=1],hopopts,ah[next=dstopts] -[in,eth0] -600a af74 0020 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0000 0001 0000 0011 -3300 0000 0000 0000 -3c01 0000 0000 0000 0000 0000 0000 0000 - -# Case 2: ipv6,fragment[id=11,off=3,m=0],dstopts,hop,tcp -[in,eth0] -600a af74 002c 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -3c00 0008 0000 0011 -0000 0000 0000 0000 -0600 0000 0000 0000 -fff3 0017 52ac fbab 0000 0000 5002 8000 d36b 0000 - -# Case 4: ipv6,fragment[id=10,off=0,m=1],tcp -[out,eth0] -6000 0000 001c 2c40 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -fe80 0000 0000 0000 020c 29ff fe21 5742 -0600 0001 0000 0010 -0017 fff3 0000 0000 52ac fbac 5014 0000 cd26 0000 - -# Normal TCP Reset -[out,eth0] -6000 0000 0014 0640 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -fe80 0000 0000 0000 020c 29ff fe21 5742 -0017 fff3 0000 0000 52ac fbac 5014 0000 cd26 0000 - -# Case 4: ipv6,fragment[id=12,off=0,m=1],tcp -[in,eth0] -600a af74 0038 2c40 -fe80 0000 0000 0000 020c 29ff fe21 5742 -fe80 0000 0000 0000 020c 29ff fe6e eb5a -0600 0001 0000 0012 -fff3 0017 52ac fbab 0000 0000 c002 8000 d36b 0000 -0204 05a0 0103 0300 0402 0101 0101 080a 0000 0000 0000 0000 0000 0000 - diff --git a/contrib/ipfilter/test/input/ipv6.5 b/contrib/ipfilter/test/input/ipv6.5 deleted file mode 100644 index e46407c..0000000 --- a/contrib/ipfilter/test/input/ipv6.5 +++ /dev/null @@ -1,14 +0,0 @@ -[out,de0] -6000 0000 002c 2bff -ef00 0000 0000 0000 0000 0000 0001 0013 -ff02 0000 0000 0000 0000 0001 ff01 000b -0602 0000 0000 0000 -ff02 0000 0000 0000 0000 0001 ff01 000b -0401 0019 0000 0000 0000 0000 5002 2000 9ea3 0000 - -[out,de0] -6000 0000 0014 06ff -ef00 0000 0000 0000 0000 0000 0001 0013 -ff02 0000 0000 0000 0000 0001 ff01 000b -0401 0019 0000 0000 0000 0000 5002 2000 9ea3 0000 - diff --git a/contrib/ipfilter/test/input/ipv6.6 b/contrib/ipfilter/test/input/ipv6.6 deleted file mode 100644 index fffbad2..0000000 --- a/contrib/ipfilter/test/input/ipv6.6 +++ /dev/null @@ -1,31 +0,0 @@ -[out,gif0] -6000 0000 0020 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 0001 0000 0001 -8083 829a -0020 -f4c1 -0000 0000 0000 0000 0000 0000 0000 0000 - -[out,gif0] -6000 0000 0020 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 0008 0000 0001 -0000 0000 0000 0000 0000 0000 0000 0000 - -[out,gif0] -6000 0000 001e 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 0001 0000 0001 -0000 0000 0000 0000 0000 0000 0000 - -[out,gif0] -6000 0000 0020 2c01 -ef00 1001 2002 0001 0000 0000 0000 0070 -2001 1002 3333 0001 0000 0000 0000 0001 -1100 001c 0000 0001 -0000 0000 0000 0000 0000 0000 0000 0000 - diff --git a/contrib/ipfilter/test/input/l1 b/contrib/ipfilter/test/input/l1 deleted file mode 100644 index a59dbe3..0000000 --- a/contrib/ipfilter/test/input/l1 +++ /dev/null @@ -1,64 +0,0 @@ -# 1.1.1.1,1025 -> 2.2.2.2,25 TTL=63 TCP DF SYN -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0001 0000 0000 5002 2000 85c2 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0001 0000 0000 5010 2000 85b4 0000 - -#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 AS -[] -4500 0028 0000 4000 3f06 35cb 0202 0202 0101 0101 -0019 0401 0000 0011 0000 0002 5012 2000 85a0 0000 - -#in on e1 tcp 2.1.2.2,25 1.1.1.1,1025 A -[out,e1] 4500 0028 0000 4000 3f06 35cb 0202 0202 0101 0101 -0019 0401 0000 0012 0000 0002 5010 2000 85a1 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 AF -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0002 0000 0012 5011 2000 85a0 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0012 0000 0003 5010 2000 85a0 0000 - -#in on e0 tcp 1.1.1.1,1025 2.1.2.2,25 A -[] -4500 0028 0000 4000 3f06 35cb 0101 0101 0202 0202 -0401 0019 0000 0012 0000 0003 5010 2000 85a0 0000 - -#in on e1 udp 1.1.1.1,1 4.4.4.4,53 -[] -4500 0028 0000 4000 3f11 31bc 0101 0101 0404 0404 -0001 0035 0000 d16f 0102 0304 0506 0708 090a 0b0d - -#in on e1 udp 2.2.2.2,2 4.4.4.4,53 -[] -4500 0028 0000 4000 3f11 2fba 0202 0202 0404 0404 -0001 0035 0000 0000 0102 0304 0506 0708 090a 0b0d - -#in on e1 udp 2.2.2.2,2 4.4.4.4,53 -[] -4500 0038 0000 4000 3f11 2faa 0202 0202 0404 0404 -0001 0035 0000 d47b 0102 0304 0506 0708 090a 0b0d -0e0f 4061 4263 4465 4667 4869 4a6b 4c6d - -#in on e0 ip 4.4.4.4,53 1.1.1.1,1 -[] -4500 0014 0000 4000 3f00 2fdf 0202 0202 0404 0404 - -#in on e0 udp 3.3.3.3,1023 1.1.1.1,2049 -[] -4500 001c 0000 4000 3f11 33ca 0303 0303 0101 0101 -03ff 0801 0000 ebde - -#in on e0 udp 1.1.1.1,2049 3.3.3.3,1023 -[] -4500 001c 0000 4000 3f11 33ca 0101 0101 0303 0303 -0801 03ff 0000 0000 - diff --git a/contrib/ipfilter/test/input/n1 b/contrib/ipfilter/test/input/n1 deleted file mode 100644 index 04b24ef..0000000 --- a/contrib/ipfilter/test/input/n1 +++ /dev/null @@ -1,34 +0,0 @@ -out on zx0 255 10.1.1.0 10.1.1.2 -out on zx0 255 10.1.1.1 10.1.1.2 -out on zx0 255 10.1.1.2 10.1.1.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 255 10.2.2.1 10.1.2.1 -out on zx0 255 10.2.2.2 10.1.2.1 -in on zx0 255 10.1.1.1 10.1.1.2 -in on zx0 255 10.1.1.2 10.1.1.1 -in on zx0 255 10.2.2.1 10.2.1.1 -in on zx0 255 10.2.2.2 10.2.1.1 -in on zx0 255 10.2.2.3 10.1.1.1 -in on zx0 255 10.2.3.4 10.2.2.2 -in on zx0 255 10.1.1.1 10.2.2.2 -in on zx0 255 10.1.1.2 10.2.2.2 -in on zx0 255 10.1.1.0 10.3.4.5 -in on zx0 255 10.1.1.1 10.3.4.5 -in on zx0 255 10.1.1.2 10.3.4.5 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,1025 -out on zx0 icmp 10.1.1.1 10.4.3.2 -in on zx0 icmp 10.4.3.2 10.2.2.2 -in on zx0 icmp 10.4.3.2 10.3.4.1 -in on zx0 icmp 10.4.3.2 10.3.4.2 -in on zx0 icmp 10.4.3.2 10.3.4.3 -in on zx0 icmp 10.4.3.2 10.3.4.4 -in on zx0 icmp 10.4.3.2 10.3.4.5 -out on zx0 34 10.1.1.2 10.4.3.2 -in on zx0 34 10.4.3.2 10.3.4.4 -out on zx0 34 10.1.1.2 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.5 -out on zx0 34 10.1.1.3 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.6 -out on zx0 35 10.1.1.3 10.4.3.4 -in on zx0 35 10.4.3.4 10.3.4.7 diff --git a/contrib/ipfilter/test/input/n10 b/contrib/ipfilter/test/input/n10 deleted file mode 100644 index 1e919cc..0000000 --- a/contrib/ipfilter/test/input/n10 +++ /dev/null @@ -1,6 +0,0 @@ -# TCP SYN packet with an MSS option -[out,ppp0] -4500 002c 10c9 4000 ff06 3289 c0a8 0103 96cb e002 -8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 - diff --git a/contrib/ipfilter/test/input/n100 b/contrib/ipfilter/test/input/n100 deleted file mode 100644 index 94ff8c4..0000000 --- a/contrib/ipfilter/test/input/n100 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 255 1.1.1.1 2.3.2.3 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 255 1.1.1.2 2.2.2.3 -out on zx0 255 1.2.1.2 2.2.2.3 -out on zx0 255 1.1.1.1 2.2.2.4 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n101 b/contrib/ipfilter/test/input/n101 deleted file mode 100644 index 94ff8c4..0000000 --- a/contrib/ipfilter/test/input/n101 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 255 1.1.1.1 2.3.2.3 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 255 1.1.1.2 2.2.2.3 -out on zx0 255 1.2.1.2 2.2.2.3 -out on zx0 255 1.1.1.1 2.2.2.4 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n102 b/contrib/ipfilter/test/input/n102 deleted file mode 100644 index 94ff8c4..0000000 --- a/contrib/ipfilter/test/input/n102 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 255 1.1.1.1 2.3.2.3 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 255 1.1.1.2 2.2.2.3 -out on zx0 255 1.2.1.2 2.2.2.3 -out on zx0 255 1.1.1.1 2.2.2.4 -out on zx0 255 1.1.1.1 2.2.2.3 -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n103 b/contrib/ipfilter/test/input/n103 deleted file mode 100644 index 7957799..0000000 --- a/contrib/ipfilter/test/input/n103 +++ /dev/null @@ -1,8 +0,0 @@ -out on zx0 tcp 1.1.1.1,101 2.3.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 -out on zx0 tcp 1.1.1.1,101 2.2.2.3,203 -out on zx0 tcp 1.1.1.2,101 2.2.2.3,203 -out on zx0 tcp 10.10.10.10,101 2.2.2.3,203 -out on zx0 tcp 5.5.5.5,101 2.2.2.3,203 -in on zx0 tcp 2.2.2.3,4000 4.4.4.4,1000 -out on zx0 tcp 7.7.7.7,101 2.2.2.3,203 diff --git a/contrib/ipfilter/test/input/n104 b/contrib/ipfilter/test/input/n104 deleted file mode 100644 index bb46b28..0000000 --- a/contrib/ipfilter/test/input/n104 +++ /dev/null @@ -1,48 +0,0 @@ -[out,zx0] -4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202 -0065 00cb 0000 0001 1000 0001 5010 2000 789d 0000 - -[in,zx0] -4500 0028 0002 0000 ff06 b1c2 0606 0001 0404 0001 -0fa0 03e8 0000 0001 1000 0001 5010 2000 623f 0000 - -[out,zx0] -4500 0028 0003 0000 ff06 b5c7 0101 0101 0202 0202 -0066 00cb 0000 0001 1000 0001 5010 2000 789c 0000 - -[in,zx0] -4500 0028 0004 0000 ff06 b1bf 0606 0001 0404 0002 -0fa0 03e8 0000 0001 1000 0001 5010 2000 623e 0000 - -[out,zx0] -4500 0028 0005 0000 ff06 b5c5 0101 0101 0202 0202 -0067 00cb 0000 0001 1000 0001 5010 2000 789b 0000 - -[in,zx0] -4500 0028 0006 0000 ff06 b1bd 0606 0001 0404 0002 -0fa0 03e9 0000 0001 1000 0001 5010 2000 623d 0000 - -[out,zx0] -4500 0028 0007 0000 ff06 b5c3 0101 0101 0202 0202 -0068 00cb 0000 0001 1000 0001 5010 2000 789a 0000 - -[in,zx0] -4500 0028 0008 0000 ff06 b1ba 0606 0002 0404 0002 -0fa0 03e9 0000 0001 1000 0001 5010 2000 623c 0000 - -[out,zx0] -4500 0028 0009 0000 ff06 b5c1 0101 0101 0202 0202 -0069 00cb 0000 0001 1000 0001 5010 2000 7899 0000 - -[in,zx0] -4500 0028 000a 0000 ff06 b1b8 0606 0002 0404 0002 -0fa1 03e9 0000 0001 1000 0001 5010 2000 623b 0000 - -[out,zx0] -4500 0028 000b 0000 ff06 b5bf 0101 0101 0202 0202 -006a 00cb 0000 0001 1000 0001 5010 2000 7898 0000 - -[in,zx0] -4500 0028 000c 0000 ff06 b1b5 0606 0002 0404 0003 -0fa1 03e9 0000 0001 1000 0001 5010 2000 623a 0000 - diff --git a/contrib/ipfilter/test/input/n105 b/contrib/ipfilter/test/input/n105 deleted file mode 100644 index 63b68f0..0000000 --- a/contrib/ipfilter/test/input/n105 +++ /dev/null @@ -1,8 +0,0 @@ -[in,zx0] -4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202 -0065 0050 0000 0001 1000 0001 5010 2000 7918 0000 - -[out,zx0] -4500 0028 0001 0000 ff06 adc0 0606 0001 0404 0404 -0c38 03e8 0000 0001 1000 0001 5010 2000 61a4 0000 - diff --git a/contrib/ipfilter/test/input/n106 b/contrib/ipfilter/test/input/n106 deleted file mode 100644 index 4e93378..0000000 --- a/contrib/ipfilter/test/input/n106 +++ /dev/null @@ -1,8 +0,0 @@ -[out,zx0] -4500 0028 0001 0000 ff06 b5c9 0101 0101 0202 0202 -0065 0050 0000 0001 1000 0001 5010 2000 7918 0000 - -[in,zx0] -4500 0028 0001 0000 ff06 adc0 0606 0001 0404 0404 -0c38 03e8 0000 0001 1000 0001 5010 2000 61a4 0000 - diff --git a/contrib/ipfilter/test/input/n10_6 b/contrib/ipfilter/test/input/n10_6 deleted file mode 100644 index 5c1f5af..0000000 --- a/contrib/ipfilter/test/input/n10_6 +++ /dev/null @@ -1,6 +0,0 @@ -# TCP SYN packet with an MSS option -[out,ppp0] -6000 0000 0018 06ff c0a8 0100 0000 0000 0000 0000 0000 0003 96cb e000 0000 0000 0000 0000 0000 0002 -8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 - diff --git a/contrib/ipfilter/test/input/n11 b/contrib/ipfilter/test/input/n11 deleted file mode 100644 index 8712674..0000000 --- a/contrib/ipfilter/test/input/n11 +++ /dev/null @@ -1,16 +0,0 @@ -out on zx0 255 10.1.1.0 10.1.1.2 -out on zx0 255 10.1.1.1 10.1.1.2 -out on zx0 255 10.1.1.2 10.1.1.1 -out on zx0 255 10.2.2.1 10.1.2.1 -out on zx0 255 10.2.2.2 10.1.2.1 -in on zx0 255 10.1.1.1 10.1.1.2 -in on zx0 255 10.1.1.2 10.1.1.1 -in on zx0 255 10.2.2.1 10.2.1.1 -in on zx0 255 10.2.2.2 10.2.1.1 -in on zx0 255 10.2.2.3 10.1.1.1 -in on zx0 255 10.2.3.4 10.2.2.2 -in on zx0 255 10.1.1.1 10.2.2.2 -in on zx0 255 10.1.1.2 10.2.2.2 -in on zx0 255 10.1.1.0 10.3.4.5 -in on zx0 255 10.1.1.1 10.3.4.5 -in on zx0 255 10.1.1.2 10.3.4.5 diff --git a/contrib/ipfilter/test/input/n11_6 b/contrib/ipfilter/test/input/n11_6 deleted file mode 100644 index 128e45a..0000000 --- a/contrib/ipfilter/test/input/n11_6 +++ /dev/null @@ -1,16 +0,0 @@ -out6 on zx0 255 10:1:1::0 10:1:1::2 -out6 on zx0 255 10:1:1::1 10:1:1::2 -out6 on zx0 255 10:1:1::2 10:1:1::1 -out6 on zx0 255 10::2:2:1 10:1:2::1 -out6 on zx0 255 10::2:2:2 10:1:2::1 -in6 on zx0 255 10:1:1::1 10:1:1::2 -in6 on zx0 255 10:1:1::2 10:1:1::1 -in6 on zx0 255 10::2:2:1 10::2:1:1 -in6 on zx0 255 10::2:2:2 10::2:1:1 -in6 on zx0 255 10::2:2:3 10:1:1::1 -in6 on zx0 255 10::2:3:4 10::2:2:2 -in6 on zx0 255 10:1:1::1 10::2:2:2 -in6 on zx0 255 10:1:1::2 10::2:2:2 -in6 on zx0 255 10:1:1::0 10::3:4:5 -in6 on zx0 255 10:1:1::1 10::3:4:5 -in6 on zx0 255 10:1:1::2 10::3:4:5 diff --git a/contrib/ipfilter/test/input/n12 b/contrib/ipfilter/test/input/n12 deleted file mode 100644 index 16e479e..0000000 --- a/contrib/ipfilter/test/input/n12 +++ /dev/null @@ -1,18 +0,0 @@ -[out,le0=192.168.1.188] -4510 0040 2020 4000 4006 17e1 c0a8 7e53 c0a8 0303 -12c2 0017 4e33 298e 0000 0000 -b002 4000 07af 0000 0204 05b4 0101 0402 -0103 0300 0101 080a 0c72 549e 0000 0000 - -[in,le0] -4500 003c 00b0 4000 fe06 f5fb c0a8 0303 c0a8 01bc -0017 2710 f674 e02c 4e33 298f -a012 2798 e317 0000 0101 080a 2c05 b797 -0c72 549e 0103 0300 0204 05b4 - -[out,le0] -4510 0034 493b 4000 4006 eed1 c0a8 7e53 c0a8 0303 -12c2 0017 4e33 298f f674 e02d -8010 4000 8e2a 0000 0101 080a 0c72 549e -2c05 b797 - diff --git a/contrib/ipfilter/test/input/n12_6 b/contrib/ipfilter/test/input/n12_6 deleted file mode 100644 index 8583acb..0000000 --- a/contrib/ipfilter/test/input/n12_6 +++ /dev/null @@ -1,18 +0,0 @@ -[out,le0=c0a8:0100::bc] -6000 0000 002c 0640 c0a8 7e00 0000 0000 0000 0000 0000 0053 c0a8 0300 0000 0000 0000 0000 0000 0003 -12c2 0017 4e33 298e 0000 0000 -b002 4000 07af 0000 0204 05b4 0101 0402 -0103 0300 0101 080a 0c72 549e 0000 0000 - -[in,le0] -6000 0000 0028 06fe c0a8 0300 0000 0000 0000 0000 0000 0003 c0a8 0100 0000 0000 0000 0000 0000 00bc -0017 2710 f674 e02c 4e33 298f -a012 2798 e317 0000 0101 080a 2c05 b797 -0c72 549e 0103 0300 0204 05b4 - -[out,le0] -6000 0000 0020 0640 c0a8 7e00 0000 0000 0000 0000 0000 0053 c0a8 0300 0000 0000 0000 0000 0000 0003 -12c2 0017 4e33 298f f674 e02d -8010 4000 8e2a 0000 0101 080a 0c72 549e -2c05 b797 - diff --git a/contrib/ipfilter/test/input/n13 b/contrib/ipfilter/test/input/n13 deleted file mode 100644 index ac7bbbd..0000000 --- a/contrib/ipfilter/test/input/n13 +++ /dev/null @@ -1,4 +0,0 @@ -out on le0 192.168.1.1 150.1.1.1 -out on le0 192.168.1.1 150.1.1.2 -out on le0 192.168.1.2 150.1.1.2 -out on le0 192.168.1.3 150.1.1.1 diff --git a/contrib/ipfilter/test/input/n13_6 b/contrib/ipfilter/test/input/n13_6 deleted file mode 100644 index 54b262d..0000000 --- a/contrib/ipfilter/test/input/n13_6 +++ /dev/null @@ -1,4 +0,0 @@ -out6 on le0 192:168:1::1 150:1:1::1 -out6 on le0 192:168:1::1 150:1:1::2 -out6 on le0 192:168:1::2 150:1:1::2 -out6 on le0 192:168:1::3 150:1:1::1 diff --git a/contrib/ipfilter/test/input/n14 b/contrib/ipfilter/test/input/n14 deleted file mode 100644 index 969eb1c..0000000 --- a/contrib/ipfilter/test/input/n14 +++ /dev/null @@ -1,4 +0,0 @@ -in on gre0 tcp 10.2.2.5,2000 203.1.1.1,80 -in on gre0 tcp 10.2.2.6,2000 203.1.1.1,80 -in on gre0 tcp 10.2.2.7,2000 203.1.1.1,80 -in on gre0 tcp 10.2.2.5,2001 203.1.1.1,80 diff --git a/contrib/ipfilter/test/input/n14_6 b/contrib/ipfilter/test/input/n14_6 deleted file mode 100644 index f5dd5d3..0000000 --- a/contrib/ipfilter/test/input/n14_6 +++ /dev/null @@ -1,4 +0,0 @@ -in6 on gre0 tcp 10::2:2:5,2000 203:1:1::1,80 -in6 on gre0 tcp 10::2:2:6,2000 203:1:1::1,80 -in6 on gre0 tcp 10::2:2:7,2000 203:1:1::1,80 -in6 on gre0 tcp 10::2:2:5,2001 203:1:1::1,80 diff --git a/contrib/ipfilter/test/input/n15 b/contrib/ipfilter/test/input/n15 deleted file mode 100644 index 715848e..0000000 --- a/contrib/ipfilter/test/input/n15 +++ /dev/null @@ -1,2 +0,0 @@ -in on le0 tcp 9.9.9.9,10011 5.5.5.5,80 -in on le0 tcp 9.9.9.9,10011 2.2.2.2,80 diff --git a/contrib/ipfilter/test/input/n15_6 b/contrib/ipfilter/test/input/n15_6 deleted file mode 100644 index 4a56138..0000000 --- a/contrib/ipfilter/test/input/n15_6 +++ /dev/null @@ -1,2 +0,0 @@ -in6 on le0 tcp 9:9:9::9,10011 5:5::5:5,80 -in6 on le0 tcp 9:9:9::9,10011 2::2:2:2,80 diff --git a/contrib/ipfilter/test/input/n16 b/contrib/ipfilter/test/input/n16 deleted file mode 100644 index ad09a45..0000000 --- a/contrib/ipfilter/test/input/n16 +++ /dev/null @@ -1,40 +0,0 @@ -[in,vlan0] -4520 0068 17e4 0000 6b11 3539 c05b ac33 45f8 4fc1 -1194 94f8 0054 0000 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -[out,vlan2] -4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 -1194 07dd 0054 0000 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -[in,vlan2] -4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33 -0303 4ca1 0000 0000 -4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 -1194 07dd 0054 0000 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - -[out,vlan0] -4500 0084 ee0f 0000 8001 e0a2 ac1f 5318 c05b ac33 -0303 4ca1 0000 0000 -4520 0068 17e4 0000 6a11 ccba c05b ac33 ac1f 5318 -1194 07dd 0054 0000 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 -a5a5 a5a5 a5a5 a5a5 a5a5 a5a5 - diff --git a/contrib/ipfilter/test/input/n17 b/contrib/ipfilter/test/input/n17 deleted file mode 100644 index 29709de..0000000 --- a/contrib/ipfilter/test/input/n17 +++ /dev/null @@ -1,24 +0,0 @@ -[out,zx0] -4500 00a0 0000 0100 3f06 7555 0101 0101 0201 0101 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - -[in,zx0] -4500 00a0 0000 0100 3f06 7553 0201 0101 0101 0103 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - diff --git a/contrib/ipfilter/test/input/n17_6 b/contrib/ipfilter/test/input/n17_6 deleted file mode 100644 index a176c15..0000000 --- a/contrib/ipfilter/test/input/n17_6 +++ /dev/null @@ -1,24 +0,0 @@ -[out,zx0] -6000 0000 008c 063f 0001 0000 0000 0000 0000 0001 0001 0001 0002 0000 0000 0000 0000 0001 0001 0001 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - -[in,zx0] -6000 0000 008c 063f 0002 0000 0000 0000 0000 0001 0001 0001 0001 0000 0000 0000 0000 0001 0001 0003 -0401 0019 0000 0000 0000 0000 5010 2000 86b7 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - diff --git a/contrib/ipfilter/test/input/n18 b/contrib/ipfilter/test/input/n18 deleted file mode 100644 index a7a610c..0000000 --- a/contrib/ipfilter/test/input/n18 +++ /dev/null @@ -1,8 +0,0 @@ -out on z0 tcp 2.2.2.2,22 3.3.3.3,30 -out on z0 tcp 2.2.2.2,23 3.3.3.3,31 -out on z0 tcp 2.2.2.2,24 3.3.3.3,32 -out on z0 tcp 2.2.2.2,25 3.3.3.3,33 -out on z0 tcp 2.2.2.2,26 3.3.3.3,34 -out on z0 tcp 2.2.2.2,27 3.3.3.3,35 -out on z0 tcp 2.2.2.2,28 3.3.3.3,36 -out on z0 tcp 2.2.2.2,29 3.3.3.3,37 diff --git a/contrib/ipfilter/test/input/n1_6 b/contrib/ipfilter/test/input/n1_6 deleted file mode 100644 index c1badab..0000000 --- a/contrib/ipfilter/test/input/n1_6 +++ /dev/null @@ -1,34 +0,0 @@ -out6 on zx0 255 10:1:1::0 10:1:1::2 -out6 on zx0 255 10:1:1::1 10:1:1::2 -out6 on zx0 255 10:1:1::2 10:1:1::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 255 10::2:2:1 10:1:2::1 -out6 on zx0 255 10::2:2:2 10:1:2::1 -in6 on zx0 255 10:1:1::1 10:1:1::2 -in6 on zx0 255 10:1:1::2 10:1:1::1 -in6 on zx0 255 10::2:2:1 10::2:1:1 -in6 on zx0 255 10::2:2:2 10::2:1:1 -in6 on zx0 255 10::2:2:3 10:1:1::1 -in6 on zx0 255 10::2:3:4 10::2:2:2 -in6 on zx0 255 10:1:1::1 10::2:2:2 -in6 on zx0 255 10:1:1::2 10::2:2:2 -in6 on zx0 255 10:1:1::0 10::3:4:5 -in6 on zx0 255 10:1:1::1 10::3:4:5 -in6 on zx0 255 10:1:1::2 10::3:4:5 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,1025 -out6 on zx0 58 10:1:1::1 10:4:3::2 -in6 on zx0 58 10:4:3::2 10::2:2:2 -in6 on zx0 58 10:4:3::2 10::3:4:1 -in6 on zx0 58 10:4:3::2 10::3:4:2 -in6 on zx0 58 10:4:3::2 10::3:4:3 -in6 on zx0 58 10:4:3::2 10::3:4:4 -in6 on zx0 58 10:4:3::2 10::3:4:5 -out6 on zx0 34 10:1:1::2 10:4:3::2 -in6 on zx0 34 10:4:3::2 10::3:4:4 -out6 on zx0 34 10:1:1::2 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:5 -out6 on zx0 34 10:1:1::3 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:6 -out6 on zx0 35 10:1:1::3 10:4:3::4 -in6 on zx0 35 10:4:3::4 10::3:4:7 diff --git a/contrib/ipfilter/test/input/n2 b/contrib/ipfilter/test/input/n2 deleted file mode 100644 index 476f16e..0000000 --- a/contrib/ipfilter/test/input/n2 +++ /dev/null @@ -1,19 +0,0 @@ -out on zx0 tcp 10.1.1.1,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -out on zx0 10.1.1.0 10.1.1.2 -out on zx0 10.1.1.1 10.1.2.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 udp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.3,2000 10.1.2.1,80 -out on zx0 tcp 10.1.1.3,2001 10.1.3.1,80 -out on zx0 tcp 10.1.1.3,2002 10.1.4.1,80 -out on zx0 tcp 10.1.1.3,2003 10.1.4.1,80 -in on zx0 10.1.1.1 10.1.1.2 -in on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -in on zx0 10.1.1.2 10.1.1.1 -in on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000 -in on zx0 udp 10.1.1.2,1025 10.3.4.5,40001 -in on zx0 tcp 10.1.2.1,80 10.3.4.5,40001 diff --git a/contrib/ipfilter/test/input/n200 b/contrib/ipfilter/test/input/n200 deleted file mode 100644 index 9b02158..0000000 --- a/contrib/ipfilter/test/input/n200 +++ /dev/null @@ -1,6 +0,0 @@ -[in,bar0] -4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - -[out,bar0] -4500 0044 0000 0000 ff11 bda6 7f00 0001 7f00 0001 2775 2775 0030 0000 4500 0028 0000 0000 0006 435a 6363 6363 5858 5858 038d 0050 0000 0000 0000 0000 5000 1000 2491 0000 - diff --git a/contrib/ipfilter/test/input/n2_6 b/contrib/ipfilter/test/input/n2_6 deleted file mode 100644 index 3ea74ff..0000000 --- a/contrib/ipfilter/test/input/n2_6 +++ /dev/null @@ -1,19 +0,0 @@ -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -out6 on zx0 10:1:1::0 10:1:1::2 -out6 on zx0 10:1:1::1 10:1:2::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 udp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::3,2000 10:1:2::1,80 -out6 on zx0 tcp 10:1:1::3,2001 10:1:3::1,80 -out6 on zx0 tcp 10:1:1::3,2002 10:1:4::1,80 -out6 on zx0 tcp 10:1:1::3,2003 10:1:4::1,80 -in6 on zx0 10:1:1::1 10:1:1::2 -in6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -in6 on zx0 10:1:1::2 10:1:1::1 -in6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000 -in6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001 -in6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001 diff --git a/contrib/ipfilter/test/input/n3 b/contrib/ipfilter/test/input/n3 deleted file mode 100644 index deca317..0000000 --- a/contrib/ipfilter/test/input/n3 +++ /dev/null @@ -1,5 +0,0 @@ -out on zz0 tcp 10.1.1.1,5000 203.1.1.1,80 -out on zz0 tcp 10.1.1.1,252 203.1.1.1,80 -out on zz0 tcp 10.1.0.0,32768 203.1.1.1,80 -out on zz0 udp 10.1.0.0,32768 203.1.1.1,80 -out on zz0 tcp 10.1.255.255,65535 203.1.1.1,80 diff --git a/contrib/ipfilter/test/input/n4 b/contrib/ipfilter/test/input/n4 deleted file mode 100644 index 1218ef9..0000000 --- a/contrib/ipfilter/test/input/n4 +++ /dev/null @@ -1,10 +0,0 @@ -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23 -out on zx0 tcp 10.2.2.1,10023 10.3.3.3,12345 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53 -out on zx0 tcp 10.2.2.1,10053 10.3.3.3,12345 -in on zx0 tcp 10.3.3.3,12346 10.1.0.0,23 -out on zx0 tcp 10.2.2.1,10023 10.3.3.3,12346 -in on zx0 udp 10.3.3.3,12345 10.1.1.0,53 -out on zx0 udp 10.2.2.1,10053 10.3.3.3,12345 -in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53 -out on zx0 tcp 10.2.2.1,53 10.3.3.3,12345 diff --git a/contrib/ipfilter/test/input/n4_6 b/contrib/ipfilter/test/input/n4_6 deleted file mode 100644 index 8f0f423..0000000 --- a/contrib/ipfilter/test/input/n4_6 +++ /dev/null @@ -1,10 +0,0 @@ -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,23 -out6 on zx0 tcp 10::2:2:1,10023 10:3:3::3,12345 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,53 -out6 on zx0 tcp 10::2:2:1,10053 10:3:3::3,12345 -in6 on zx0 tcp 10:3:3::3,12346 10:1:0::0,23 -out6 on zx0 tcp 10::2:2:1,10023 10:3:3::3,12346 -in6 on zx0 udp 10:3:3::3,12345 10:1:1::0,53 -out6 on zx0 udp 10::2:2:1,10053 10:3:3::3,12345 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::0,53 -out6 on zx0 tcp 10::2:2:1,53 10:3:3::3,12345 diff --git a/contrib/ipfilter/test/input/n5 b/contrib/ipfilter/test/input/n5 deleted file mode 100644 index 579210b..0000000 --- a/contrib/ipfilter/test/input/n5 +++ /dev/null @@ -1,54 +0,0 @@ -out on zx0 255 10.1.1.0 10.1.1.2 -out on zx0 255 10.1.1.1 10.1.1.2 -out on zx0 255 10.1.1.2 10.1.1.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 255 10.2.2.1 10.1.2.1 -out on zx0 255 10.2.2.2 10.1.2.1 -in on zx0 255 10.1.1.1 10.1.1.2 -in on zx0 255 10.1.1.2 10.1.1.1 -in on zx0 255 10.2.2.1 10.2.1.1 -in on zx0 255 10.2.2.2 10.2.1.1 -in on zx0 255 10.2.2.3 10.1.1.1 -in on zx0 255 10.2.3.4 10.2.2.2 -in on zx0 255 10.1.1.1 10.2.2.2 -in on zx0 255 10.1.1.2 10.2.2.2 -in on zx0 255 10.1.1.0 10.3.4.5 -in on zx0 255 10.1.1.1 10.3.4.5 -in on zx0 255 10.1.1.2 10.3.4.5 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,1025 -out on zx0 icmp 10.1.1.1 10.4.3.2 -in on zx0 icmp 10.4.3.2 10.2.2.2 -in on zx0 icmp 10.4.3.2 10.3.4.3 -in on zx0 icmp 10.4.3.2 10.3.4.5 -out on zx0 34 10.1.1.2 10.4.3.2 -in on zx0 34 10.4.3.2 10.3.4.4 -out on zx0 34 10.1.1.2 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.5 -out on zx0 34 10.1.1.3 10.4.3.4 -in on zx0 34 10.4.3.4 10.3.4.6 -out on zx0 35 10.1.1.3 10.4.3.4 -in on zx0 35 10.4.3.4 10.3.4.7 -out on zx0 tcp 10.1.1.1,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -out on zx0 10.1.1.0 10.1.1.2 -out on zx0 10.1.1.1 10.1.2.1 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.2,1026 10.1.1.1,1025 -out on zx0 udp 10.1.1.2,1025 10.1.1.1,1025 -out on zx0 tcp 10.1.1.3,2000 10.1.2.1,80 -out on zx0 tcp 10.1.1.3,2001 10.1.3.1,80 -out on zx0 tcp 10.1.1.3,2002 10.1.4.1,80 -out on zx0 tcp 10.1.1.3,2003 10.1.4.1,80 -in on zx0 10.1.1.1 10.1.1.2 -in on zx0 tcp 10.1.1.1,1025 10.1.1.2,1025 -in on zx0 10.1.1.2 10.1.1.1 -out on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000 -in on zx0 tcp 10.1.1.1,1026 10.3.4.5,40000 -out on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000 -in on zx0 tcp 10.1.1.1,1025 10.3.4.5,40000 -out on zx0 udp 10.1.1.2,1025 10.3.4.5,40001 -in on zx0 udp 10.1.1.2,1025 10.3.4.5,40001 -out on zx0 tcp 10.1.2.1,80 10.3.4.5,40001 -in on zx0 tcp 10.1.2.1,80 10.3.4.5,40001 diff --git a/contrib/ipfilter/test/input/n5_6 b/contrib/ipfilter/test/input/n5_6 deleted file mode 100644 index 9ac0c29..0000000 --- a/contrib/ipfilter/test/input/n5_6 +++ /dev/null @@ -1,54 +0,0 @@ -out6 on zx0 255 10:1:1::0 10:1:1::2 -out6 on zx0 255 10:1:1::1 10:1:1::2 -out6 on zx0 255 10:1:1::2 10:1:1::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 255 10::2:2:1 10:1:2::1 -out6 on zx0 255 10::2:2:2 10:1:2::1 -in6 on zx0 255 10:1:1::1 10:1:1::2 -in6 on zx0 255 10:1:1::2 10:1:1::1 -in6 on zx0 255 10::2:2:1 10::2:1:1 -in6 on zx0 255 10::2:2:2 10::2:1:1 -in6 on zx0 255 10::2:2:3 10:1:1::1 -in6 on zx0 255 10::2:3:4 10::2:2:2 -in6 on zx0 255 10:1:1::1 10::2:2:2 -in6 on zx0 255 10:1:1::2 10::2:2:2 -in6 on zx0 255 10:1:1::0 10::3:4:5 -in6 on zx0 255 10:1:1::1 10::3:4:5 -in6 on zx0 255 10:1:1::2 10::3:4:5 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,1025 -out6 on zx0 58 10:1:1::1 10:4:3::2 -in6 on zx0 58 10:4:3::2 10::2:2:2 -in6 on zx0 58 10:4:3::2 10::3:4:3 -in6 on zx0 58 10:4:3::2 10::3:4:5 -out6 on zx0 34 10:1:1::2 10:4:3::2 -in6 on zx0 34 10:4:3::2 10::3:4:4 -out6 on zx0 34 10:1:1::2 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:5 -out6 on zx0 34 10:1:1::3 10:4:3::4 -in6 on zx0 34 10:4:3::4 10::3:4:6 -out6 on zx0 35 10:1:1::3 10:4:3::4 -in6 on zx0 35 10:4:3::4 10::3:4:7 -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -out6 on zx0 10:1:1::0 10:1:1::2 -out6 on zx0 10:1:1::1 10:1:2::1 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::2,1026 10:1:1::1,1025 -out6 on zx0 udp 10:1:1::2,1025 10:1:1::1,1025 -out6 on zx0 tcp 10:1:1::3,2000 10:1:2::1,80 -out6 on zx0 tcp 10:1:1::3,2001 10:1:3::1,80 -out6 on zx0 tcp 10:1:1::3,2002 10:1:4::1,80 -out6 on zx0 tcp 10:1:1::3,2003 10:1:4::1,80 -in6 on zx0 10:1:1::1 10:1:1::2 -in6 on zx0 tcp 10:1:1::1,1025 10:1:1::2,1025 -in6 on zx0 10:1:1::2 10:1:1::1 -out6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000 -in6 on zx0 tcp 10:1:1::1,1026 10::3:4:5,40000 -out6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000 -in6 on zx0 tcp 10:1:1::1,1025 10::3:4:5,40000 -out6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001 -in6 on zx0 udp 10:1:1::2,1025 10::3:4:5,40001 -out6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001 -in6 on zx0 tcp 10:1:2::1,80 10::3:4:5,40001 diff --git a/contrib/ipfilter/test/input/n6 b/contrib/ipfilter/test/input/n6 deleted file mode 100644 index 8a0c924..0000000 --- a/contrib/ipfilter/test/input/n6 +++ /dev/null @@ -1,13 +0,0 @@ -in on zx0 tcp 10.2.2.2,12345 10.1.1.1,23 -in on zx0 tcp 10.2.2.2,12345 10.1.1.2,23 -in on zx0 tcp 10.3.0.1,12345 10.1.2.2,23 -in on zx0 tcp 10.3.0.1,12345 10.2.2.2,23 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,23 -in on zx0 tcp 10.2.2.2,12345 10.1.1.1,53 -in on zx0 tcp 10.3.3.3,12345 10.1.1.1,53 -in on zx0 tcp 10.2.2.2,12345 10.1.0.0,23 -in on zx0 tcp 10.3.3.3,12345 10.1.0.0,23 -in on zx0 udp 10.2.2.2,12345 10.1.1.0,53 -in on zx0 udp 10.3.3.3,12345 10.1.1.0,53 -in on zx0 tcp 10.2.2.2,12345 10.1.1.0,53 -in on zx0 tcp 10.3.3.3,12345 10.1.1.0,53 diff --git a/contrib/ipfilter/test/input/n6_6 b/contrib/ipfilter/test/input/n6_6 deleted file mode 100644 index 18300cd..0000000 --- a/contrib/ipfilter/test/input/n6_6 +++ /dev/null @@ -1,13 +0,0 @@ -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::1,23 -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::2,23 -in6 on zx0 tcp 10:3:0::1,12345 10:1:2::2,23 -in6 on zx0 tcp 10:3:0::1,12345 10::2:2:2,23 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,23 -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::1,53 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::1,53 -in6 on zx0 tcp 10::2:2:2,12345 10:1:0::0,23 -in6 on zx0 tcp 10:3:3::3,12345 10:1:0::0,23 -in6 on zx0 udp 10::2:2:2,12345 10:1:1::0,53 -in6 on zx0 udp 10:3:3::3,12345 10:1:1::0,53 -in6 on zx0 tcp 10::2:2:2,12345 10:1:1::0,53 -in6 on zx0 tcp 10:3:3::3,12345 10:1:1::0,53 diff --git a/contrib/ipfilter/test/input/n7 b/contrib/ipfilter/test/input/n7 deleted file mode 100644 index 79af901..0000000 --- a/contrib/ipfilter/test/input/n7 +++ /dev/null @@ -1,9 +0,0 @@ -in on zx0 tcp 10.2.3.1,1230 10.1.1.1,22 -in on zx0 tcp 10.2.3.1,1231 10.1.1.1,23 -in on zx0 tcp 10.2.3.1,1232 10.1.1.1,50 -in on zx0 tcp 10.2.3.1,1233 10.1.1.1,79 -in on zx0 tcp 10.2.3.1,1234 10.1.1.1,80 -in on zx0 tcp 10.2.3.1,1235 10.1.1.2,80 -in on zx0 tcp 10.2.3.1,1236 10.1.1.3,80 -in on zx0 tcp 10.2.3.1,1237 10.1.1.4,80 -in on zx0 tcp 10.2.3.1,1238 10.1.1.4,80 diff --git a/contrib/ipfilter/test/input/n7_6 b/contrib/ipfilter/test/input/n7_6 deleted file mode 100644 index b31a1de..0000000 --- a/contrib/ipfilter/test/input/n7_6 +++ /dev/null @@ -1,9 +0,0 @@ -in6 on zx0 tcp 10::2:3:1,1230 10:1:1::1,22 -in6 on zx0 tcp 10::2:3:1,1231 10:1:1::1,23 -in6 on zx0 tcp 10::2:3:1,1232 10:1:1::1,50 -in6 on zx0 tcp 10::2:3:1,1233 10:1:1::1,79 -in6 on zx0 tcp 10::2:3:1,1234 10:1:1::1,80 -in6 on zx0 tcp 10::2:3:1,1235 10:1:1::2,80 -in6 on zx0 tcp 10::2:3:1,1236 10:1:1::3,80 -in6 on zx0 tcp 10::2:3:1,1237 10:1:1::4,80 -in6 on zx0 tcp 10::2:3:1,1238 10:1:1::4,80 diff --git a/contrib/ipfilter/test/input/n8 b/contrib/ipfilter/test/input/n8 deleted file mode 100644 index c0a5b3f..0000000 --- a/contrib/ipfilter/test/input/n8 +++ /dev/null @@ -1,34 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[out,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404 -0800 efdf 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[in,icmp0] -4500 0054 3fd5 4000 ff01 1fc1 0404 0404 0a0a 0a01 -0000 f7df 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[out,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404 -0800 efde 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[in,icmp0] -4500 0054 3fd5 4000 ff01 1fc1 0404 0404 0a0a 0a01 -0000 f7de 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - diff --git a/contrib/ipfilter/test/input/n8_6 b/contrib/ipfilter/test/input/n8_6 deleted file mode 100644 index 8039f78..0000000 --- a/contrib/ipfilter/test/input/n8_6 +++ /dev/null @@ -1,37 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[out,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774d 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -# ECHO reply -[in,icmp0] -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001 -8100 7624 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -# ECHO request -[out,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774c 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -# ECHO reply -[in,icmp0] -6000 0000 0040 3aff 0004 0004 0004 0000 0000 0000 0000 0004 0010 0010 0010 0000 0000 0000 0000 0001 -8100 7623 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - diff --git a/contrib/ipfilter/test/input/n9 b/contrib/ipfilter/test/input/n9 deleted file mode 100644 index 5c2d3c7..0000000 --- a/contrib/ipfilter/test/input/n9 +++ /dev/null @@ -1,34 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[in,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404 -0800 efdf 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[out,icmp0] -4500 0054 3fd5 4000 ff01 23c5 0a0a 0a01 0202 0202 -0000 f7df 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[in,icmp0] -4500 0054 8bc1 0000 ff01 23dc 0202 0202 0404 0404 -0800 efde 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[out,icmp0] -4500 0054 3fd5 4000 ff01 23c5 0a0a 0a01 0202 0202 -0000 f7de 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - diff --git a/contrib/ipfilter/test/input/n9_6 b/contrib/ipfilter/test/input/n9_6 deleted file mode 100644 index 42db09d..0000000 --- a/contrib/ipfilter/test/input/n9_6 +++ /dev/null @@ -1,34 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP ECHO (ping) exchange -[in,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774d 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[out,icmp0] -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002 -8100 762c 6220 0000 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[in,icmp0] -6000 0000 0040 3aff 0002 0000 0000 0000 0000 0002 0002 0002 0004 0004 0004 0000 0000 0000 0000 0004 -8000 774c 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - -[out,icmp0] -6000 0000 0040 3aff 0010 0010 0010 0000 0000 0000 0000 0001 0002 0000 0000 0000 0000 0002 0002 0002 -8100 762b 6220 0001 3f6f 6e80 000b -0d02 0809 0a0b 0c0d 0e0f 1011 1213 1415 -1617 1819 1a1b 1c1d 1e1f 2021 2223 2425 -2627 2829 2a2b 2c2d 2e2f 3031 3233 3435 -3637 - diff --git a/contrib/ipfilter/test/input/ni1 b/contrib/ipfilter/test/input/ni1 deleted file mode 100644 index 519325f..0000000 --- a/contrib/ipfilter/test/input/ni1 +++ /dev/null @@ -1,59 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP timeout exceeded in reply to a ICMP packet going out. -# 2.2.2.2,44489 -> 4.4.4.4,33438 -[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 0000 4000 0111 65b2 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 0000 4000 0111 65b2 0606 0606 0404 0404 -afc9 829e 0014 6308 -0402 0000 3be5 468d 000a cfc3 - -# 2.2.2.2,2048 -> 4.4.4.4,33438 -[out,df0] -4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 -0800 829e 0014 12da -0402 0000 3be5 468d 000a cfc3 - -[in,df0] -4500 0038 809a 0000 ff01 2918 0303 0303 0606 0607 -0b00 5f7c 0000 0000 -4500 0028 0000 4000 0111 65b1 0606 0607 0404 0404 -4e20 829e 0014 c4b0 - -[in,df0] -4500 0044 809a 0000 ff01 290c 0303 0303 0606 0607 -0b00 093a 0000 0000 -4500 0028 0000 4000 0111 65b1 0606 0607 0404 0404 -4e20 829e 0014 c4b0 -0402 0000 3be5 468d 000a cfc3 - -# 2.2.2.2,20480 -> 4.4.4.4,33438 -[out,df0] -4500 0028 4706 4000 0111 26b4 0202 0202 0404 0404 -5000 829e 0014 cad9 -0402 0000 3be5 468d 000a cfc3 - -[in,df0] -4500 0038 809a 0000 ff01 2917 0303 0303 0606 0608 -0b00 0775 0000 0000 -4500 0028 0000 4000 0111 65b0 0606 0608 0404 0404 -07d0 829e 0014 6308 - -[in,df0] -4500 0044 809a 0000 ff01 290b 0303 0303 0606 0608 -0b00 093b 0000 0000 -4500 0028 0000 4000 0111 65b0 0606 0608 0404 0404 -07d0 829e 0014 0b00 -0402 0000 3be5 468d 000a cfc3 - diff --git a/contrib/ipfilter/test/input/ni10 b/contrib/ipfilter/test/input/ni10 deleted file mode 100644 index 636c4f1..0000000 --- a/contrib/ipfilter/test/input/ni10 +++ /dev/null @@ -1,29 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -# IP 4.4.4.4 2.2.2.2 TCP(20480,80) -[in,df0] -4500 003c 4706 4000 ff06 28aa 0404 0404 0202 0202 -5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 acab 0000 0000 -4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606 -5000 0050 0000 0001 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 113f 0000 0000 -4500 003c 4706 4000 ff06 20a2 0404 0404 0606 0606 -5000 0050 0000 0001 0000 0000 a002 16d0 d0da 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -# IP 3.3.3.3 -> 4.4.4.4 ICMP (IP(4.4.4.4,6.6.6.6) TCP(20480,80)) -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 acab 0000 0000 -4500 003c 4706 4000 ff06 28ab 0404 0404 0202 0201 5000 0050 0000 0001 - diff --git a/contrib/ipfilter/test/input/ni11 b/contrib/ipfilter/test/input/ni11 deleted file mode 100644 index 0650abb..0000000 --- a/contrib/ipfilter/test/input/ni11 +++ /dev/null @@ -1,26 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[in,df0] -4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 -5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 0735 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 -0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9d58 0000 0001 - diff --git a/contrib/ipfilter/test/input/ni12 b/contrib/ipfilter/test/input/ni12 deleted file mode 100644 index c44aacc..0000000 --- a/contrib/ipfilter/test/input/ni12 +++ /dev/null @@ -1,26 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[in,df0] -4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 -5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 10bb 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9c40 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 0735 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9c40 0000 0001 0000 0000 a002 16d0 3ef4 0000 -0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 10bb 0000 0000 -4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 5000 9c40 0000 0001 - diff --git a/contrib/ipfilter/test/input/ni13 b/contrib/ipfilter/test/input/ni13 deleted file mode 100644 index 70c1952..0000000 --- a/contrib/ipfilter/test/input/ni13 +++ /dev/null @@ -1,231 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[in,pcn1=192.168.113.3] -4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 -05e7 06bb abf0 4aa5 0000 0000 7002 faf0 21a1 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[out,pcn1] -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 c0a8 7101 -06bb 05e7 a564 68da abf0 4aa6 6012 8000 a348 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[in,pcn1] -4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103 -05e7 06bb abf0 4aa6 a564 68db -5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d -0001 0000 0100 0000 0000 0001 0000 0001 -0000 0a28 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 4d69 6372 6f73 6f66 7420 5769 -6e64 6f77 7320 4e54 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[out,pcn1] -4500 00c4 69a7 4000 4006 6d37 c0a8 7103 c0a8 7101 -06bb 05e7 a564 68db abf0 4b42 -5018 832c cecf 0000 009c 0001 1a2b 3c4d -0002 0000 0100 0100 0000 0000 0000 0000 -0001 0001 6c6f 6361 6c00 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 6c69 6e75 7800 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[in,pcn1] -4500 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103 -05e7 06bb abf0 4b42 a564 6977 -5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d -0007 0000 4000 1331 0000 012c 05f5 e100 -0000 0003 0000 0003 0040 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[out,pcn1] -4500 0048 69a8 4000 4006 6db2 c0a8 7103 c0a8 7101 -06bb 05e7 a564 6977 abf0 4bea -5018 832c 36fa 0000 0020 0001 1a2b 3c4d -0008 0000 0000 4000 0100 0000 05f5 e100 -0040 0000 0000 0000 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103 -05e7 06bb abf0 4bea a564 6997 -5018 fa34 e810 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 ffff ffff ffff ffff - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[in,pcn1] -4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103 -3001 880b 0019 0000 0000 0000 -ff03 c021 0100 0015 0104 0578 0506 577f -7c5b 0702 0802 0d03 06 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[out,pcn1] -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 c0a8 7101 -2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[out,pcn1] -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 c0a8 7101 -06bb 05e7 a564 6997 abf0 4c02 5010 832c b5c1 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -4500 0038 69ab 0000 ff2f ee95 c0a8 7103 c0a8 7101 -3001 880b 0018 4000 0000 0000 -ff03 c021 0101 0014 0206 0000 0000 0506 -22d9 0cfa 0702 0802 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[out,pcn1] -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 c0a8 7101 -3081 880b 000b 4000 0000 0001 0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103 -3081 880b 0018 0000 0000 0001 -0000 0001 ff03 c021 0201 0014 0206 0000 -0000 0506 22d9 0cfa 0702 0802 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103 -3001 880b 0016 0000 0000 0002 -ff03 c021 0101 0012 0104 0578 0506 577f -7c5b 0702 0802 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -4500 003a 69ad 0000 ff2f ee91 c0a8 7103 c0a8 7101 -3081 880b 0016 4000 0000 0002 -0000 0002 ff03 c021 0201 0012 0104 0578 -0506 577f 7c5b 0702 0802 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[out,pcn1] -4500 0032 69ae 0000 ff2f ee98 c0a8 7103 c0a8 7101 -3001 880b 0012 4000 0000 0003 -8021 0101 0010 0306 c0a8 0001 0206 002d -0f01 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103 -05e7 06bb abf0 4c02 a564 6997 -5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 0000 0000 ffff ffff - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[in,pcn1] -4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103 -3081 880b 0014 0000 0000 0003 -0000 0003 c021 0c02 0012 577f 7c5b 4d53 -5241 5356 352e 3130 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[out,pcn1] -4500 003e 69af 0000 ff2f ee8b c0a8 7103 c0a8 7101 -3081 880b 001a 4000 0000 0004 -0000 0003 ff03 c021 0702 0016 0c02 0012 -577f 7c5b 4d53 5241 5356 352e 3130 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[in,pcn1] -4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103 -3081 880b 001a 0000 0000 0004 -0000 0004 c021 0c03 0018 577f 7c5b 4d53 -5241 532d 302d 434c 4159 4d4f 4f52 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[out,pcn1] -4500 0044 69b0 0000 ff2f ee84 c0a8 7103 c0a8 7101 -3081 880b 0020 4000 0000 0005 -0000 0004 ff03 c021 0703 001c 0c03 0018 -577f 7c5b 4d53 5241 532d 302d 434c 4159 -4d4f 4f52 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[in,pcn1] -4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[out,pcn1] -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 c0a8 7101 -3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[out,pcn1] -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 c0a8 7101 -3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103 -3081 880b 0024 0000 0000 0006 -0000 0007 8021 0105 0022 0306 0000 0000 -8106 0000 0000 8206 0000 0000 8306 0000 -0000 8406 0000 0000 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -4500 0042 69b3 0000 ff2f ee83 c0a8 7103 c0a8 7101 -3081 880b 001e 4000 0000 0008 -0000 0006 8021 0405 001c 8106 0000 0000 -8206 0000 0000 8306 0000 0000 8406 0000 -0000 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[in,pcn1] -4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[out,pcn1] -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 c0a8 7101 -3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[in,pcn1] -4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 -3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[in,pcn1] -4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103 -3001 880b 0012 0000 0000 0009 -80fd 0506 0010 577f 7c5b 003c cd74 0000 -02dc - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[out,pcn1] -4500 002a 69b5 0000 ff2f ee99 c0a8 7103 c0a8 7101 -3081 880b 0006 4000 0000 000a -0000 0009 80fd 0606 0004 - diff --git a/contrib/ipfilter/test/input/ni14 b/contrib/ipfilter/test/input/ni14 deleted file mode 100644 index 6bc1276..0000000 --- a/contrib/ipfilter/test/input/ni14 +++ /dev/null @@ -1,235 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[in,pcn1=192.168.113.3] -4500 0030 5e11 4000 8006 3961 c0a8 7101 c0a8 7103 -05e7 06bb abf0 4aa5 0000 0000 -7002 faf0 21a1 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[out,pcn1] -4500 002c 69a6 4000 4006 207b 7f00 0001 c0a8 7101 -06bb 05e7 a564 68da abf0 4aa6 -6012 8000 55f3 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[in,pcn1] -4500 00c4 5e12 4000 8006 38cc c0a8 7101 c0a8 7103 -05e7 06bb abf0 4aa6 a564 68db -5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d -0001 0000 0100 0000 0000 0001 0000 0001 -0000 0a28 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 4d69 6372 6f73 6f66 7420 5769 -6e64 6f77 7320 4e54 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[out,pcn1] -4500 00c4 69a7 4000 4006 1fe2 7f00 0001 c0a8 7101 -06bb 05e7 a564 68db abf0 4b42 -5018 832c 817a 0000 009c 0001 1a2b 3c4d -0002 0000 0100 0100 0000 0000 0000 0000 -0001 0001 6c6f 6361 6c00 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 6c69 6e75 7800 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[in,pcn1] -4500 00d0 5e13 4000 8006 38bf c0a8 7101 c0a8 7103 -05e7 06bb abf0 4b42 a564 6977 -5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d -0007 0000 4000 1331 0000 012c 05f5 e100 -0000 0003 0000 0003 0040 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[out,pcn1] -4500 0048 69a8 4000 4006 205d 7f00 0001 c0a8 7101 -06bb 05e7 a564 6977 abf0 4bea -5018 832c e9a4 0000 0020 0001 1a2b 3c4d -0008 0000 0000 4000 0100 0000 05f5 e100 -0040 0000 0000 0000 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -4500 0040 5e14 4000 8006 394e c0a8 7101 c0a8 7103 -05e7 06bb abf0 4bea a564 6997 -5018 fa34 e810 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 ffff ffff ffff ffff - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[in,pcn1] -4500 0039 5e15 0000 802f 792b c0a8 7101 c0a8 7103 -3001 880b 0019 0000 0000 0000 -ff03 c021 0100 0015 0104 0578 0506 577f -7c5b 0702 0802 0d03 06 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[out,pcn1] -4500 0020 69a9 0000 ff2f a15a 7f00 0001 c0a8 7101 -2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[out,pcn1] -4500 0028 69aa 4000 4006 207b 7f00 0001 c0a8 7101 -06bb 05e7 a564 6997 abf0 4c02 -5010 832c 686c 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -4500 0038 69ab 0000 ff2f a140 7f00 0001 c0a8 7101 -3001 880b 0018 4000 0000 0000 -ff03 c021 0101 0014 0206 0000 0000 0506 -22d9 0cfa 0702 0802 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[out,pcn1] -4500 002f 69ac 0000 ff2f a148 7f00 0001 c0a8 7101 -3081 880b 000b 4000 0000 0001 -0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -4500 003c 5e16 0000 802f 7927 c0a8 7101 c0a8 7103 -3081 880b 0018 0000 0000 0001 -0000 0001 ff03 c021 0201 0014 0206 0000 -0000 0506 22d9 0cfa 0702 0802 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -4500 0036 5e17 0000 802f 792c c0a8 7101 c0a8 7103 -3001 880b 0016 0000 0000 0002 -ff03 c021 0101 0012 0104 0578 0506 577f -7c5b 0702 0802 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -4500 003a 69ad 0000 ff2f a13c 7f00 0001 c0a8 7101 -3081 880b 0016 4000 0000 0002 -0000 0002 ff03 c021 0201 0012 0104 0578 -0506 577f 7c5b 0702 0802 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[out,pcn1] -4500 0032 69ae 0000 ff2f a143 7f00 0001 c0a8 7101 -3001 880b 0012 4000 0000 0003 -8021 0101 0010 0306 c0a8 0001 0206 002d -0f01 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[in,pcn1] -4500 0040 5e18 4000 8006 394a c0a8 7101 c0a8 7103 -05e7 06bb abf0 4c02 a564 6997 -5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 0000 0000 ffff ffff - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[in,pcn1] -4500 0038 5e19 0000 802f 7928 c0a8 7101 c0a8 7103 -3081 880b 0014 0000 0000 0003 -0000 0003 c021 0c02 0012 577f 7c5b 4d53 -5241 5356 352e 3130 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[out,pcn1] -4500 003e 69af 0000 ff2f a136 7f00 0001 c0a8 7101 -3081 880b 001a 4000 0000 0004 -0000 0003 ff03 c021 0702 0016 0c02 0012 -577f 7c5b 4d53 5241 5356 352e 3130 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[in,pcn1] -4500 003e 5e1a 0000 802f 7921 c0a8 7101 c0a8 7103 -3081 880b 001a 0000 0000 0004 -0000 0004 c021 0c03 0018 577f 7c5b 4d53 -5241 532d 302d 434c 4159 4d4f 4f52 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[out,pcn1] -4500 0044 69b0 0000 ff2f a12f 7f00 0001 c0a8 7101 -3081 880b 0020 4000 0000 0005 -0000 0004 ff03 c021 0703 001c 0c03 0018 -577f 7c5b 4d53 5241 532d 302d 434c 4159 -4d4f 4f52 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[in,pcn1] -4500 0030 5e1b 0000 802f 792e c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[out,pcn1] -4500 002a 69b1 0000 ff2f a148 7f00 0001 c0a8 7101 -3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[out,pcn1] -4500 002c 69b2 0000 ff2f a145 7f00 0001 c0a8 7101 -3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -4500 0048 5e1c 0000 802f 7915 c0a8 7101 c0a8 7103 -3081 880b 0024 0000 0000 0006 -0000 0007 8021 0105 0022 0306 0000 0000 -8106 0000 0000 8206 0000 0000 8306 0000 -0000 8406 0000 0000 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -4500 0042 69b3 0000 ff2f a12e 7f00 0001 c0a8 7101 -3081 880b 001e 4000 0000 0008 -0000 0006 8021 0405 001c 8106 0000 0000 -8206 0000 0000 8306 0000 0000 8406 0000 -0000 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[in,pcn1] -4500 0030 5e1d 0000 802f 792c c0a8 7101 c0a8 7103 -3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[out,pcn1] -4500 0030 69b4 0000 ff2f a13f 7f00 0001 c0a8 7101 -3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[in,pcn1] -4500 002a 5e1e 0000 802f 7931 c0a8 7101 c0a8 7103 -3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[in,pcn1] -4500 0032 5e1f 0000 802f 7928 c0a8 7101 c0a8 7103 -3001 880b 0012 0000 0000 0009 -80fd 0506 0010 577f 7c5b 003c cd74 0000 -02dc - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[out,pcn1] -4500 002a 69b5 0000 ff2f a144 7f00 0001 c0a8 7101 -3081 880b 0006 4000 0000 000a -0000 0009 80fd 0606 0004 - diff --git a/contrib/ipfilter/test/input/ni15 b/contrib/ipfilter/test/input/ni15 deleted file mode 100644 index 7e7aabd..0000000 --- a/contrib/ipfilter/test/input/ni15 +++ /dev/null @@ -1,235 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[out,pcn1=192.168.113.3] -4500 0030 5e11 4000 8006 3961 c0a8 7101 -c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 -7002 faf0 21a1 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[in,pcn1] -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 -6012 8000 a348 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[out,pcn1] -4500 00c4 5e12 4000 8006 38cc c0a8 7101 -c0a8 7103 05e7 06bb abf0 4aa6 a564 68db -5018 faf0 e2a0 0000 009c 0001 1a2b 3c4d -0001 0000 0100 0000 0000 0001 0000 0001 -0000 0a28 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 4d69 6372 6f73 6f66 7420 5769 -6e64 6f77 7320 4e54 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[in,pcn1] -4500 00c4 69a7 4000 4006 6d37 c0a8 7103 -c0a8 7101 06bb 05e7 a564 68db abf0 4b42 -5018 832c cecf 0000 009c 0001 1a2b 3c4d -0002 0000 0100 0100 0000 0000 0000 0000 -0001 0001 6c6f 6361 6c00 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 6c69 6e75 7800 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[out,pcn1] -4500 00d0 5e13 4000 8006 38bf c0a8 7101 -c0a8 7103 05e7 06bb abf0 4b42 a564 6977 -5018 fa54 ac07 0000 00a8 0001 1a2b 3c4d -0007 0000 4000 1331 0000 012c 05f5 e100 -0000 0003 0000 0003 0040 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[in,pcn1] -4500 0048 69a8 4000 4006 6db2 c0a8 7103 -c0a8 7101 06bb 05e7 a564 6977 abf0 4bea -5018 832c 36fa 0000 0020 0001 1a2b 3c4d -0008 0000 0000 4000 0100 0000 05f5 e100 -0040 0000 0000 0000 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -4500 0040 5e14 4000 8006 394e c0a8 7101 -c0a8 7103 05e7 06bb abf0 4bea a564 6997 -5018 fa34 e810 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 ffff ffff ffff ffff - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[out,pcn1] -4500 0039 5e15 0000 802f 792b c0a8 7101 -c0a8 7103 3001 880b 0019 0000 0000 0000 -ff03 c021 0100 0015 0104 0578 0506 577f -7c5b 0702 0802 0d03 06 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[in,pcn1] -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 -c0a8 7101 2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[in,pcn1] -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 -5010 832c b5c1 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -4500 0038 69ab 0000 ff2f ee95 c0a8 7103 -c0a8 7101 3001 880b 0018 4000 0000 0000 -ff03 c021 0101 0014 0206 0000 0000 0506 -22d9 0cfa 0702 0802 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[in,pcn1] -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 000b 4000 0000 0001 -0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -4500 003c 5e16 0000 802f 7927 c0a8 7101 -c0a8 7103 3081 880b 0018 0000 0000 0001 -0000 0001 ff03 c021 0201 0014 0206 0000 -0000 0506 22d9 0cfa 0702 0802 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -4500 0036 5e17 0000 802f 792c c0a8 7101 -c0a8 7103 3001 880b 0016 0000 0000 0002 -ff03 c021 0101 0012 0104 0578 0506 577f -7c5b 0702 0802 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -4500 003a 69ad 0000 ff2f ee91 c0a8 7103 -c0a8 7101 3081 880b 0016 4000 0000 0002 -0000 0002 ff03 c021 0201 0012 0104 0578 -0506 577f 7c5b 0702 0802 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[in,pcn1] -4500 0032 69ae 0000 ff2f ee98 c0a8 7103 -c0a8 7101 3001 880b 0012 4000 0000 0003 -8021 0101 0010 0306 c0a8 0001 0206 002d -0f01 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -4500 0040 5e18 4000 8006 394a c0a8 7101 -c0a8 7103 05e7 06bb abf0 4c02 a564 6997 -5018 fa34 e7f8 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 0000 0000 ffff ffff - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[out,pcn1] -4500 0038 5e19 0000 802f 7928 c0a8 7101 -c0a8 7103 3081 880b 0014 0000 0000 0003 -0000 0003 c021 0c02 0012 577f 7c5b 4d53 -5241 5356 352e 3130 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[in,pcn1] -4500 003e 69af 0000 ff2f ee8b c0a8 7103 -c0a8 7101 3081 880b 001a 4000 0000 0004 -0000 0003 ff03 c021 0702 0016 0c02 0012 -577f 7c5b 4d53 5241 5356 352e 3130 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[out,pcn1] -4500 003e 5e1a 0000 802f 7921 c0a8 7101 -c0a8 7103 3081 880b 001a 0000 0000 0004 -0000 0004 c021 0c03 0018 577f 7c5b 4d53 -5241 532d 302d 434c 4159 4d4f 4f52 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[in,pcn1] -4500 0044 69b0 0000 ff2f ee84 c0a8 7103 -c0a8 7101 3081 880b 0020 4000 0000 0005 -0000 0004 ff03 c021 0703 001c 0c03 0018 -577f 7c5b 4d53 5241 532d 302d 434c 4159 -4d4f 4f52 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[out,pcn1] -4500 0030 5e1b 0000 802f 792e c0a8 7101 -c0a8 7103 3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[in,pcn1] -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[in,pcn1] -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 -c0a8 7101 3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -4500 0048 5e1c 0000 802f 7915 c0a8 7101 -c0a8 7103 3081 880b 0024 0000 0000 0006 -0000 0007 8021 0105 0022 0306 0000 0000 -8106 0000 0000 8206 0000 0000 8306 0000 -0000 8406 0000 0000 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -4500 0042 69b3 0000 ff2f ee83 c0a8 7103 -c0a8 7101 3081 880b 001e 4000 0000 0008 -0000 0006 8021 0405 001c 8106 0000 0000 -8206 0000 0000 8306 0000 0000 8406 0000 -0000 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[out,pcn1] -4500 0030 5e1d 0000 802f 792c c0a8 7101 -c0a8 7103 3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[in,pcn1] -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 -c0a8 7101 3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[out,pcn1] -4500 002a 5e1e 0000 802f 7931 c0a8 7101 -c0a8 7103 3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[out,pcn1] -4500 0032 5e1f 0000 802f 7928 c0a8 7101 -c0a8 7103 3001 880b 0012 0000 0000 0009 -80fd 0506 0010 577f 7c5b 003c cd74 0000 -02dc - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[in,pcn1] -4500 002a 69b5 0000 ff2f ee99 c0a8 7103 -c0a8 7101 3081 880b 0006 4000 0000 000a -0000 0009 80fd 0606 0004 - diff --git a/contrib/ipfilter/test/input/ni16 b/contrib/ipfilter/test/input/ni16 deleted file mode 100644 index 362b98d..0000000 --- a/contrib/ipfilter/test/input/ni16 +++ /dev/null @@ -1,235 +0,0 @@ -# 23:18:36.130424 192.168.113.1.1511 > 192.168.113.3.1723: S 2884651685:2884651685(0) win 64240 <mss 1460,nop,nop,sackOK> (DF) -[out,pcn1=192.168.113.1] -4500 0030 5e11 4000 8006 5f07 0a02 0202 -c0a8 7103 05e7 06bb abf0 4aa5 0000 0000 -7002 faf0 4747 0000 0204 05b4 0101 0402 - -# 23:18:36.130778 192.168.113.3.1723 > 192.168.113.1.1511: S 2774821082:2774821082(0) ack 2884651686 win 32768 <mss 1460> (DF) -[in,pcn1] -4500 002c 69a6 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 68da abf0 4aa6 -6012 8000 a348 0000 0204 05b4 - -# 23:18:36.130784 192.168.113.1.1511 > 192.168.113.3.1723: P 1:157(156) ack 1 win 64240: pptp CTRL_MSGTYPE=SCCRQ PROTO_VER(1.0) FRAME_CAP(A) BEARER_CAP(A) MAX_CHAN(0) FIRM_REV(2600) HOSTNAME() VENDOR(Microsoft Windows NT) (DF) -[out,pcn1] -4500 00c4 5e12 4000 8006 5e72 0a02 0202 -c0a8 7103 05e7 06bb abf0 4aa6 a564 68db -5018 faf0 0847 0000 009c 0001 1a2b 3c4d -0001 0000 0100 0000 0000 0001 0000 0001 -0000 0a28 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 4d69 6372 6f73 6f66 7420 5769 -6e64 6f77 7320 4e54 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260235 192.168.113.3.1723 > 192.168.113.1.1511: P 1:157(156) ack 157 win 33580: pptp CTRL_MSGTYPE=SCCRP PROTO_VER(1.0) RESULT_CODE(1) ERR_CODE(0) FRAME_CAP() BEARER_CAP() MAX_CHAN(1) FIRM_REV(1) HOSTNAME(local) VENDOR(linux) (DF) -[in,pcn1] -4500 00c4 69a7 4000 4006 6d37 c0a8 7103 -c0a8 7101 06bb 05e7 a564 68db abf0 4b42 -5018 832c cecf 0000 009c 0001 1a2b 3c4d -0002 0000 0100 0100 0000 0000 0000 0000 -0001 0001 6c6f 6361 6c00 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 6c69 6e75 7800 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -# 23:18:36.260252 192.168.113.1.1511 > 192.168.113.3.1723: P 157:325(168) ack 157 win 64084: pptp CTRL_MSGTYPE=OCRQ CALL_ID(16384) CALL_SER_NUM(4913) MIN_BPS(300) MAX_BPS(100000000) BEARER_TYPE(Any) FRAME_TYPE(E) RECV_WIN(64) PROC_DELAY(0) PHONE_NO_LEN(0) PHONE_NO() SUB_ADDR() (DF) -[out,pcn1] -4500 00d0 5e13 4000 8006 5e65 0a02 0202 -c0a8 7103 05e7 06bb abf0 4b42 a564 6977 -5018 fa54 d1ad 0000 00a8 0001 1a2b 3c4d -0007 0000 4000 1331 0000 012c 05f5 e100 -0000 0003 0000 0003 0040 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 - -# 23:18:36.272856 192.168.113.3.1723 > 192.168.113.1.1511: P 157:189(32) ack 325 win 33580: pptp CTRL_MSGTYPE=OCRP CALL_ID(0) PEER_CALL_ID(16384) RESULT_CODE(1) ERR_CODE(0) CAUSE_CODE(0) CONN_SPEED(100000000) RECV_WIN(64) PROC_DELAY(0) PHY_CHAN_ID(0) (DF) -[in,pcn1] -4500 0048 69a8 4000 4006 6db2 c0a8 7103 -c0a8 7101 06bb 05e7 a564 6977 abf0 4bea -5018 832c 36fa 0000 0020 0001 1a2b 3c4d -0008 0000 0000 4000 0100 0000 05f5 e100 -0040 0000 0000 0000 - -# 23:18:36.321819 192.168.113.1.1511 > 192.168.113.3.1723: P 325:349(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0xffffffff) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -4500 0040 5e14 4000 8006 5ef4 0a02 0202 -c0a8 7103 05e7 06bb abf0 4bea a564 6997 -5018 fa34 0db7 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 ffff ffff ffff ffff - -# 23:18:36.349759 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:0 ppp: LCP 25: Conf-Req(0), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC, Call-Back CBCP -[out,pcn1] -4500 0039 5e15 0000 802f 9ed1 0a02 0202 -c0a8 7103 3001 880b 0019 0000 0000 0000 -ff03 c021 0100 0015 0104 0578 0506 577f -7c5b 0702 0802 0d03 06 - -# 23:18:36.389970 192.168.113.3 > 192.168.113.1: gre [KAv1] ID:4000 A:4294967295 [|gre] -[in,pcn1] -4500 0020 69a9 0000 ff2f eeaf c0a8 7103 -c0a8 7101 2081 880b 0000 4000 ffff ffff - -# 23:18:36.518426 192.168.113.3.1723 > 192.168.113.1.1511: . ack 349 win 33580 (DF) -[in,pcn1] -4500 0028 69aa 4000 4006 6dd0 c0a8 7103 -c0a8 7101 06bb 05e7 a564 6997 abf0 4c02 -5010 832c b5c1 0000 - -# 23:18:36.555363 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:0 ppp: LCP 24: Conf-Req(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[in,pcn1] -4500 0038 69ab 0000 ff2f ee95 c0a8 7103 -c0a8 7101 3001 880b 0018 4000 0000 0000 -ff03 c021 0101 0014 0206 0000 0000 0506 -22d9 0cfa 0702 0802 - -# 23:18:36.556030 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:1 A:0 ppp: LCP 11: Conf-Rej(0), Call-Back CBCP -[in,pcn1] -4500 002f 69ac 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 000b 4000 0000 0001 -0000 0000 ff03 c021 0400 0007 0d03 06 - -# 23:18:36.557166 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:1 A:1 ppp: LCP 24: Conf-Ack(1), ACCM=00000000, Magic-Num=22d90cfa, PFC, ACFC -[out,pcn1] -4500 003c 5e16 0000 802f 9ecd 0a02 0202 -c0a8 7103 3081 880b 0018 0000 0000 0001 -0000 0001 ff03 c021 0201 0014 0206 0000 -0000 0506 22d9 0cfa 0702 0802 - -# 23:18:36.557764 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:2 ppp: LCP 22: Conf-Req(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[out,pcn1] -4500 0036 5e17 0000 802f 9ed2 0a02 0202 -c0a8 7103 3001 880b 0016 0000 0000 0002 -ff03 c021 0101 0012 0104 0578 0506 577f -7c5b 0702 0802 - -# 23:18:36.564658 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:2 A:2 ppp: LCP 22: Conf-Ack(1), MRU=1400, Magic-Num=577f7c5b, PFC, ACFC -[in,pcn1] -4500 003a 69ad 0000 ff2f ee91 c0a8 7103 -c0a8 7101 3081 880b 0016 4000 0000 0002 -0000 0002 ff03 c021 0201 0012 0104 0578 -0506 577f 7c5b 0702 0802 - -# 23:18:36.564803 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:3 ppp: IPCP 18: Conf-Req(1), IP-Addr=192.168.0.1, IP-Comp VJ-Comp -[in,pcn1] -4500 0032 69ae 0000 ff2f ee98 c0a8 7103 -c0a8 7101 3001 880b 0012 4000 0000 0003 -8021 0101 0010 0306 c0a8 0001 0206 002d -0f01 - -# 23:18:36.570395 192.168.113.1.1511 > 192.168.113.3.1723: P 349:373(24) ack 189 win 64052: pptp CTRL_MSGTYPE=SLI PEER_CALL_ID(0) SEND_ACCM(0x00000000) RECV_ACCM(0xffffffff) (DF) -[out,pcn1] -4500 0040 5e18 4000 8006 5ef0 0a02 0202 -c0a8 7103 05e7 06bb abf0 4c02 a564 6997 -5018 fa34 0d9f 0000 0018 0001 1a2b 3c4d -000f 0000 0000 0000 0000 0000 ffff ffff - -# 23:18:36.573307 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:3 A:3 ppp: LCP 20: Ident(2), Magic-Num=577f7c5b -[out,pcn1] -4500 0038 5e19 0000 802f 9ece 0a02 0202 -c0a8 7103 3081 880b 0014 0000 0000 0003 -0000 0003 c021 0c02 0012 577f 7c5b 4d53 -5241 5356 352e 3130 - -# 23:18:36.573856 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:4 A:3 ppp: LCP 26: Code-Rej(2) -[in,pcn1] -4500 003e 69af 0000 ff2f ee8b c0a8 7103 -c0a8 7101 3081 880b 001a 4000 0000 0004 -0000 0003 ff03 c021 0702 0016 0c02 0012 -577f 7c5b 4d53 5241 5356 352e 3130 - -# 23:18:36.584936 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:4 A:4 ppp: LCP 26: Ident(3), Magic-Num=577f7c5b -[out,pcn1] -4500 003e 5e1a 0000 802f 9ec7 0a02 0202 -c0a8 7103 3081 880b 001a 0000 0000 0004 -0000 0004 c021 0c03 0018 577f 7c5b 4d53 -5241 532d 302d 434c 4159 4d4f 4f52 - -# 23:18:36.585562 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:5 A:4 ppp: LCP 32: Code-Rej(3) -[in,pcn1] -4500 0044 69b0 0000 ff2f ee84 c0a8 7103 -c0a8 7101 3081 880b 0020 4000 0000 0005 -0000 0004 ff03 c021 0703 001c 0c03 0018 -577f 7c5b 4d53 5241 532d 302d 434c 4159 -4d4f 4f52 - -# 23:18:36.588721 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:5 A:5 ppp: CCP 12: Conf-Req(4), MPPC -[out,pcn1] -4500 0030 5e1b 0000 802f 9ed4 0a02 0202 -c0a8 7103 3081 880b 000c 0000 0000 0005 -0000 0005 80fd 0104 000a 1206 0100 0001 - -# 23:18:36.589445 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:6 A:5 ppp: CCP 6: Conf-Req(1) -[in,pcn1] -4500 002a 69b1 0000 ff2f ee9d c0a8 7103 -c0a8 7101 3081 880b 0006 4000 0000 0006 -0000 0005 80fd 0101 0004 - -# 23:18:36.589540 192.168.113.3 > 192.168.113.1: gre [KSv1] ID:4000 S:7 ppp: CCP 12: Conf-Rej(4), MPPC -[in,pcn1] -4500 002c 69b2 0000 ff2f ee9a c0a8 7103 -c0a8 7101 3001 880b 000c 4000 0000 0007 -80fd 0404 000a 1206 0100 0001 - -# 23:18:36.590023 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:6 A:7 ppp: IPCP 36: Conf-Req(5), IP-Addr=0.0.0.0, Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[out,pcn1] -4500 0048 5e1c 0000 802f 9ebb 0a02 0202 -c0a8 7103 3081 880b 0024 0000 0000 0006 -0000 0007 8021 0105 0022 0306 0000 0000 -8106 0000 0000 8206 0000 0000 8306 0000 -0000 8406 0000 0000 - -# 23:18:36.590489 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:8 A:6 ppp: IPCP 30: Conf-Rej(5), Pri-DNS=0.0.0.0, Pri-NBNS=0.0.0.0, Sec-DNS=0.0.0.0, Sec-NBNS=0.0.0.0 -[in,pcn1] -4500 0042 69b3 0000 ff2f ee83 c0a8 7103 -c0a8 7101 3081 880b 001e 4000 0000 0008 -0000 0006 8021 0405 001c 8106 0000 0000 -8206 0000 0000 8306 0000 0000 8406 0000 -0000 - -# 23:18:36.591003 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:7 A:8 ppp: IPCP 12: Conf-Rej(1), IP-Comp VJ-Comp -[out,pcn1] -4500 0030 5e1d 0000 802f 9ed2 0a02 0202 -c0a8 7103 3081 880b 000c 0000 0000 0007 -0000 0008 8021 0401 000a 0206 002d 0f01 - -# 23:18:36.593819 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:9 A:7 ppp: IPCP 12: Conf-Req(2), IP-Addr=192.168.0.1 -[in,pcn1] -4500 0030 69b4 0000 ff2f ee94 c0a8 7103 -c0a8 7101 3081 880b 000c 4000 0000 0009 -0000 0007 8021 0102 000a 0306 c0a8 0001 - -# 23:18:36.594840 192.168.113.1 > 192.168.113.3: gre [KSAv1] ID:0000 S:8 A:9 ppp: CCP 6: Conf-Ack(1) -[out,pcn1] -4500 002a 5e1e 0000 802f 9ed7 0a02 0202 -c0a8 7103 3081 880b 0006 0000 0000 0008 -0000 0009 80fd 0201 0004 - -# 23:18:36.595525 192.168.113.1 > 192.168.113.3: gre [KSv1] ID:0000 S:9 ppp: CCP 18: Term-Req(6) -[out,pcn1] -4500 0032 5e1f 0000 802f 9ece 0a02 0202 -c0a8 7103 3001 880b 0012 0000 0000 0009 -80fd 0506 0010 577f 7c5b 003c cd74 0000 -02dc - -# 23:18:36.595937 192.168.113.3 > 192.168.113.1: gre [KSAv1] ID:4000 S:10 A:9 ppp: CCP 6: Term-Ack(6) -[in,pcn1] -4500 002a 69b5 0000 ff2f ee99 c0a8 7103 -c0a8 7101 3081 880b 0006 4000 0000 000a -0000 0009 80fd 0606 0004 - diff --git a/contrib/ipfilter/test/input/ni17 b/contrib/ipfilter/test/input/ni17 deleted file mode 100644 index f9dec94..0000000 --- a/contrib/ipfilter/test/input/ni17 +++ /dev/null @@ -1,6 +0,0 @@ -in on le0 tcp 10.2.2.5,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.6,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.7,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.7,2001 203.1.1.1,80 -in on le0 tcp 10.2.2.8,2000 203.1.1.1,80 -in on le0 tcp 10.2.2.9,2000 203.1.1.1,80 diff --git a/contrib/ipfilter/test/input/ni18 b/contrib/ipfilter/test/input/ni18 deleted file mode 100644 index 4e06f79..0000000 --- a/contrib/ipfilter/test/input/ni18 +++ /dev/null @@ -1,4 +0,0 @@ -in on hme0 tcp 2.2.2.2,3000 192.168.1.2,80 -in on hme0 tcp 2.2.2.2,3000 192.168.1.1,80 -out on hme1 tcp 10.1.2.2,5050 4.5.6.7,80; -out on hme1 tcp 10.1.1.2,5050 4.5.6.7,80; diff --git a/contrib/ipfilter/test/input/ni19 b/contrib/ipfilter/test/input/ni19 deleted file mode 100644 index 3ea706f..0000000 --- a/contrib/ipfilter/test/input/ni19 +++ /dev/null @@ -1,157 +0,0 @@ -# 192.168.113.3.1009 > 10.1.1.4.shell: SYN win 32768 <mss 1460,nop,wscale 0,sackOK,nop,nop,nop,nop,timestamp 0 0> -[out,bge0] -4500 0040 e3fc 4000 4006 1a0b c0a8 7103 -0a01 0104 03f1 0202 6523 90b2 0000 0000 -b002 8000 7d87 0000 0204 05b4 0103 0300 -0402 0101 0101 080a 0000 0000 0000 0000 - -# 10.1.1.4.shell > 10.1.1.1.1009: SYN win 5840 <mss 1460,nop,nop,sackOK,nop,wscale 2> -[in,bge0] -4500 0034 0000 4000 4006 24be 0a01 0104 -0a01 0101 0202 03f1 915a a5c4 6523 90b3 -8012 16d0 0f47 0000 0204 05b4 0101 0402 -0103 0302 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e3fd 4000 4006 1a22 c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5010 832c bd0d 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 002d e3fe 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5018 832c 5b98 0000 3130 3038 00 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7ce5 4000 4006 a7e4 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90b8 -5010 05b4 612b 0000 - -# 10.1.1.4.1023 > 10.1.1.1.1008: SYN win 5840 <mss 1460,sackOK,timestamp 3791140 0,nop,wscale 2> -[in,bge0] -4500 003c 1186 4000 4006 1330 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a2 0000 0000 -a002 16d0 df6a 0000 0204 05b4 0402 080a -0039 d924 0000 0000 0103 0302 - -# 192.168.113.3.1008 > 10.1.1.4.1023: SYN win 32768 <mss 1460,nop,wscale 0,nop,nop,timestamp 0 3791140,sackOK,nop,nop> -[out,bge0] -4500 0040 e3ff 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 -b012 8000 1e85 0000 0204 05b4 0103 0300 -0101 080a 0000 0000 0039 d924 0402 0101 - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0034 1188 4000 4006 1336 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a3 66e5 b811 -8010 05b4 0046 0000 0101 080a 0039 d925 -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0030 e400 4000 4006 1a17 c0a8 7103 -0a01 0104 03f1 0202 6523 90b8 915a a5c5 -5018 832c 0eb6 0000 6461 7272 656e 7200 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7ce7 4000 4006 a7e2 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90c0 -5010 05b4 6123 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0053 e401 4000 4006 19f3 c0a8 7103 -0a01 0104 03f1 0202 6523 90c0 915a a5c5 -5018 832c a63d 0000 6461 7272 656e 7200 -7368 202d 6320 2265 6368 6f20 666f 6f20 -3e26 313b 2065 6368 6f20 6261 7220 3e26 -3222 00 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7ce9 4000 4006 a7e0 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90eb -5010 05b4 60f8 0000 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0029 7ceb 4000 4006 a7dd 0a01 0104 -0a01 0101 0202 03f1 915a a5c5 6523 90eb -5018 05b4 60ef 0000 00 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e403 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5c6 -5010 832c bcd4 0000 - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 002c 7ced 4000 4006 a7d8 0a01 0104 -0a01 0101 0202 03f1 915a a5c6 6523 90eb -5018 05b4 8b71 0000 666f 6f0a - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0038 118a 4000 4006 1330 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a3 66e5 b811 -8018 05b4 2787 0000 0101 080a 0039 dd6c -0000 0000 6261 720a - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 7cef 4000 4006 a7da 0a01 0104 -0a01 0101 0202 03f1 915a a5ca 6523 90eb -5011 05b4 60f2 0000 - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0034 118c 4000 4006 1332 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a7 66e5 b811 -8011 05b4 fbf8 0000 0101 080a 0039 dd6d -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e404 4000 4006 1a1b c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5010 8328 bcd3 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 -[out,bge0] -4500 0034 e405 4000 4006 1a0e c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8010 8328 57d7 0000 0101 080a 0000 0004 -0039 dd6c - -# 192.168.113.3.1009 > 10.1.1.4.shell -[out,bge0] -4500 0028 e40a 4000 4006 1a15 c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5011 832c bcce 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 -[out,bge0] -4500 0034 e40b 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8011 832c 57d2 0000 0101 080a 0000 0004 -0039 dd6c - -# 10.1.1.4.shell > 10.1.1.1.1009 -[in,bge0] -4500 0028 0004 4000 4006 24c6 0a01 0104 -0a01 0101 0202 03f1 915a a5cb 6523 90ec -5010 05b4 60f1 0000 - -# 10.1.1.4.1023 > 10.1.1.1.1008 -[in,bge0] -4500 0034 118e 4000 4006 1330 0a01 0104 -0a01 0101 03ff 03f0 91d4 c8a8 66e5 b812 -8010 05b4 fbf2 0000 0101 080a 0039 dd6e -0000 0004 - diff --git a/contrib/ipfilter/test/input/ni2 b/contrib/ipfilter/test/input/ni2 deleted file mode 100644 index 6dcedb7..0000000 --- a/contrib/ipfilter/test/input/ni2 +++ /dev/null @@ -1,143 +0,0 @@ -# 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 - -[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 -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 - -[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 -5018 2232 d80a 0000 0000 0000 0000 0000 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0000 - -[in,xl0] -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 - -[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 --git a/contrib/ipfilter/test/input/ni20 b/contrib/ipfilter/test/input/ni20 deleted file mode 100644 index 065ed27..0000000 --- a/contrib/ipfilter/test/input/ni20 +++ /dev/null @@ -1,157 +0,0 @@ -# 192.168.113.3.1009 > 10.1.1.4.shell: SYN win 32768 <mss 1460,nop,wscale 0,sackOK,nop,nop,nop,nop,timestamp 0 0> -[in,bge0] -4500 0040 e3fc 4000 4006 1a0b c0a8 7103 -0a01 0104 03f1 0202 6523 90b2 0000 0000 -b002 8000 7d87 0000 0204 05b4 0103 0300 -0402 0101 0101 080a 0000 0000 0000 0000 - -# 192.168.113.4.shell > 192.168.113.3.1009: SYN win 5840 <mss 1460,nop,nop,sackOK,nop,wscale 2> -[out,bge0] -4500 0034 0000 4000 4006 d76b c0a8 7104 -c0a8 7103 0202 03f1 915a a5c4 6523 90b3 -8012 16d0 c1f4 0000 0204 05b4 0101 0402 -0103 0302 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[in,bge0] -4500 0028 e3fd 4000 4006 1a22 c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5010 832c bd0d 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell -[in,bge0] -4500 002d e3fe 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90b3 915a a5c5 -5018 832c 5b98 0000 3130 3038 00 - -# 192.168.113.4.shell > 192.168.113.3.1009 -[out,bge0] -4500 0028 7ce5 4000 4006 5a92 c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90b8 -5010 05b4 13d9 0000 - -# 192.168.113.4.1023 > 192.168.113.3.1008: SYN win 5840 <mss 1460,sackOK,timestamp 3791140 0,nop,wscale 2> -[out,bge0] -4500 003c 1186 4000 4006 c5dd c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a2 0000 0000 -a002 16d0 9218 0000 0204 05b4 0402 080a -0039 d924 0000 0000 0103 0302 - -# 192.168.113.3.1008 > 10.1.1.4.1023: SYN win 32768 <mss 1460,nop,wscale 0,nop,nop,timestamp 0 3791140,sackOK,nop,nop> -[in,bge0] -4500 0040 e3ff 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b810 91d4 c8a3 -b012 8000 1e85 0000 0204 05b4 0103 0300 -0101 080a 0000 0000 0039 d924 0402 0101 - -# 192.168.113.4.1023 > 192.168.113.3.1008 ACK -[out,bge0] -4500 0034 1188 4000 4006 c5e3 c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 -8010 05b4 b2f3 0000 0101 080a 0039 d925 -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell PUSH+ACK -[in,bge0] -4500 0030 e400 4000 4006 1a17 c0a8 7103 -0a01 0104 03f1 0202 6523 90b8 915a a5c5 -5018 832c 0eb6 0000 6461 7272 656e 7200 - -# 192.168.113.4.shell > 192.168.113.3.1009 ACK -[out,bge0] -4500 0028 7ce7 4000 4006 5a90 c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90c0 -5010 05b4 13d1 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell PUSH+ACK -[in,bge0] -4500 0053 e401 4000 4006 19f3 c0a8 7103 -0a01 0104 03f1 0202 6523 90c0 915a a5c5 -5018 832c a63d 0000 6461 7272 656e 7200 -7368 202d 6320 2265 6368 6f20 666f 6f20 -3e26 313b 2065 6368 6f20 6261 7220 3e26 -3222 00 - -# 192.168.113.4.shell > 192.168.113.3.1009 ACK -[out,bge0] -4500 0028 7ce9 4000 4006 5a8e c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90eb -5010 05b4 13a6 0000 - -# 192.168.113.4.shell > 192.168.113.3.1009 PUSH+ACK -[out,bge0] -4500 0029 7ceb 4000 4006 5a8b c0a8 7104 -c0a8 7103 0202 03f1 915a a5c5 6523 90eb -5018 05b4 139d 0000 00 - -# 192.168.113.3.1009 > 10.1.1.4.shell ACK -[in,bge0] -4500 0028 e403 4000 4006 1a1c c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5c6 -5010 832c bcd4 0000 - -# 192.168.113.4.shell > 192.168.113.3.1009 PUSH+ACK -[out,bge0] -4500 002c 7ced 4000 4006 5a86 c0a8 7104 -c0a8 7103 0202 03f1 915a a5c6 6523 90eb -5018 05b4 3e1f 0000 666f 6f0a - -# 192.168.113.4.1023 > 192.168.113.3.1008 PUSH+ACK -[out,bge0] -4500 0038 118a 4000 4006 c5dd c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a3 66e5 b811 -8018 05b4 da34 0000 0101 080a 0039 dd6c -0000 0000 6261 720a - -# 192.168.113.4.shell > 192.168.113.3.1009 FIN+ACK -[out,bge0] -4500 0028 7cef 4000 4006 5a88 c0a8 7104 -c0a8 7103 0202 03f1 915a a5ca 6523 90eb -5011 05b4 13a0 0000 - -# 192.168.113.4.1023 > 192.168.113.3.1008 FIN+ACK -[out,bge0] -4500 0034 118c 4000 4006 c5df c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a7 66e5 b811 -8011 05b4 aea6 0000 0101 080a 0039 dd6d -0000 0000 - -# 192.168.113.3.1009 > 10.1.1.4.shell ACK -[in,bge0] -4500 0028 e404 4000 4006 1a1b c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5010 8328 bcd3 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 ACK -[in,bge0] -4500 0034 e405 4000 4006 1a0e c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8010 8328 57d7 0000 0101 080a 0000 0004 -0039 dd6c - -# 192.168.113.3.1009 > 10.1.1.4.shell FIN+ACK -[in,bge0] -4500 0028 e40a 4000 4006 1a15 c0a8 7103 -0a01 0104 03f1 0202 6523 90eb 915a a5cb -5011 832c bcce 0000 - -# 192.168.113.3.1008 > 10.1.1.4.1023 FIN+ACK -[in,bge0] -4500 0034 e40b 4000 4006 1a08 c0a8 7103 -0a01 0104 03f0 03ff 66e5 b811 91d4 c8a8 -8011 832c 57d2 0000 0101 080a 0000 0004 -0039 dd6c - -# 192.168.113.4.shell > 192.168.113.3.1009 ACK -[out,bge0] -4500 0028 0004 4000 4006 d773 c0a8 7104 -c0a8 7103 0202 03f1 915a a5cb 6523 90ec -5010 05b4 139f 0000 - -# 192.168.113.4.1023 > 192.168.113.3.1008 ACK -[out,bge0] -4500 0034 118e 4000 4006 c5dd c0a8 7104 -c0a8 7103 03ff 03f0 91d4 c8a8 66e5 b812 -8010 05b4 aea0 0000 0101 080a 0039 dd6e -0000 0004 - diff --git a/contrib/ipfilter/test/input/ni21 b/contrib/ipfilter/test/input/ni21 deleted file mode 100644 index daf741e..0000000 --- a/contrib/ipfilter/test/input/ni21 +++ /dev/null @@ -1,3 +0,0 @@ -out on lan0 2.2.2.2 3.3.3.3 -in on lan0 3.3.3.3 4.4.4.4 -out on lan0 2.2.2.2 3.3.3.3 diff --git a/contrib/ipfilter/test/input/ni23 b/contrib/ipfilter/test/input/ni23 deleted file mode 100644 index 938b7b8..0000000 --- a/contrib/ipfilter/test/input/ni23 +++ /dev/null @@ -1,3 +0,0 @@ -in on le0 udp 3.3.3.1,6700 1.1.2.3,4500 -in on hme0 udp 2.2.2.2,4500 4.4.4.4,6700 -out on bge0 udp 2.2.2.2,4500 3.3.3.1,6700 diff --git a/contrib/ipfilter/test/input/ni3 b/contrib/ipfilter/test/input/ni3 deleted file mode 100644 index e4d12fe..0000000 --- a/contrib/ipfilter/test/input/ni3 +++ /dev/null @@ -1,20 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[out,df0] -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 - -[in,df0] -4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606 -0303 acab 0000 0000 -4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 -5000 0050 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] -4500 0058 809a 0000 ff01 28f9 0303 0303 0606 0606 -0303 113f 0000 0000 -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 - diff --git a/contrib/ipfilter/test/input/ni4 b/contrib/ipfilter/test/input/ni4 deleted file mode 100644 index dac9f53..0000000 --- a/contrib/ipfilter/test/input/ni4 +++ /dev/null @@ -1,18 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[out,df0] -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 - -[in,df0] -4500 0038 809a 0000 ff01 2919 0303 0303 0606 0606 -0303 606b 0000 0000 4500 003c 4706 4000 ff06 20a2 0606 0606 0404 0404 9c40 0050 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[in,df0] -4500 0058 809a 0000 ff01 28f9 0303 0303 0606 0606 -0303 113f 0000 0000 -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 - diff --git a/contrib/ipfilter/test/input/ni5 b/contrib/ipfilter/test/input/ni5 deleted file mode 100644 index 4b32e49..0000000 --- a/contrib/ipfilter/test/input/ni5 +++ /dev/null @@ -1,363 +0,0 @@ -# 32818,21 SYN -[out,ppp0] -4500 002c 10c9 4000 ff06 3289 c0a8 0103 -96cb e002 8032 0015 bd6b c9c8 0000 0000 -6002 2238 35f9 0000 0204 05b4 - -# 21,32818 SYN+ACK -[in,ppp0] -4500 002c ffdd 4000 ef06 131e 96cb e002 -0101 0101 0015 8032 3786 76c4 bd6b c9c9 -6012 269c 4313 0000 0204 0584 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10ca 4000 ff06 328c c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 76c5 -5010 269c 9af6 0000 - -# ACK+PUSH "[220-coombs.anu.edu.au NcFTPd Server (free educational license) ready.\r\n" -[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 -4654 5064 2053 6572 7665 7220 2866 7265 -6520 6564 7563 6174 696f 6e61 6c20 6c69 -6365 6e73 6529 2072 6561 6479 2e0d 0a - -# 32818,21 ACK -[out,ppp0] -4500 0028 10cb 4000 ff06 328b c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 770c -5010 269c 9aaf 0000 - -# 21,32818 ACK+PUSH -# "220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Computing Unit)\r\n -# "220-Any problems contact ftpmaster@coombs.anu.edu.au\r\n" -# "220-\r\n220 \r\n" -[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 -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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10cc 4000 ff06 328a c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 77ab -5010 269c 9a10 0000 - -# 32818,21 ACK+PUSH "USER anonymous\r\n" -[out,ppp0] -4500 0038 10cd 4000 ff06 3279 c0a8 0103 -96cb e002 8032 0015 bd6b c9c9 3786 77ab -5018 269c 121c 0000 5553 4552 2061 6e6f -6e79 6d6f 7573 0d0a - -# 21,32818 ACK -[in,ppp0] -4500 0028 ffe0 4000 ef06 131f 96cb e002 -0101 0101 0015 8032 3786 77ab bd6b c9d9 -5010 269c 59aa 0000 - -# 21,32818 ACK+PUSH "331 Guest login ok, send your complete e-mail address as password.\r\n" -[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 -2079 6f75 7220 636f 6d70 6c65 7465 2065 -2d6d 6169 6c20 6164 6472 6573 7320 6173 -2070 6173 7377 6f72 642e 0d0a - -# 32818,21 ACK -[out,ppp0] -4500 0028 10ce 4000 ff06 3288 c0a8 0103 -96cb e002 8032 0015 bd6b c9d9 3786 77ef -5010 269c 99bc 0000 - -# 32818,21 ACK+PUSH "PASS avalon@\r\n" -[out,ppp0] -4500 0036 10cf 4000 ff06 3279 c0a8 0103 -96cb e002 8032 0015 bd6b c9d9 3786 77ef -5018 269c 7795 0000 5041 5353 2061 7661 -6c6f 6e40 0d0a - -# 21,32818 ACK+PUSH -# "230-You are user #4 of 50 simultaneous users allowed.\r\n" -[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 -3020 7369 6d75 6c74 616e 656f 7573 2075 -7365 7273 2061 6c6c 6f77 6564 2e0d 0a - -# 32818,21 ACK -[out,ppp0] -4500 0028 10d0 4000 ff06 3286 c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7826 -5010 269c 9977 0000 - -# 21,32818 ACK+PUSH -# "230-\r\n230-\r\n" -# "230-Hi. We're cleaning up. Any feedback most welcome. 10 Aug 00\r\n" -# "230-\r\n230 Logged in anonymously.\r\n" -[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 -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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10d1 4000 ff06 3285 c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7897 -5010 269c 9906 0000 - -# 32818,21 ACK "TYPE I\r\n" -[out,ppp0] -4500 0030 10d2 4000 ff06 327c c0a8 0103 -96cb e002 8032 0015 bd6b c9e7 3786 7897 -5018 269c c704 0000 5459 5045 2049 0d0a - -# 21,32818 "200 Type okay.\r\n" -[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 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10d3 4000 ff06 3283 c0a8 0103 -96cb e002 8032 0015 bd6b c9ef 3786 78a7 -5010 269c 98ee 0000 - -# 32818,21 ACK "PORT 192,158,1,3,128,51\r\n" -[out,ppp0] -4500 0041 10d4 4000 ff06 3269 c0a8 0103 -96cb e002 8032 0015 bd6b c9ef 3786 78a7 -5018 269c 1c4d 0000 504f 5254 2031 3932 -2c31 3638 2c31 2c33 2c31 3238 2c35 310d -0a - -# 32818,21 ACK "200 PORT command successful.\r\n" -[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 -6675 6c2e 0d0a - -# 32818,21 "TYPE A\r\n" -[out,ppp0] -4500 0030 10d5 4000 ff06 3279 c0a8 0103 -96cb e002 8032 0015 bd6b ca08 3786 78c5 -5018 269c c6bd 0000 5459 5045 2041 0d0a - -# 21,32818 "200 Type okay.\r\n" -[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 - -# 32818,21 "NLST\r\n" -[out,ppp0] -4500 002e 10d6 4000 ff06 327a c0a8 0103 -96cb e002 8032 0015 bd6b ca10 3786 78d5 -5018 269c e9e6 0000 4e4c 5354 0d0a - -# 20,32819 SYN -[in,ppp0] -4500 002c ffe7 4000 ef06 1314 96cb e002 -0101 0101 0014 8033 d9f8 11d4 0000 0000 -6002 2238 913a 0000 0204 0584 - -# 32819,20 SYN+ACK -[out,ppp0] -4500 002c 10d7 4000 ff06 327b c0a8 0103 -96cb e002 8033 0014 bd78 5c12 d9f8 11d5 -6012 02f8 d734 0000 0204 0584 - -# 20,32819 ACK -[in,ppp0] -4500 0028 ffe8 4000 ef06 1317 96cb e002 -0101 0101 0014 8033 d9f8 11d5 bd78 5c13 -5010 269c 8ac7 0000 - -# 21,32818 ACK "150 Opening ASCII mode data connection for /bin/ls.\r\n" -[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 -6174 6120 636f 6e6e 6563 7469 6f6e 2066 -6f72 202f 6269 6e2f 6c73 2e0d 0a - -# 32819,20 ACK -[out,ppp0] -4500 0028 10d8 4000 ff06 327e c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 11d5 -5010 6348 8e71 0000 - -# 32818,21 ACK+PUSH "PORT 192,158,1,3,128,52\r\n" -[out,ppp0] -4500 0041 10d9 4000 ff06 3264 c0a8 0103 -96cb e002 8032 0015 bd6b ca16 3786 78d5 -5018 269c 1af8 0000 504f 5254 2031 3932 -2c31 3638 2c31 2c33 2c31 3238 2c35 320d -0a - -# 21,32818 ACK+PUSH "200 PORT command successful\r\n" -[in,ppp0] -4500 0046 ffea 4000 ef06 12f7 96cb e002 -0101 0101 0015 8032 3786 78d5 bd6b ca2f -5018 269c 9b1c 0000 3230 3020 504f 5254 -2063 6f6d 6d61 6e64 2073 7563 6365 7373 -6675 6c2e 0d0a - -# 32818,21 ACK+PUSH "TYPE A\r\n" -[out,ppp0] -4500 0030 10da 4000 ff06 3274 c0a8 0103 -96cb e002 8032 0015 bd6b ca2f 3786 78f3 -5018 269c c668 0000 5459 5045 2041 0d0a - -# 21,32818 "200 Type okay.\r\n" -[in,ppp0] -4500 0038 ffeb 4000 ef06 1304 96cb e002 -0101 0101 0015 8032 3786 78f3 bd6b ca37 -5018 269c 1ea4 0000 3230 3020 5479 7065 -206f 6b61 793e 0d0a - -# 32818,21 ACK+PUSH "NLST\r\n" -[out,ppp0] -4500 002e 10db 4000 ff06 3275 c0a8 0103 -96cb e002 8032 0015 bd6b ca37 3786 7903 -5018 269c e991 0000 4e4c 5354 0d0a - -# 20,32820 2nd connection SYN -[in,ppp0] -4500 002c ffec 4000 ef06 130f 96cb e002 -0101 0101 0014 8034 d9f8 11d4 0000 0000 -6002 2238 9139 0000 0204 0584 - -# 32820,20 SYN+ACK -[out,ppp0] -4500 002c 10d7 4000 ff06 327b c0a8 0103 -96cb e002 8034 0014 bd78 5c12 d9f8 11d5 -6012 02f8 d733 0000 0204 0584 - -# 20,32820 ACK -[in,ppp0] -4500 0028 ffec 4000 ef06 1313 96cb e002 -0101 0101 0014 8034 d9f8 11d4 0000 0000 -5010 2238 a8b7 0000 - -# 20,32819 ACK+PUSH -[in,ppp0] -4500 0063 ffed 4000 ef06 12d7 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 -6e64 2d66 696c 6573 0d0a 696e 636f 6d69 -6e67 0d0a 6e6c 632d 7465 7374 0d0a 7075 -620d 0a - -# 32819,20 ACK -[out,ppp0] -4500 0028 10dc 4000 ff06 327a c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1210 -5010 6348 8e36 0000 - -# 20,32819 FIN+ACK -[in,ppp0] -4500 0028 ffee 4000 ef06 1311 96cb e002 -0101 0101 0014 8033 d9f8 1210 bd78 5c13 -5011 269c 8a8b 0000 - -# 32819,20 ACK -[out,ppp0] -4500 0028 10dd 4000 ff06 3279 c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1211 -5010 6348 8e35 0000 - -# 32819,20 FIN+ACK -[out,ppp0] -4500 0028 10dd 4000 ff06 3279 c0a8 0103 -96cb e002 8033 0014 bd78 5c13 d9f8 1211 -5011 6348 8e34 0000 - -# 20,32819 ACK -[in,ppp0] -4500 0028 ffef 4000 ef06 1310 96cb e002 -0101 0101 0014 8033 d9f8 1211 bd78 5c14 -5010 269c 8a8a 0000 - -# 21,32818 220 "226 Listing completed.\r\n" -[in,ppp0] -4500 0040 fff0 4000 ef06 12f7 96cb e002 -0101 0101 0015 8032 3786 7903 bd6b ca37 -5018 269c 3c32 0000 3232 3620 4c69 7374 -696e 6720 636f 6d70 6c65 7465 642e 0d0a - -# 32818,21 ACK -[out,ppp0] -4500 0028 10e0 4000 ff06 3276 c0a8 0103 -96cb e002 8032 0015 bd6b ca37 3786 791b -5010 269c 9832 0000 - -# 32818,21 "QUIT\r\n" -[out,ppp0] -4500 002e 10e1 4000 ff06 326f c0a8 0103 -96cb e002 8032 0015 bd6b ca37 3786 791b -5018 269c f070 0000 5155 4954 0d0a - -# 21,32818 "221 Goodbye." -[in,ppp0] -4500 0036 fff2 4000 ef06 12ff 96cb e002 -0101 0101 0015 8032 3786 791b bd6b ca3d -5018 269c 68e8 0000 3232 3120 476f 6f64 -6279 652e 0d0a - -# 32818,21 ACK+FIN -[out,ppp0] -4500 0028 10e2 4000 ff06 3274 c0a8 0103 -96cb e002 8032 0015 bd6b ca3d 3786 7929 -5011 269c 981d 0000 - -# 21,32818 ACK+FIN -[in,ppp0] -4500 0028 fff3 4000 ef06 130c 96cb e002 -0101 0101 0015 8032 3786 7929 bd6b ca3d -5011 269c 57c7 0000 - -# 32818,21 ACK -[out,ppp0] -4500 0028 10e3 4000 ff06 3273 c0a8 0103 -96cb e002 8032 0015 bd6b ca3d 3786 792a -5010 269c 981d 0000 - -# 21,32818 ACK -[in,ppp0] -4500 0028 fff4 4000 ef06 130b 96cb e002 -0101 0101 0015 8032 3786 792a bd6b ca3e -5010 269c 57c6 0000 - diff --git a/contrib/ipfilter/test/input/ni6 b/contrib/ipfilter/test/input/ni6 deleted file mode 100644 index 70e80c0..0000000 --- a/contrib/ipfilter/test/input/ni6 +++ /dev/null @@ -1,54 +0,0 @@ -[in,nf0] -4500 0054 cd8a 4000 ff11 20ba c0a8 0601 -c0a8 0602 8075 006f 0040 d36d 3e1d d249 -0000 0000 0000 0002 0001 86a0 0000 0002 -0000 0003 0000 0000 0000 0000 0000 0000 -0000 0000 0001 86a3 0000 0003 0000 0011 -0000 0000 - -[out,qfe0] -4500 0054 cd8a 4000 ff11 1fbb c0a8 0601 -c0a8 0701 8075 006f 0040 d26e 3e1d d249 -0000 0000 0000 0002 0001 86a0 0000 0002 -0000 0003 0000 0000 0000 0000 0000 0000 -0000 0000 0001 86a3 0000 0003 0000 0011 -0000 0000 - -[in,qfe0] -4500 0038 cd83 4000 ff11 1edd c0a8 0701 -c0a8 0702 006f 8075 0024 d704 3e1d d249 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0801 - -[out,nf0] -4500 0038 cd83 4000 ff11 1fde c0a8 0701 -c0a8 0601 006f 8075 0024 d805 3e1d d249 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 0000 0801 - -[in,nf0] -4500 0044 d5a6 4000 ff11 18ae c0a8 0601 -c0a8 0602 80df 0801 0030 04f0 3e10 1fb1 -0000 0000 0000 0002 0001 86a3 0000 0002 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -[out,qfe0] -4500 0044 d5a6 4000 ff11 17af c0a8 0601 -c0a8 0701 80df 0801 0030 03f1 3e10 1fb1 -0000 0000 0000 0002 0001 86a3 0000 0002 -0000 0000 0000 0000 0000 0000 0000 0000 -0000 0000 - -[in,qfe0] -4500 0034 0000 4000 fe11 ed64 c0a8 0701 -c0a8 0702 0801 80df 0020 89b7 3e10 1fb1 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 - -[out,nf0] -4500 0034 0000 4000 fe11 ee65 c0a8 0701 -c0a8 0601 0801 80df 0020 0000 3e10 1fb1 -0000 0001 0000 0000 0000 0000 0000 0000 -0000 0000 - diff --git a/contrib/ipfilter/test/input/ni7 b/contrib/ipfilter/test/input/ni7 deleted file mode 100644 index 8d07937..0000000 --- a/contrib/ipfilter/test/input/ni7 +++ /dev/null @@ -1,13 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP timeout exceeded in reply to a ICMP packet coming in. -[in,df0] -4500 0028 4706 4000 0111 26b4 0404 0404 0202 0202 -afc9 829e 0014 6b10 0402 0000 -3be5 468d 000a cfc3 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0b00 0125 0000 0000 -4500 0028 4706 4000 0111 1eac 0404 0404 0606 0606 -afc9 829e 0014 c15e - diff --git a/contrib/ipfilter/test/input/ni8 b/contrib/ipfilter/test/input/ni8 deleted file mode 100644 index 72205ee..0000000 --- a/contrib/ipfilter/test/input/ni8 +++ /dev/null @@ -1,27 +0,0 @@ -#v tos len id off ttl p sum src dst -[in,df0] -4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 -5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 0735 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 -0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going in) -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 -5000 9d58 0000 0001 - diff --git a/contrib/ipfilter/test/input/ni9 b/contrib/ipfilter/test/input/ni9 deleted file mode 100644 index b8f4599..0000000 --- a/contrib/ipfilter/test/input/ni9 +++ /dev/null @@ -1,27 +0,0 @@ -#v tos len id off ttl p sum src dst -# ICMP dest unreachable with 64 bits in payload (in reply to a TCP packet -# going out) -[in,df0] -4500 003c 4706 4000 ff06 20aa 0404 0404 0a02 0202 -5000 0500 0000 0001 0000 0000 a002 16d0 cc32 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2d1d 0303 0303 0404 0404 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 - -# ICMP dest unreachable with whole packet in payload (40 bytes = 320 bits) -[out,df0] -4500 0058 809a 0000 ff01 2cfd 0303 0303 0404 0404 -0303 0735 0000 0000 -4500 003c 4706 4000 ff06 2aac 0404 0404 0101 0101 -5000 9d58 0000 0001 0000 0000 a002 16d0 3ddc 0000 -0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 - -[out,df0] -4500 0038 809a 0000 ff01 2b1b 0303 0303 0505 0505 -0303 0fa3 0000 0000 -4500 003c 4706 4000 ff06 2aab 0404 0404 0101 0102 -5000 9d58 0000 0001 - diff --git a/contrib/ipfilter/test/input/p1 b/contrib/ipfilter/test/input/p1 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p1 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p10 b/contrib/ipfilter/test/input/p10 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p10 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p11 b/contrib/ipfilter/test/input/p11 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p11 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p12 b/contrib/ipfilter/test/input/p12 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p12 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p13 b/contrib/ipfilter/test/input/p13 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p13 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p2 b/contrib/ipfilter/test/input/p2 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p2 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p3 b/contrib/ipfilter/test/input/p3 deleted file mode 100644 index 4a6666b..0000000 --- a/contrib/ipfilter/test/input/p3 +++ /dev/null @@ -1,12 +0,0 @@ -in 1.1.1.1 1.2.1.1 -in 1.2.1.1 1.1.1.1 -out 1.1.1.1 1.2.1.1 -out 1.2.1.1 1.1.1.1 -in 2.2.2.2 2.1.2.1 -out 2.1.2.1 2.2.2.2 -in 3.3.1.1 3.1.3.1 -out 3.1.3.1 3.3.1.1 -in 4.4.1.1 4.1.4.1 -out 4.1.4.1 4.4.1.1 -in 5.5.1.1 5.1.5.1 -out 5.1.5.1 5.5.1.1 diff --git a/contrib/ipfilter/test/input/p4 b/contrib/ipfilter/test/input/p4 deleted file mode 100644 index 46c0998..0000000 --- a/contrib/ipfilter/test/input/p4 +++ /dev/null @@ -1,12 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 2.2.2.1 1.2.1.1 -out 2.2.2.1 1.2.1.2 -out 2.2.0.1 1.2.1.1 -out 2.2.0.1 1.2.1.3 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p5 b/contrib/ipfilter/test/input/p5 deleted file mode 100644 index f6753fa..0000000 --- a/contrib/ipfilter/test/input/p5 +++ /dev/null @@ -1,8 +0,0 @@ -in 127.0.0.1 127.0.0.1 -in 1.1.1.1 1.2.1.1 -out 127.0.0.1 127.0.0.1 -out 1.1.1.1 1.2.1.1 -in 2.3.0.1 1.2.1.1 -in 2.2.2.1 1.2.1.1 -in 2.2.0.1 1.2.1.1 -out 4.4.1.1 1.2.1.1 diff --git a/contrib/ipfilter/test/input/p6 b/contrib/ipfilter/test/input/p6 deleted file mode 100644 index 37c26ce..0000000 --- a/contrib/ipfilter/test/input/p6 +++ /dev/null @@ -1,2 +0,0 @@ -in 131.107.1.1 10.1.1.1 -out 10.1.1.1 131.107.1.1 diff --git a/contrib/ipfilter/test/input/p7 b/contrib/ipfilter/test/input/p7 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p7 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/input/p9 b/contrib/ipfilter/test/input/p9 deleted file mode 100644 index f8162e8..0000000 --- a/contrib/ipfilter/test/input/p9 +++ /dev/null @@ -1,10 +0,0 @@ -in on bge0 tcp 5.5.5.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.5.9,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.5,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.6,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.7,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.8,10000 9.9.9.9,80 -in on bge0 tcp 5.5.6.9,10000 9.9.9.9,80 diff --git a/contrib/ipfilter/test/intest b/contrib/ipfilter/test/intest deleted file mode 100755 index bcafe76..0000000 --- a/contrib/ipfilter/test/intest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -../ipnat -Rnvf regress/$name 2>/dev/null > results/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/ipflib.sh b/contrib/ipfilter/test/ipflib.sh deleted file mode 100644 index 82d473d..0000000 --- a/contrib/ipfilter/test/ipflib.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -# (C)opyright 2012 by Darren Reed. -# -# See the IPFILTER.LICENCE file for details on licencing. -# -test_init() { - mkdir -p results - find_touch - set_core $name 1 -} - -set_core() { - if [ -n "${FINDLEAKS}" -a -x /bin/mdb ] ; then - _findleaks=1 - else - _findleaks=0 - fi - if [ -x /bin/coreadm ] ; then - _cn="$1.$2.core" - coreadm -p "${PWD}/$_cn" - else - _cn= - fi -} - -test_end_leak() { - if [ $1 -ne 0 ] ; then - if [ ${_findleaks} = 1 -a -f $_cn ] ; then - echo "==== ${name}:${n} ====" >> leaktest - echo '::findleaks' | mdb ../i86/ipftest $_cn >> leaktest - rm $_cn - else - exit 2; - fi - fi -} - -check_results() { - cmp expected/$1 results/$1 - status=$? - if [ $status = 0 ] ; then - $TOUCH $1 - fi -} - -find_touch() { - if [ -f /bin/touch ] ; then - TOUCH=/bin/touch - else - if [ -f /usr/bin/touch ] ; then - TOUCH=/usr/bin/touch - else - if [ -f /usr/ucb/touch ] ; then - TOUCH=/usr/ucb/touch - fi - fi - fi -} diff --git a/contrib/ipfilter/test/iptest b/contrib/ipfilter/test/iptest deleted file mode 100644 index 70fd9d8..0000000 --- a/contrib/ipfilter/test/iptest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -../ippool -f regress/$name -nRv 2>/dev/null > results/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/itest b/contrib/ipfilter/test/itest deleted file mode 100644 index 84b0454..0000000 --- a/contrib/ipfilter/test/itest +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -case $3 in -ipf) - ../ipf -Rnvf regress/$name 2>/dev/null > results/$name - status=$? - if [ $status -ne 0 ] ; then - echo "ERROR: ../ipf -Rnvf regress/$name" - fi - ;; -ipftest) - unset FINDLEAKS - ../ipftest -D -r regress/$name -i /dev/null > results/$name - status=$? - if [ $status -ne 0 ] ; then - echo "ERROR: ../ipftest -D -r regress/$name" - fi - ;; -esac -if [ $status -eq 0 ] ; then - check_results $name -fi -exit $status diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest deleted file mode 100755 index a3a9671..0000000 --- a/contrib/ipfilter/test/logtest +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -name=$1 -format=$2 - -. ./ipflib.sh - -test_init - -echo "$name..."; - -case `uname -s` in -OSF1) - GMT=: - ;; -*) - GMT=GMT - ;; -esac - -n=1 -/bin/cp /dev/null results/$name -/bin/cp /dev/null results/$name.b - -( while read rule; do - /bin/rm -f logout - set_core $name $n - echo $rule >> results/$name - echo $rule | ../ipftest -br - -F $format -i input/$name -l logout > /dev/null & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - - TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1 - echo "--------" >> results/$1 - TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b - echo "--------" >> results/$1.b -done ) < regress/$1 -../ipftest -br regress/$1 -F $format -i input/$1 -l logout > /dev/null -TZ=$GMT ../ipmon -P /dev/null -f logout >> results/$1 -echo "--------" >> results/$1 -TZ=$GMT ../ipmon -P /dev/null -bf logout >> results/$1.b -echo "--------" >> results/$1.b - -cmp expected/$1 results/$1 -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -cmp expected/$1.b results/$1.b -status=$? -if [ $status -ne 0 ] ; then - exit $status -fi -/bin/rm -f logout -$TOUCH $1 -exit 0 diff --git a/contrib/ipfilter/test/mtest b/contrib/ipfilter/test/mtest deleted file mode 100755 index aed9fb9..0000000 --- a/contrib/ipfilter/test/mtest +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -name=$1 -format=$2 - -. ./ipflib.sh - -test_init - -echo "$name..."; - -/bin/cp /dev/null results/$1 - -../ipftest -F $format $4 -Rbr regress/$name -i input/$name > results/$name & -back=$! -wait $back -test_end_leak $? -echo "--------" >> results/$name - -check_results $name -exit $status diff --git a/contrib/ipfilter/test/natipftest b/contrib/ipfilter/test/natipftest deleted file mode 100755 index 493f18b..0000000 --- a/contrib/ipfilter/test/natipftest +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -mode=$1 -name=$2 -input=$3 -output=$4 -n=1 - -. ./ipflib.sh - -test_init - -shift -if [ $output = hex ] ; then - format="-xF $input" -else - format="-F $input" -fi -shift -shift -shift -while [ $# -ge 1 ] ; do - l=`echo $1 | cut -c1` - if [ "$l" = "-" ] ; then - format="$format $1" - else - format="-T $1 $format" - fi - shift -done - -case $mode in -single) - echo "$name..."; - /bin/cp /dev/null results/$name - ( while read rule; do - set_core $name $n - echo "$rule" | ../ipftest -R $format -b -r regress/$name.ipf -N - -i input/$name >> \ - results/$name & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - echo "-------------------------------" >> results/$name - done ) < regress/$name.nat - check_results $name - ;; -multi) - echo "$name..."; - /bin/cp /dev/null results/$name - ../ipftest -R $format -b -r regress/$name.ipf -N regress/$name.nat \ - -i input/$name >> results/$name & - back=$! - wait $back - test_end_leak $? - echo "-------------------------------" >> results/$name - check_results $name - ;; -esac -exit $status diff --git a/contrib/ipfilter/test/nattest b/contrib/ipfilter/test/nattest deleted file mode 100755 index c970877..0000000 --- a/contrib/ipfilter/test/nattest +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -if [ $3 = hex ] ; then - format="-xF $2" -else - format="-F $2" -fi -if [ "$4" != "" ] ; then - case $4 in - -*) - format="$4 $format" - ;; - *) - format="-T $4 $format" - ;; - esac -fi - -echo "$name..."; -n=1 -/bin/cp /dev/null results/$name -( while read rule; do - set_core $name $n - echo "$rule" | ../ipftest $format -DRbN - -i input/$name >>results/$name & - back=$! - wait $back - test_end_leak $? - n=`expr $n + 1` - echo "-------------------------------" >> results/$name -done ) < regress/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/ptest b/contrib/ipfilter/test/ptest deleted file mode 100644 index 87daacc..0000000 --- a/contrib/ipfilter/test/ptest +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -name=$1 - -. ./ipflib.sh - -test_init - -echo "$name..."; -/bin/cp /dev/null results/$name -if [ -f regress/$name.pool -a -f regress/$name.ipf ] ; then - ../ipftest -RD -b -P regress/$name.pool -r regress/$name.ipf -i input/$name >> \ - results/$name & -elif [ -f regress/$name.pool -a -f regress/$name.nat ] ; then - ../ipftest -RD -b -P regress/$name.pool -N regress/$name.nat -i input/$name >> \ - results/$name & -else - ../ipftest -RD -b -r regress/$name.ipf -i input/$name >> results/$name & -fi -back=$! -wait $back -test_end_leak $? -echo "-------------------------------" >> results/$name -check_results $name -exit $status diff --git a/contrib/ipfilter/test/regress/bpf-f1 b/contrib/ipfilter/test/regress/bpf-f1 deleted file mode 100644 index 2c80283..0000000 --- a/contrib/ipfilter/test/regress/bpf-f1 +++ /dev/null @@ -1,4 +0,0 @@ -pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } diff --git a/contrib/ipfilter/test/regress/bpf1 b/contrib/ipfilter/test/regress/bpf1 deleted file mode 100644 index 5d83b77..0000000 --- a/contrib/ipfilter/test/regress/bpf1 +++ /dev/null @@ -1,4 +0,0 @@ -pass in bpf-v4 { "0x20 0 0 0xc 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "src host 1.1.1.1" } -pass in bpf-v4 { "0x20 0 0 0x10 0x15 0 0x1 0x1010101 0x6 0 0 0x60 0x6 0 0 0" } -pass out bpf-v4 { "dst host 1.1.1.1" } diff --git a/contrib/ipfilter/test/regress/f1 b/contrib/ipfilter/test/regress/f1 deleted file mode 100644 index 6a2ede9..0000000 --- a/contrib/ipfilter/test/regress/f1 +++ /dev/null @@ -1,4 +0,0 @@ -block in all -pass in all -block out all -pass out all diff --git a/contrib/ipfilter/test/regress/f10 b/contrib/ipfilter/test/regress/f10 deleted file mode 100644 index 3552983..0000000 --- a/contrib/ipfilter/test/regress/f10 +++ /dev/null @@ -1,18 +0,0 @@ -block in from any to any with not ipopts -pass in from any to any with not opt sec-class topsecret -block in from any to any with not opt ssrr,sec-class topsecret -pass in from any to any with not opt ssrr,sec-class topsecret -block in from any to any with not opt ts,sec-class topsecret -pass in from any to any with not opt ts,sec-class topsecret -block in from any to any with not opt sec-class secret -pass in from any to any with not opt sec-class secret -block in from any to any with not opt lsrr,ssrr -pass in from any to any with not opt lsrr,ssrr -pass in from any to any with not ipopts -block in from any to any with not opt lsrr -pass in from any to any with not opt lsrr -block in from any to any with not opt ssrr,ts -pass in from any to any with not opt ssrr,ts -block in from any to any with not opt rr -pass in from any to any with not opt rr -block in from any to any with not opt sec-class topsecret diff --git a/contrib/ipfilter/test/regress/f11 b/contrib/ipfilter/test/regress/f11 deleted file mode 100644 index a71e528..0000000 --- a/contrib/ipfilter/test/regress/f11 +++ /dev/null @@ -1,7 +0,0 @@ -pass in proto tcp from any to any port = 23 flags S/SA keep state -block in proto tcp from any to any port = 23 flags S/SA keep state -pass in proto udp from any to any port = 53 keep frags -block in proto udp from any to any port = 53 keep frags -pass in proto udp from any to any port = 53 keep state -block in proto udp from any to any port = 53 keep state -pass in on e0 proto tcp from any to any port = 25 keep state diff --git a/contrib/ipfilter/test/regress/f12 b/contrib/ipfilter/test/regress/f12 deleted file mode 100644 index c29f839..0000000 --- a/contrib/ipfilter/test/regress/f12 +++ /dev/null @@ -1,6 +0,0 @@ -pass in proto tcp from any port > 1024 to any port = 25 with not short -pass in proto tcp from any port > 1024 to any port = 25 -block in proto tcp from any to any with short -block in proto tcp from any to any with frag -pass in proto udp from any port = 53 to any port = 53 -block in proto udp from any port = 53 to any port = 53 with not short diff --git a/contrib/ipfilter/test/regress/f13 b/contrib/ipfilter/test/regress/f13 deleted file mode 100644 index 393a65e..0000000 --- a/contrib/ipfilter/test/regress/f13 +++ /dev/null @@ -1,9 +0,0 @@ -pass in proto tcp from any to any port = 25 flags S/SA keep frags -block in proto tcp from any to any port = 25 flags S/SA keep frags -pass in proto udp from any to any port = 53 keep frags -block in proto udp from any to any port = 53 keep frags -pass in proto tcp from any to any port = 25 flags S/SA keep state keep frags -block in proto tcp from any to any port = 25 flags S/SA keep state keep frags -pass in proto udp from any to any port = 53 keep frags(strict) -pass in proto tcp from any to any port = 25 keep state(strict) -pass in proto tcp from any to any port = 25 keep state(loose) diff --git a/contrib/ipfilter/test/regress/f14 b/contrib/ipfilter/test/regress/f14 deleted file mode 100644 index 06ab519..0000000 --- a/contrib/ipfilter/test/regress/f14 +++ /dev/null @@ -1,8 +0,0 @@ -block in from !1.1.1.1 to any -pass in from 1.1.1.1 to !any -block in from 1.1.1.0/24 to !any -pass in from !1.1.1.0/24 to any -block in from !1.1.0.0/16 to any -pass in from 1.1.0.0/16 to !1.2.0.0/16 -block in from any to !127.0.0.0/8 -pass in from !any to any diff --git a/contrib/ipfilter/test/regress/f15 b/contrib/ipfilter/test/regress/f15 deleted file mode 100644 index 16185e1..0000000 --- a/contrib/ipfilter/test/regress/f15 +++ /dev/null @@ -1,8 +0,0 @@ -block in log quick on hme0 from any to 195.134.65.0/25 head 10 -block return-rst in log quick proto tcp all flags S head 100 group 10 -pass in quick proto tcp from any to any port = 22 keep state group 100 -pass in quick proto tcp from any to any port = 23 keep state group 100 -pass in quick proto tcp from any to any port = 21 keep state group 100 -block return-icmp in quick proto udp all keep state head 110 group 10 -pass in quick proto udp from any to any port = 53 keep state group 110 -block in log quick on hme0 from any to any diff --git a/contrib/ipfilter/test/regress/f16 b/contrib/ipfilter/test/regress/f16 deleted file mode 100644 index 920ad8c..0000000 --- a/contrib/ipfilter/test/regress/f16 +++ /dev/null @@ -1,10 +0,0 @@ -pass in all -skip 2 in proto tcp all -block in quick proto tcp all -skip 4 in proto udp all -block in quick proto udp all -pass in quick proto tcp from any to 1.1.1.1 -pass in quick proto tcp from any to 1.1.1.2 port = 22 -block in quick proto udp from any to any port = 53 -pass in quick proto udp from any to any port = 53 -block in all diff --git a/contrib/ipfilter/test/regress/f17 b/contrib/ipfilter/test/regress/f17 deleted file mode 100644 index 9a75ae3..0000000 --- a/contrib/ipfilter/test/regress/f17 +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out quick on ppp0 proto tcp all flags S keep state -block return-rst in quick proto tcp all diff --git a/contrib/ipfilter/test/regress/f18 b/contrib/ipfilter/test/regress/f18 deleted file mode 100644 index acba2b3..0000000 --- a/contrib/ipfilter/test/regress/f18 +++ /dev/null @@ -1,4 +0,0 @@ -pass in from 1.1.1.1 to any -pass out from 2.2.2.2 to any -count in from 1.1.1.1 to 3.3.3.3 -count out from 2.2.2.2 to 4.4.4.4 diff --git a/contrib/ipfilter/test/regress/f19 b/contrib/ipfilter/test/regress/f19 deleted file mode 100644 index d7770b8..0000000 --- a/contrib/ipfilter/test/regress/f19 +++ /dev/null @@ -1,2 +0,0 @@ -pass in quick proto tcp all flags S keep state -pass in quick proto tcp all flags S keep state(limit 1) diff --git a/contrib/ipfilter/test/regress/f2 b/contrib/ipfilter/test/regress/f2 deleted file mode 100644 index e2f02a4..0000000 --- a/contrib/ipfilter/test/regress/f2 +++ /dev/null @@ -1,6 +0,0 @@ -block in proto tcp from any to any -pass in proto tcp from any to any -block in proto udp from any to any -pass in proto udp from any to any -block in proto icmp from any to any -pass in proto icmp from any to any diff --git a/contrib/ipfilter/test/regress/f20 b/contrib/ipfilter/test/regress/f20 deleted file mode 100644 index 279523e..0000000 --- a/contrib/ipfilter/test/regress/f20 +++ /dev/null @@ -1,4 +0,0 @@ -block out quick on de0 head 100 -skip 1 out group 100 -block out quick group 100 -pass out quick group 100 diff --git a/contrib/ipfilter/test/regress/f21 b/contrib/ipfilter/test/regress/f21 deleted file mode 100644 index 26ffa87..0000000 --- a/contrib/ipfilter/test/regress/f21 +++ /dev/null @@ -1,2 +0,0 @@ -pass out proto tcp all flags S keep state(icmp-head icmpredir) -block in proto icmp all icmp-type redir group icmpredir diff --git a/contrib/ipfilter/test/regress/f22 b/contrib/ipfilter/test/regress/f22 deleted file mode 100644 index 10765db..0000000 --- a/contrib/ipfilter/test/regress/f22 +++ /dev/null @@ -1,2 +0,0 @@ -pass in proto tcp all flags S keep state(icmp-head icmpredir) -block out proto icmp all icmp-type redir group icmpredir diff --git a/contrib/ipfilter/test/regress/f24 b/contrib/ipfilter/test/regress/f24 deleted file mode 100644 index 5cb3bab..0000000 --- a/contrib/ipfilter/test/regress/f24 +++ /dev/null @@ -1 +0,0 @@ -pass out quick proto udp all keep state keep frags diff --git a/contrib/ipfilter/test/regress/f25 b/contrib/ipfilter/test/regress/f25 deleted file mode 100644 index c018b49..0000000 --- a/contrib/ipfilter/test/regress/f25 +++ /dev/null @@ -1 +0,0 @@ -pass in on hme0 proto udp all with mcast keep state diff --git a/contrib/ipfilter/test/regress/f26 b/contrib/ipfilter/test/regress/f26 deleted file mode 100644 index 22357a4..0000000 --- a/contrib/ipfilter/test/regress/f26 +++ /dev/null @@ -1,6 +0,0 @@ -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/16) -pass in quick proto tcp all flags S keep state(max-srcs 3) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/16) diff --git a/contrib/ipfilter/test/regress/f27 b/contrib/ipfilter/test/regress/f27 deleted file mode 100644 index 22357a4..0000000 --- a/contrib/ipfilter/test/regress/f27 +++ /dev/null @@ -1,6 +0,0 @@ -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp from 1.1.1.0/24 to any port = 22 flags S keep state(max-srcs 3, max-per-src 1/16) -pass in quick proto tcp all flags S keep state(max-srcs 3) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/32) -pass in quick proto tcp all flags S keep state(max-srcs 3, max-per-src 1/16) diff --git a/contrib/ipfilter/test/regress/f28.ipf b/contrib/ipfilter/test/regress/f28.ipf deleted file mode 100644 index ca42771..0000000 --- a/contrib/ipfilter/test/regress/f28.ipf +++ /dev/null @@ -1,2 +0,0 @@ -block in all -pass in on nic0 to dstlist/spread from 4.4.0.0/16 to any diff --git a/contrib/ipfilter/test/regress/f28.pool b/contrib/ipfilter/test/regress/f28.pool deleted file mode 100644 index 499b603..0000000 --- a/contrib/ipfilter/test/regress/f28.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool ipf/dstlist (name spread; policy round-robin;) - { nic0:1.1.0.2; nic1:1.1.1.2; nic2:1.1.2.2; nic3:1.1.3.2; }; diff --git a/contrib/ipfilter/test/regress/f29.ipf b/contrib/ipfilter/test/regress/f29.ipf deleted file mode 100644 index e4634cc..0000000 --- a/contrib/ipfilter/test/regress/f29.ipf +++ /dev/null @@ -1,2 +0,0 @@ -block in all -pass in on nic0 to dstlist/spread from 4.4.0.0/16 to any keep state diff --git a/contrib/ipfilter/test/regress/f29.pool b/contrib/ipfilter/test/regress/f29.pool deleted file mode 100644 index 499b603..0000000 --- a/contrib/ipfilter/test/regress/f29.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool ipf/dstlist (name spread; policy round-robin;) - { nic0:1.1.0.2; nic1:1.1.1.2; nic2:1.1.2.2; nic3:1.1.3.2; }; diff --git a/contrib/ipfilter/test/regress/f3 b/contrib/ipfilter/test/regress/f3 deleted file mode 100644 index ee80729..0000000 --- a/contrib/ipfilter/test/regress/f3 +++ /dev/null @@ -1,8 +0,0 @@ -block in from 1.1.1.1 to any -pass in from 1.1.1.1 to any -block in from 1.1.1.1/24 to any -pass in from 1.1.1.1/24 to any -block in from 1.1.1.1/16 to any -pass in from 1.1.1.1/16 to any -block in from 1.1.1.1/0 to any -pass in from 1.1.1.1/0 to any diff --git a/contrib/ipfilter/test/regress/f30 b/contrib/ipfilter/test/regress/f30 deleted file mode 100644 index 84a8970..0000000 --- a/contrib/ipfilter/test/regress/f30 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on hme0 proto udp all with not ipopts keep state -pass in on hme0 proto udp all with ipopts keep state -pass in on hme0 proto tcp all flags S with opt rr keep state -pass in on hme0 proto tcp all flags S with opt sec-class secret keep state diff --git a/contrib/ipfilter/test/regress/f4 b/contrib/ipfilter/test/regress/f4 deleted file mode 100644 index bc8af2f..0000000 --- a/contrib/ipfilter/test/regress/f4 +++ /dev/null @@ -1,8 +0,0 @@ -block in from any to 1.1.1.1 -pass in from any to 1.1.1.1 -block in from any to 1.1.1.1/24 -pass in from any to 1.1.1.1/24 -block in from any to 1.1.1.1/16 -pass in from any to 1.1.1.1/16 -block in from any to 1.1.1.1/0 -pass in from any to 1.1.1.1/0 diff --git a/contrib/ipfilter/test/regress/f5 b/contrib/ipfilter/test/regress/f5 deleted file mode 100644 index 998eabd..0000000 --- a/contrib/ipfilter/test/regress/f5 +++ /dev/null @@ -1,48 +0,0 @@ -block in proto tcp from any port = 23 to any -block in proto udp from any port = 23 to any -block in proto tcp/udp from any port = 23 to any -pass in proto tcp from any port <= 1023 to any -pass in proto udp from any port <= 1023 to any -pass in proto tcp/udp from any port <= 1023 to any -block in proto tcp from any port >= 1024 to any -block in proto udp from any port >= 1024 to any -block in proto tcp/udp from any port >= 1024 to any -pass in proto tcp from any port >= 1024 to any -pass in proto udp from any port >= 1024 to any -pass in proto tcp/udp from any port >= 1024 to any -block in proto tcp from any port 0 >< 512 to any -block in proto udp from any port 0 >< 512 to any -block in proto tcp/udp from any port 0 >< 512 to any -pass in proto tcp from any port 0 >< 512 to any -pass in proto udp from any port 0 >< 512 to any -pass in proto tcp/udp from any port 0 >< 512 to any -block in proto tcp from any port 6000 <> 6009 to any -block in proto udp from any port 6000 <> 6009 to any -block in proto tcp/udp from any port 6000 <> 6009 to any -pass in proto tcp from any port 6000 <> 6009 to any -pass in proto udp from any port 6000 <> 6009 to any -pass in proto tcp/udp from any port 6000 <> 6009 to any -pass in proto tcp from any port = 23 to any -pass in proto udp from any port = 23 to any -pass in proto tcp/udp from any port = 23 to any -block in proto tcp from any port != 21 to any -block in proto udp from any port != 21 to any -block in proto tcp/udp from any port != 21 to any -pass in proto tcp from any port != 21 to any -pass in proto udp from any port != 21 to any -pass in proto tcp/udp from any port != 21 to any -block in proto tcp from any port < 1024 to any -block in proto udp from any port < 1024 to any -block in proto tcp/udp from any port < 1024 to any -pass in proto tcp from any port < 1024 to any -pass in proto udp from any port < 1024 to any -pass in proto tcp/udp from any port < 1024 to any -block in proto tcp from any port > 1023 to any -block in proto udp from any port > 1023 to any -block in proto tcp/udp from any port > 1023 to any -pass in proto tcp from any port > 1023 to any -pass in proto udp from any port > 1023 to any -pass in proto tcp/udp from any port > 1023 to any -block in proto tcp from any port <= 1023 to any -block in proto udp from any port <= 1023 to any -block in proto tcp/udp from any port <= 1023 to any diff --git a/contrib/ipfilter/test/regress/f6 b/contrib/ipfilter/test/regress/f6 deleted file mode 100644 index 291f09ad..0000000 --- a/contrib/ipfilter/test/regress/f6 +++ /dev/null @@ -1,48 +0,0 @@ -block in proto tcp from any to any port = 23 -block in proto udp from any to any port = 23 -block in proto tcp/udp from any to any port = 23 -pass in proto tcp from any to any port <= 1023 -pass in proto udp from any to any port <= 1023 -pass in proto tcp/udp from any to any port <= 1023 -block in proto tcp from any to any port >= 1024 -block in proto udp from any to any port >= 1024 -block in proto tcp/udp from any to any port >= 1024 -pass in proto tcp from any to any port >= 1024 -pass in proto udp from any to any port >= 1024 -pass in proto tcp/udp from any to any port >= 1024 -block in proto tcp from any to any port 0 >< 512 -block in proto udp from any to any port 0 >< 512 -block in proto tcp/udp from any to any port 0 >< 512 -pass in proto tcp from any to any port 0 >< 512 -pass in proto udp from any to any port 0 >< 512 -pass in proto tcp/udp from any to any port 0 >< 512 -block in proto tcp from any to any port 6000 <> 6009 -block in proto udp from any to any port 6000 <> 6009 -block in proto tcp/udp from any to any port 6000 <> 6009 -pass in proto tcp from any to any port 6000 <> 6009 -pass in proto udp from any to any port 6000 <> 6009 -pass in proto tcp/udp from any to any port 6000 <> 6009 -pass in proto tcp from any to any port = 23 -pass in proto udp from any to any port = 23 -pass in proto tcp/udp from any to any port = 23 -block in proto tcp from any to any port != 21 -block in proto udp from any to any port != 21 -block in proto tcp/udp from any to any port != 21 -pass in proto tcp from any to any port != 21 -pass in proto udp from any to any port != 21 -pass in proto tcp/udp from any to any port != 21 -block in proto tcp from any to any port < 1024 -block in proto udp from any to any port < 1024 -block in proto tcp/udp from any to any port < 1024 -pass in proto tcp from any to any port < 1024 -pass in proto udp from any to any port < 1024 -pass in proto tcp/udp from any to any port < 1024 -block in proto tcp from any to any port > 1023 -block in proto udp from any to any port > 1023 -block in proto tcp/udp from any to any port > 1023 -pass in proto tcp from any to any port > 1023 -pass in proto udp from any to any port > 1023 -pass in proto tcp/udp from any to any port > 1023 -block in proto tcp from any to any port <= 1023 -block in proto udp from any to any port <= 1023 -block in proto tcp/udp from any to any port <= 1023 diff --git a/contrib/ipfilter/test/regress/f7 b/contrib/ipfilter/test/regress/f7 deleted file mode 100644 index be1b969..0000000 --- a/contrib/ipfilter/test/regress/f7 +++ /dev/null @@ -1,9 +0,0 @@ -block in proto icmp from any to any icmp-type echo -pass in proto icmp from any to any icmp-type echo -block in proto icmp from any to any icmp-type unreach code 3 -pass in proto icmp from any to any icmp-type unreach code 3 -block in proto icmp from any to any icmp-type echorep -pass in proto icmp from any to any icmp-type echorep -pass in proto icmp all icmp-type maskreq keep state -pass in proto icmp all icmp-type timest keep state -pass in proto icmp all icmp-type inforeq keep state diff --git a/contrib/ipfilter/test/regress/f8 b/contrib/ipfilter/test/regress/f8 deleted file mode 100644 index 0f28fd2..0000000 --- a/contrib/ipfilter/test/regress/f8 +++ /dev/null @@ -1,6 +0,0 @@ -block in proto tcp from any to any flags S -pass in proto tcp from any to any flags S -block in proto tcp from any to any flags S/SA -pass in proto tcp from any to any flags S/SA -block in proto tcp from any to any flags S/APU -pass in proto tcp from any to any flags S/APU diff --git a/contrib/ipfilter/test/regress/f9 b/contrib/ipfilter/test/regress/f9 deleted file mode 100644 index 17bc967..0000000 --- a/contrib/ipfilter/test/regress/f9 +++ /dev/null @@ -1,18 +0,0 @@ -block in from any to any with ipopts -pass in from any to any with opt sec-class topsecret -block in from any to any with opt ssrr,sec-class topsecret -pass in from any to any with opt ssrr,sec-class topsecret -block in from any to any with opt ts,sec-class topsecret -pass in from any to any with opt ts,sec-class topsecret -block in from any to any with opt sec-class secret -pass in from any to any with opt sec-class secret -block in from any to any with opt lsrr,ssrr -pass in from any to any with opt lsrr,ssrr -pass in from any to any with ipopts -block in from any to any with opt lsrr -pass in from any to any with opt lsrr -block in from any to any with opt ssrr,ts -pass in from any to any with opt ssrr,ts -block in from any to any with opt rr -pass in from any to any with opt rr -block in from any to any with opt sec-class topsecret diff --git a/contrib/ipfilter/test/regress/i1 b/contrib/ipfilter/test/regress/i1 deleted file mode 100644 index 0fd2c6e..0000000 --- a/contrib/ipfilter/test/regress/i1 +++ /dev/null @@ -1,18 +0,0 @@ -pass in all -block out \ -all -log in all -log body in all -count in from any to any -pass in from !any to any pps 10 -block in from any to !any -pass in on ed0 from localhost to localhost -pass in on ed0,vx0 from localhost to localhost -block in log first on lo0 from any to any -pass in log body or-block quick from any to any -block return-rst in quick on le0 proto tcp from any to any -block return-icmp in on qe0 from any to any -block return-icmp(1) in on qe0 from any to any -block return-icmp-as-dest in on le0 from any to any -block return-icmp-as-dest(port-unr) in on qe0 from any to any -pass out on longNICname0 from test.host.dots to test\.host.dots diff --git a/contrib/ipfilter/test/regress/i10 b/contrib/ipfilter/test/regress/i10 deleted file mode 100644 index 640ac84..0000000 --- a/contrib/ipfilter/test/regress/i10 +++ /dev/null @@ -1,5 +0,0 @@ -pass in from localhost to localhost with opt sec -pass in from localhost to localhost with opt lsrr not opt sec -block in from any to any with not opt sec-class topsecret -block in from any to any with not opt sec-class topsecret,secret -pass in from any to any with opt sec-class topsecret,confid not opt sec-class unclass diff --git a/contrib/ipfilter/test/regress/i11 b/contrib/ipfilter/test/regress/i11 deleted file mode 100644 index ca65da3..0000000 --- a/contrib/ipfilter/test/regress/i11 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on ed0 proto tcp from localhost to localhost port = telnet keep state -block in log first on lo0 proto tcp/udp from any to any port = echo keep state -pass in proto udp from localhost to localhost port = 20499 keep frag -pass in proto udp from localhost to localhost port = 2049 keep frag(strict) -pass in proto udp from localhost to localhost port = 53 keep state keep frags -pass in on ed0 out-via vx0 proto udp from any to any keep state -pass out on ppp0 in-via le0 proto tcp from any to any keep state -pass in on ed0,vx0 out-via vx0,ed0 proto udp from any to any keep state -pass in proto tcp from any port gt 1024 to localhost port eq 1024 keep state -pass in proto tcp all flags S keep state(strict,newisn,no-icmp-err,limit 101,age 600) -pass in proto tcp all flags S keep state(loose,newisn,no-icmp-err,limit 101,age 600) -pass in proto udp all keep state(age 10/20,sync) diff --git a/contrib/ipfilter/test/regress/i12 b/contrib/ipfilter/test/regress/i12 deleted file mode 100644 index f42c2d5..0000000 --- a/contrib/ipfilter/test/regress/i12 +++ /dev/null @@ -1,10 +0,0 @@ -pass in from 1.1.1.1/32 to 2.2.2.2/32 -pass in from {2.2.2.2/24,3.3.3.3/32} to 4.4.4.4/32 -pass in from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} -pass in from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} port = {22,25} -pass in proto tcp from {2.2.2.2/24,3.3.3.3/32} port = {53,9} to {5.5.5.5/32,6.6.6.6/32} -pass in proto udp from {2.2.2.2/24,3.3.3.3/32} to {5.5.5.5/32,6.6.6.6/32} port = {53,9} -pass in from 10.10.10.10 to 11.11.11.11 -pass in from pool/101 to hash/202 -pass in from hash/303 to pool/404 -pass in from pool=(!1.1.1.1,2.2.2.2,!2.2.0.0/16) to pool = ( 1.1.0.0/16 ) diff --git a/contrib/ipfilter/test/regress/i13 b/contrib/ipfilter/test/regress/i13 deleted file mode 100644 index 3ba343d..0000000 --- a/contrib/ipfilter/test/regress/i13 +++ /dev/null @@ -1,8 +0,0 @@ -a=any; -b="from $a"; -c='to $a'; -d=block; -e="pass in"; -$d in $b $c -f=" $b $c"; -$e${f} diff --git a/contrib/ipfilter/test/regress/i14 b/contrib/ipfilter/test/regress/i14 deleted file mode 100644 index 54613a5..0000000 --- a/contrib/ipfilter/test/regress/i14 +++ /dev/null @@ -1,12 +0,0 @@ -block in on eri0 all head 1 -pass in on eri0 proto icmp all group 1 -pass out on ed0 all head 1000000 -block out on ed0 proto udp all group 1000000 -block in on vm0 proto tcp/udp all head 101 -pass in from 1.1.1.1 to 2.2.2.2 group 101 -pass in proto tcp from 1.0.0.1 to 2.0.0.2 group 101 -pass in proto udp from 2.0.0.2 to 3.0.0.3 group 101 -block in on vm0 proto tcp/udp all head vm0-group -pass in from 1.1.1.1 to 2.2.2.2 group vm0-group -block in on vm0 proto tcp/udp all head vm0-group -pass in from 1.1.1.1 to 2.2.2.2 group vm0-group diff --git a/contrib/ipfilter/test/regress/i15 b/contrib/ipfilter/test/regress/i15 deleted file mode 100644 index 0e6b0d1..0000000 --- a/contrib/ipfilter/test/regress/i15 +++ /dev/null @@ -1,4 +0,0 @@ -pass out on fxp0 all set-tag(log=100) -pass out on fxp0 all set-tag(nat=foo) -pass out on fxp0 all set-tag(log=100, nat=200) -pass out on fxp0 all set-tag(log=2147483648, nat=overtherainbowisapotof) diff --git a/contrib/ipfilter/test/regress/i16 b/contrib/ipfilter/test/regress/i16 deleted file mode 100644 index 5c9144a..0000000 --- a/contrib/ipfilter/test/regress/i16 +++ /dev/null @@ -1,3 +0,0 @@ -0 block out all -100 pass in all -10101 pass out proto tcp all diff --git a/contrib/ipfilter/test/regress/i17 b/contrib/ipfilter/test/regress/i17 deleted file mode 100644 index 139b86a..0000000 --- a/contrib/ipfilter/test/regress/i17 +++ /dev/null @@ -1,13 +0,0 @@ -100 pass in all -200 pass in proto tcp all -110 pass in proto udp all -110 pass in from localhost to any -pass in all -pass in from localhost to any -@0 100 pass in from localhost to any -@1 pass in from any to localhost -@0 pass in from 1.1.1.1 to any -@1 110 pass in from 2.2.2.2 to any -@2 pass in from 3.3.3.3 to any -call srcgrpmap/100 out from 10.1.0.0/16 to any -call now dstgrpmap/200 in from 10.2.0.0/16 to any diff --git a/contrib/ipfilter/test/regress/i18 b/contrib/ipfilter/test/regress/i18 deleted file mode 100644 index b55b11a..0000000 --- a/contrib/ipfilter/test/regress/i18 +++ /dev/null @@ -1,3 +0,0 @@ -pass in tos {80,0x80} all -pass out tos {0x80,80} all -block in ttl {0,1,2,3,4,5,6} all diff --git a/contrib/ipfilter/test/regress/i19 b/contrib/ipfilter/test/regress/i19 deleted file mode 100644 index a09fd56..0000000 --- a/contrib/ipfilter/test/regress/i19 +++ /dev/null @@ -1,22 +0,0 @@ -block in quick log level user.debug proto icmp all -block in quick log level mail.info proto icmp all -block in quick log level daemon.notice proto icmp all -block in quick log level auth.warn proto icmp all -block in quick log level syslog.err proto icmp all -block in quick log level lpr.crit proto icmp all -block in quick log level news.alert proto icmp all -block in quick log level uucp.emerg proto icmp all -block in quick log level cron.debug proto icmp all -block in quick log level ftp.info proto icmp all -block in quick log level authpriv.notice proto icmp all -block in quick log level logalert.warn proto icmp all -block in quick log level local0.err proto icmp all -block in quick log level local1.crit proto icmp all -block in quick log level local2.alert proto icmp all -block in quick log level local3.emerg proto icmp all -block in quick log level local4.debug proto icmp all -block in quick log level local5.info proto icmp all -block in quick log level local6.notice proto icmp all -block in quick log level local7.warn proto icmp all -block in quick log level kern.err proto icmp all -block in quick log level security.emerg proto icmp all diff --git a/contrib/ipfilter/test/regress/i2 b/contrib/ipfilter/test/regress/i2 deleted file mode 100644 index f69e28e..0000000 --- a/contrib/ipfilter/test/regress/i2 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp all -pass in proto 6 from any to any -pass in proto udp from localhost to localhost -block in proto ipv6 from any to any -block in proto 17 from any to any -block in proto 250 from any to any -pass in proto tcp/udp from any to any -block in proto tcp-udp from any to any -block in proto tcp-udp from any to any diff --git a/contrib/ipfilter/test/regress/i20 b/contrib/ipfilter/test/regress/i20 deleted file mode 100644 index 99039ee..0000000 --- a/contrib/ipfilter/test/regress/i20 +++ /dev/null @@ -1,4 +0,0 @@ -pass in on ppp0 from ppp0/peer to ppp0/32 -block in on hme0 from any to hme0/broadcast -pass in on bge0 from bge0/network to bge0/32 -block in on eri0 from any to eri0/netmasked diff --git a/contrib/ipfilter/test/regress/i21 b/contrib/ipfilter/test/regress/i21 deleted file mode 100644 index 237f8fa..0000000 --- a/contrib/ipfilter/test/regress/i21 +++ /dev/null @@ -1,7 +0,0 @@ -pass in from port = 10101 -pass out from any to port != 22 -block in from port 20:21 -block out from any to port 10 <> 100 -pass out from any to port = {3,5,7,9} -block in from port = {20,25} -pass in from any port = {11:12, 21:22} to any port = {1:2, 4:5, 8:9} diff --git a/contrib/ipfilter/test/regress/i22 b/contrib/ipfilter/test/regress/i22 deleted file mode 100644 index 1ac8d12..0000000 --- a/contrib/ipfilter/test/regress/i22 +++ /dev/null @@ -1,5 +0,0 @@ -pass in exp { "ip.src != 1.1.1.0/24; tcp.dport = 80;" } -pass in exp { "ip.addr = 1.2.3.4,5.6.7.8;" } -block out exp { "ip.dst= 127.0.0.0/8;" } -block in exp { "udp.sport=53;udp.dport=53;" } -pass out exp { "tcp.sport=22; tcp.port=25;" } diff --git a/contrib/ipfilter/test/regress/i23 b/contrib/ipfilter/test/regress/i23 deleted file mode 100644 index 792d600..0000000 --- a/contrib/ipfilter/test/regress/i23 +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/contrib/ipfilter/test/regress/i3 b/contrib/ipfilter/test/regress/i3 deleted file mode 100644 index 390fc3c..0000000 --- a/contrib/ipfilter/test/regress/i3 +++ /dev/null @@ -1,14 +0,0 @@ -log in all -pass in from 128.16/16 to 129.10.10/24 -pass in from 128.0.0.1/24 to 1\ -28\ -.\ -0.0.1/16 -pass in from 128.0.0.1/0xffffff00 to 128.0.0.1/0xffff0000 -pass in from 128.0.0.1/255.255.255.0 to 128.0.0.1/255.255.0.0 -pass in from 128.0.0.1 mask 0xffffff00 to 128.0.0.1 mask 0xffff0000 -pass in from 128.0.0.1 mask 255.255.255.0 to 128.0.0.1 mask 255.255.0.0 -pass in from localhost to localhost -block in log from 0/0 to 0/0 -block in log level auth.info on hme0 all -log level local5.warn out all diff --git a/contrib/ipfilter/test/regress/i4 b/contrib/ipfilter/test/regress/i4 deleted file mode 100644 index 8551f76..0000000 --- a/contrib/ipfilter/test/regress/i4 +++ /dev/null @@ -1,9 +0,0 @@ -log in proto tcp from any port > 0 to any -log in proto tcp from any to any port > 0 -pass in proto 6 from any port != 0 to any port 0 >< 65535 -pass in proto 17 from localhost port > 32000 to localhost port < 29000 -block in proto udp from any port != \ntp to any port < echo -block in proto tcp from any port = smtp to any port > 25 -pass in proto tcp/udp from any port 1 >< 3 to any port 1 <> 3 -pass in proto tcp/udp from any port 2:2 to any port 10:20 -pass in log first quick proto tcp from any port > 1023 to any port = 1723 flags S keep state diff --git a/contrib/ipfilter/test/regress/i5 b/contrib/ipfilter/test/regress/i5 deleted file mode 100644 index 788f971..0000000 --- a/contrib/ipfilter/test/regress/i5 +++ /dev/null @@ -1,9 +0,0 @@ -log in all -count in tos 0x80 from any to any -pass in on ed0 tos 64 from localhost to localhost -block in log on lo0 ttl 0 from any to any -pass in quick ttl 1 from any to any -skip 3 out from 127.0.0.1 to any -auth out on foo0 proto tcp from any to any port = 80 -preauth out on foo0 proto tcp from any to any port = 22 -nomatch out on foo0 proto tcp from any port < 1024 to any diff --git a/contrib/ipfilter/test/regress/i6 b/contrib/ipfilter/test/regress/i6 deleted file mode 100644 index 0b371bd..0000000 --- a/contrib/ipfilter/test/regress/i6 +++ /dev/null @@ -1,12 +0,0 @@ -pass in on lo0 fastroute from any to any -pass in on lo0 to qe0 from localhost to localhost -pass in on le0 to qe0:127.0.0.1 from localhost to localhost -pass in on lo0 dup-to qe0 from localhost to localhost -pass in on le0 dup-to qe0:127.0.0.1 from localhost to localhost -pass in on le0 to hme0:10.1.1.1 dup-to qe0:127.0.0.1 from localhost to localhost -block in quick on qe0 to qe1 from any to any -block in quick to qe1 from any to any -pass out quick dup-to hme0 from any to any -pass out quick on hme0 reply-to hme1 from any to any -pass in on le0 dup-to qe0:127.0.0.1 reply-to hme1:10.10.10.10 all -pass in quick fastroute all diff --git a/contrib/ipfilter/test/regress/i7 b/contrib/ipfilter/test/regress/i7 deleted file mode 100644 index 15b88a5..0000000 --- a/contrib/ipfilter/test/regress/i7 +++ /dev/null @@ -1,14 +0,0 @@ -pass in on ed0 proto tcp from localhost to localhost port = 23 flags S/SA -block in on lo0 proto tcp from any to any flags A -pass in on lo0 proto tcp from any to any flags /SAP -block in on lo0 proto tcp from any to any flags 0x80/A -pass in on lo0 proto tcp from any to any flags S/18 -block in on lo0 proto tcp from any to any flags 2/18 -pass in on lo0 proto tcp from any to any flags 2 -block in on lo0 proto tcp from any to any flags /16 -pass in on lo0 proto tcp from any to any flags 2/SA -pass in on lo0 proto tcp from any to any flags S/18 -block in on lo0 proto tcp from any to any flags 2/18 -pass in on lo0 proto tcp from any to any flags 2 -block in on lo0 proto tcp from any to any flags /16 -pass in on lo0 proto tcp from any to any flags 2/SA diff --git a/contrib/ipfilter/test/regress/i8 b/contrib/ipfilter/test/regress/i8 deleted file mode 100644 index abf69d9..0000000 --- a/contrib/ipfilter/test/regress/i8 +++ /dev/null @@ -1,62 +0,0 @@ -pass in proto icmp from localhost to localhost icmp-type timest -block in proto icmp from any to any icmp-type unreach code 1 -pass in proto icmp all icmp-type unreach code cutoff-preced -pass in proto icmp all icmp-type unreach code filter-prohib -pass in proto icmp all icmp-type unreach code isolate -pass in proto icmp all icmp-type unreach code needfrag -pass in proto icmp all icmp-type unreach code net-prohib -pass in proto icmp all icmp-type unreach code net-tos -pass in proto icmp all icmp-type unreach code host-preced -pass in proto icmp all icmp-type unreach code host-prohib -pass in proto icmp all icmp-type unreach code host-tos -pass in proto icmp all icmp-type unreach code host-unk -pass in proto icmp all icmp-type unreach code host-unr -pass in proto icmp all icmp-type unreach code {net-unk,net-unr} -pass in proto icmp all icmp-type unreach code port-unr -pass in proto icmp all icmp-type unreach code proto-unr -pass in proto icmp all icmp-type unreach code srcfail -pass in proto icmp all icmp-type {echo,echorep} -pass in proto icmp all icmp-type inforeq -pass in proto icmp all icmp-type inforep -pass in proto icmp all icmp-type maskrep -pass in proto icmp all icmp-type maskreq -pass in proto icmp all icmp-type paramprob -pass in proto icmp all icmp-type redir -pass in proto icmp all icmp-type unreach -pass in proto icmp all icmp-type routerad -pass in proto icmp all icmp-type routersol -pass in proto icmp all icmp-type squench -pass in proto icmp all icmp-type timest -pass in proto icmp all icmp-type timestrep -pass in proto icmp all icmp-type timex -pass in proto icmp all icmp-type 254 -pass in proto icmp all icmp-type 253 code 254 -pass in proto icmp all icmp-type unreach code cutoff-preced -pass in proto icmp all icmp-type unreach code filter-prohib -pass in proto icmp all icmp-type unreach code isolate -pass in proto icmp all icmp-type unreach code needfrag -pass in proto icmp all icmp-type unreach code net-prohib -pass in proto icmp all icmp-type unreach code net-tos -pass in proto icmp all icmp-type unreach code host-preced -pass in proto icmp all icmp-type unreach code host-prohib -pass in proto icmp all icmp-type unreach code host-tos -pass in proto icmp all icmp-type unreach code host-unk -pass in proto icmp all icmp-type unreach code host-unr -pass in proto icmp all icmp-type unreach code {net-unk,net-unr} -pass in proto icmp all icmp-type unreach code port-unr -pass in proto icmp all icmp-type unreach code proto-unr -pass in proto icmp all icmp-type unreach code srcfail -pass in proto icmp all icmp-type {echo,echorep} -pass in proto icmp all icmp-type inforeq -pass in proto icmp all icmp-type inforep -pass in proto icmp all icmp-type maskrep -pass in proto icmp all icmp-type maskreq -pass in proto icmp all icmp-type paramprob -pass in proto icmp all icmp-type redir -pass in proto icmp all icmp-type unreach -pass in proto icmp all icmp-type routerad -pass in proto icmp all icmp-type routersol -pass in proto icmp all icmp-type squench -pass in proto icmp all icmp-type timest -pass in proto icmp all icmp-type timestrep -pass in proto icmp all icmp-type timex diff --git a/contrib/ipfilter/test/regress/i9 b/contrib/ipfilter/test/regress/i9 deleted file mode 100644 index 441cfa9..0000000 --- a/contrib/ipfilter/test/regress/i9 +++ /dev/null @@ -1,17 +0,0 @@ -pass in from localhost to localhost with short,frags -block in from any to any with ipopts -pass in from any to any with opt nop,rr,zsu -pass in from any to any with opt nop,rr,zsu not opt ssrr,lsrr -pass in from localhost to localhost and not frag -pass in from localhost to localhost with frags,frag-body -pass in proto tcp all flags S with not oow keep state -block in proto tcp all with oow -pass in proto tcp all flags S with not bad,bad-src,bad-nat -block in proto tcp all flags S with bad,not bad-src,not bad-nat -pass in quick all with not short -block in quick all with not nat -pass in quick all with not frag-body -block in quick all with not lowttl -pass in all with mbcast,not bcast,multicast,not state,not ipopts -block in all with not mbcast,bcast,not multicast,state -pass in from any to any with opt mtur,mtup,encode,ts,tr,sec,cipso,satid,ssrr,visa,imitd,eip,finn,dps,sdb,nsapa,rtralrt,ump,addext,e-sec diff --git a/contrib/ipfilter/test/regress/in1 b/contrib/ipfilter/test/regress/in1 deleted file mode 100644 index d5d0cf4..0000000 --- a/contrib/ipfilter/test/regress/in1 +++ /dev/null @@ -1,31 +0,0 @@ -map le0 0/0 -> 0/32 -map le0 1/32 -> 1/32 -map le0 128.0.0.0/1 -> 0/0 -map le0 10.0.0.0/8 -> 1.2.3.0/24 -map le0 10.0.0.5/8 -> 1.2.3.4/24 -map le0 10.0.0.5/0xff000000 -> 1.2.3.4/24 -map le0 10.0.0.5/0xff -> 1.2.3.4/24 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 -map ppp0 192.168.0.0/16 -> 0/32 portmap udp 20000:29999 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp/udp 30000:39999 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp auto -map ppp0 192.168.0.0/16 -> 0/32 portmap udp auto -map ppp0 192.168.0.0/16 -> 0/32 portmap tcpudp auto -map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/6 -map ppp0 192.168.0.0/16 -> 0/32 proxy port 1010 ftp/tcp -map le0 0/0 -> 0/32 frag -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag -map ppp0 192.168.0.0/16 -> 0/32 proxy port ftp ftp/tcp frag -map le0 0/0 -> 0/32 age 10 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 age 10/20 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 age 30 -map le0 0/0 -> 0/32 frag age 10 -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 frag age 10/20 -map ppp0 192.168.0.0/16 -> 0/32 portmap tcp 10000:19999 frag age 30 -map fxp0 from 192.168.0.0/18 to 0/0 port = 21 -> 1.2.3.4/32 proxy port 21 ftp/tcp -map thisisalonginte 0/0 -> 0/32 mssclamp 1452 tag freddyliveshere -map bar0 0/0 -> 0/32 icmpidmap icmp 1000:2000 -map ppp0,adsl0 0/0 -> 0/32 -map ppp0 from 192.168.0.0/16 to any port = 123 -> 0/32 age 30/1 udp diff --git a/contrib/ipfilter/test/regress/in100 b/contrib/ipfilter/test/regress/in100 deleted file mode 100644 index 5e2ab6c..0000000 --- a/contrib/ipfilter/test/regress/in100 +++ /dev/null @@ -1,3 +0,0 @@ -rewrite in on bge0 from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4; -rewrite out on bge0 from 1.1.1.1/32 to 2.2.2.2 -> src 3.3.3.0/24 dst 4.4.4.4; -rewrite in on bge0 from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24 dst 4.4.4.0/24; diff --git a/contrib/ipfilter/test/regress/in101 b/contrib/ipfilter/test/regress/in101 deleted file mode 100644 index afef53b..0000000 --- a/contrib/ipfilter/test/regress/in101 +++ /dev/null @@ -1,4 +0,0 @@ -rewrite in on bge0 proto icmp from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4; -rewrite in on bge0 proto udp from 1.1.1.1 to 2.2.2.2 -> src 3.3.3.3 dst 4.4.4.4; -rewrite out on bge0 proto tcp from 1.1.1.1/32 to 2.2.2.2 -> src 3.3.3.0/24 dst 4.4.4.4; -rewrite in on bge0 proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 -> src 3.3.3.0/24,20202 dst 4.4.4.0/24,10101; diff --git a/contrib/ipfilter/test/regress/in102 b/contrib/ipfilter/test/regress/in102 deleted file mode 100644 index 57f3645..0000000 --- a/contrib/ipfilter/test/regress/in102 +++ /dev/null @@ -1,5 +0,0 @@ -rewrite in on bge0 proto tcp from any to any -> src 0/0 dst dstlist/a; -rewrite in on bge0 proto tcp from 1.1.1.1 to any -> src 0/0 dst dstlist/bee; -rewrite in on bge0 proto tcp from 1.1.1.1 to 2.2.2.2 -> src 0/0 dst dstlist/cat; -rewrite in on bge0 proto tcp from pool/a to 2.2.2.2 -> src 0/0 dst dstlist/bat; -rewrite in on bge0 proto tcp from pool/a to pool/1 -> src 0/0 dst dstlist/ant; diff --git a/contrib/ipfilter/test/regress/in2 b/contrib/ipfilter/test/regress/in2 deleted file mode 100644 index 58556c0..0000000 --- a/contrib/ipfilter/test/regress/in2 +++ /dev/null @@ -1,71 +0,0 @@ -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 tcp -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 255 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1 ip -rdr le0 9.8.7.6/0xff000000 -> 1.1.1.1 ip -rdr le0 9.8.7.6/0xffff0000 -> 1.1.1.1 ip -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 0/0 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 udp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp/udp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcpudp frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag -rdr le0 9.8.7.6/32 -> 1.1.1.1 ip frag age 10 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1 port 0 ip frag age 10/20 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 icmp frag age 10 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp frag age 20 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1 port 80 tcp round-robin frag age 30 sticky mssclamp 1000 tag nattagcacheline -rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1,1.1.1.2 port 80 tcp round-robin frag age 40 sticky mssclamp 1000 tag nattagcacheline -rdr ge0 9.8.7.6/32 -> 1.1.1.1 proxy port 21 ftp/tcp -rdr ge0 9.8.7.6/32 port 21 -> 1.1.1.1 port 21 tcp proxy ftp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555 tcp -rdr le0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port = 5555 tcp -rdr le0 0/0 -> test.host.dots -rdr le0 any -> test.host.dots,test.host.dots -rdr adsl0,ppp0 9.8.7.6/32 port 1000-2000 -> 1.1.1.1 port 5555-7777 tcp diff --git a/contrib/ipfilter/test/regress/in3 b/contrib/ipfilter/test/regress/in3 deleted file mode 100644 index d8016b6..0000000 --- a/contrib/ipfilter/test/regress/in3 +++ /dev/null @@ -1,5 +0,0 @@ -bimap le0 0/0 -> 0/32 -bimap le0 1/32 -> 1/32 -bimap le0 128.0.0.0/1 -> 0/0 -bimap le0 10.0.0.0/8 -> 1.2.3.0/24 -bimap le0 10.0.5.6/24 -> 1.2.3.4/24 diff --git a/contrib/ipfilter/test/regress/in4 b/contrib/ipfilter/test/regress/in4 deleted file mode 100644 index 46bbd81..0000000 --- a/contrib/ipfilter/test/regress/in4 +++ /dev/null @@ -1,5 +0,0 @@ -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 0 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports 256 -map-block le0 10.0.0.0/24 -> 203.1.1.0/24 ports auto -map-block le0 10.0.0.0/16 -> 203.1.1.0/24 ports auto diff --git a/contrib/ipfilter/test/regress/in5 b/contrib/ipfilter/test/regress/in5 deleted file mode 100644 index 766c3e3..0000000 --- a/contrib/ipfilter/test/regress/in5 +++ /dev/null @@ -1,24 +0,0 @@ -map le0 from 9.8.7.6/32 port > 1024 to any -> 1.1.1.1 portmap 10000:20000 tcp -map le0 from 9.8.7.6/32 port > 1024 to ! 1.2.3.4 -> 1.1.1.1 portmap 10000:20000 tcp -rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 tcp -rdr le0 from any to 9.8.7.6/0xffffffff port = 0 -> 1.1.1.1 port 0 ip -rdr le0 ! from 1.2.3.4 to 9.8.7.6 port = 8888 -> 1.1.1.1 port 888 tcp -rdr le0 from any to 9.8.7.6/255.255.255.255 port = 8888 -> 1.1.1.1 port 888 ip -rdr le0 from any to 9.8.7.6 mask 0xffffffff port = 8888 -> 1.1.1.1 port 888 tcp -rdr le0 from any to 9.8.7.6 mask 255.255.255.255 port = 8888 -> 1.1.1.1 port 888 udp -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp/udp -rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 888 icmp -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin -rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag -rdr le0 from any to 9.8.7.6/32 -> 1.1.1.1 port 0 ip frag age 10 -rdr le0 from any to 9.8.7.6/32 port = 0 -> 1.1.1.1 port 0 ip frag age 10/20 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 icmp frag age 10 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp frag age 20 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1 port 888 tcp round-robin frag age 30 -rdr le0 from any to 9.8.7.6/32 port = 8888 -> 1.1.1.1,1.1.1.2 port 888 tcp round-robin frag age 40 diff --git a/contrib/ipfilter/test/regress/in6 b/contrib/ipfilter/test/regress/in6 deleted file mode 100644 index 70e71dd..0000000 --- a/contrib/ipfilter/test/regress/in6 +++ /dev/null @@ -1,8 +0,0 @@ -map foo0 from any port = 1 to any port != 0 -> 0/32 udp -map foo0 from any port eq 1 to any port ne 0 -> 0/32 udp -map foo0 from any port < 1 to any port > 0 -> 0/32 tcp -map foo0 from any port lt 1 to any port gt 0 -> 0/32 tcp -map foo0 from any port <= 1 to any port >= 0 -> 0/32 tcp/udp -map foo0 from any port le 1 to any port ge 0 -> 0/32 tcp/udp -map foo0 from any port 1 >< 20 to any port 20 <> 40 -> 0/32 tcp/udp -map foo0 from any port 10:20 to any port 30:40 -> 0/32 tcp/udp diff --git a/contrib/ipfilter/test/regress/in7 b/contrib/ipfilter/test/regress/in7 deleted file mode 100644 index 792d600..0000000 --- a/contrib/ipfilter/test/regress/in7 +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/contrib/ipfilter/test/regress/ip1 b/contrib/ipfilter/test/regress/ip1 deleted file mode 100644 index c31ba25..0000000 --- a/contrib/ipfilter/test/regress/ip1 +++ /dev/null @@ -1,78 +0,0 @@ -#:%s/ \(number = [0-9]*\) \(type = [a-z]*\)/ \2 \1/g - -table role = ipf type = tree number = 1 - {; }; -table role = ipf type = tree number = 100 - { 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; }; -table role = nat type = tree number = 110 - { 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; }; -table role = auth type = tree number = 120 - { 1.2.3.4/32; !2.2.0.0/16; 2.2.2.0/24; }; -table role = count type = tree number = 130 - { 1.2.3.4; !2.2.0.0/16; 2.2.2.0/24; }; - -table role = ipf type = hash number = 2 - {; }; -table role = ipf type = hash number = 200 - { 0/0; 1/32; 1.2.3.4/32; }; -table role = nat type = hash number = 210 - { 0/0; 2/32; 1.2.3.4/32; }; -table role = auth type = hash number = 220 - { 0/0; 3/32; 1.2.3.4/32; }; -table role = count type = hash number = 230 - { 0/0; 4/32; 1.2.3.4/32; }; - -table role = ipf type = hash number = 240 seed = 101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role = nat type = hash number = 250 seed = 101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role = auth type = hash number = 260 seed = 101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role = count type = hash number = 270 seed = 101 - { 0/0; 4/32; 1.2.3.4/32; }; - -table role = ipf type = hash number = 2000 size = 1001 - { 0/0; 1/32; 1.2.3.4/32; }; -table role = nat type = hash number = 2000 size = 1001 - { 0/0; 2/32; 1.2.3.4/32; }; -table role = auth type = hash number = 2000 size = 1001 - { 0/0; 3/32; 1.2.3.4/32; }; -table role = count type = hash number = 2000 size = 1001 - { 0/0; 4/32; 1.2.3.4/32; }; - -table role = ipf type = hash number = 100 size = 1001 seed = 101 - { 0/0; 1/32; 1.2.3.4/32; }; -table role = nat type = hash number = 100 size = 1001 seed = 101 - { 0/0; 2/32; 1.2.3.4/32; }; -table role = auth type = hash number = 100 size = 1001 seed = 101 - { 0/0; 3/32; 1.2.3.4/32; }; -table role = count type = hash number = 100 size = 1001 seed = 101 - { 0/0; 4/32; 1.2.3.4/32; }; - -group-map in role = ipf number = 300 group = 303 - { 0/0; 5/32; 1.2.3.4/32; }; -group-map in role = nat number = 300 group = 303 - { 0/0; 6/32; 1.2.3.4/32; }; -group-map in role = auth number = 300 group = 303 - { 0/0; 7/32; 1.2.3.4/32; }; -group-map in role = count number = 300 group = 303 - { 0/0; 8/32; 1.2.3.4/32; }; - -group-map out role = ipf number = 400 group = 303 - { 0/0; 5/32; 1.2.3.4/32, group = 606; }; -group-map out role = nat number = 400 group = 303 - { 0/0; 6/32; 1.2.3.4/32, group = 606; }; -group-map out role = auth number = 400 group = 303 - { 0/0; 7/32; 1.2.3.4/32, group = 606; }; -group-map out role = count number = 400 group = 303 - { 0/0; 8/32; 1.2.3.4/32, group = 606; }; - -group-map in role = ipf number = 500 - { 0/0, group = 10; 5/32, group = 800; 1.2.3.4/32, group = 606; }; -group-map in role = nat number = 500 - { 0/0, group = 10; 6/32, group = 800; 1.2.3.4/32, group = 606; }; -group-map in role = auth number = 500 - { 0/0, group = 10; 7/32, group = 800; 1.2.3.4/32, group = 606; }; -group-map in role = count number = 500 - { 0/0, group = 10; 8/32, group = 800; 1.2.3.4/32, group = 606; }; - diff --git a/contrib/ipfilter/test/regress/ip2 b/contrib/ipfilter/test/regress/ip2 deleted file mode 100644 index 76f31b6..0000000 --- a/contrib/ipfilter/test/regress/ip2 +++ /dev/null @@ -1,2 +0,0 @@ -table role = ipf type = tree name = letters - { "file://input/ip2.data"; }; diff --git a/contrib/ipfilter/test/regress/ip3 b/contrib/ipfilter/test/regress/ip3 deleted file mode 100644 index 98d2b0b..0000000 --- a/contrib/ipfilter/test/regress/ip3 +++ /dev/null @@ -1,14 +0,0 @@ -pool ipf/dstlist (name fred; policy round-robin;) - { 3.3.3.3; }; -pool ipf/dstlist (name jack; policy weighted connection;) - { 4.4.4.4; bge0:5.5.5.5;}; -pool ipf/dstlist (name jill; policy random;) - { 1.1.1.1; bge0:2.2.2.2;}; -pool nat/hash (name noproxy; size 17;) - { 1.1.1.1; 2.2.2.2;}; -pool nat/tree (name raw;) - { 1.1.1.1; 2.2.2.2;}; -pool all/dstlist (name jill; policy random;) - { 1.1.1.1; bge0:2.2.2.2;}; -pool all/hash (name noproxy; size 17;) - { 1.1.1.1; 2.2.2.2;}; diff --git a/contrib/ipfilter/test/regress/ipf6-1 b/contrib/ipfilter/test/regress/ipf6-1 deleted file mode 100644 index 814dfd6..0000000 --- a/contrib/ipfilter/test/regress/ipf6-1 +++ /dev/null @@ -1,3 +0,0 @@ -block in all -block out all -pass out proto 58 all keep state diff --git a/contrib/ipfilter/test/regress/ipv6.1 b/contrib/ipfilter/test/regress/ipv6.1 deleted file mode 100644 index fc532b6..0000000 --- a/contrib/ipfilter/test/regress/ipv6.1 +++ /dev/null @@ -1 +0,0 @@ -pass out log quick on gif0 proto udp from ef00:1001:2002::/48 to any port 33433 >< 34000 keep state diff --git a/contrib/ipfilter/test/regress/ipv6.2 b/contrib/ipfilter/test/regress/ipv6.2 deleted file mode 100644 index 814dfd6..0000000 --- a/contrib/ipfilter/test/regress/ipv6.2 +++ /dev/null @@ -1,3 +0,0 @@ -block in all -block out all -pass out proto 58 all keep state diff --git a/contrib/ipfilter/test/regress/ipv6.3 b/contrib/ipfilter/test/regress/ipv6.3 deleted file mode 100644 index 6dc9e93..0000000 --- a/contrib/ipfilter/test/regress/ipv6.3 +++ /dev/null @@ -1 +0,0 @@ -pass out log quick on gif0 proto ipv6-icmp from any to any icmp-type 128 keep state diff --git a/contrib/ipfilter/test/regress/ipv6.4 b/contrib/ipfilter/test/regress/ipv6.4 deleted file mode 100644 index b221744..0000000 --- a/contrib/ipfilter/test/regress/ipv6.4 +++ /dev/null @@ -1,3 +0,0 @@ -pass in proto ipv6-icmp all icmp-type echo keep frags -pass in proto ipv6-icmp all icmp-type echo keep frags keep state -pass in proto tcp all keep frags keep state diff --git a/contrib/ipfilter/test/regress/ipv6.5 b/contrib/ipfilter/test/regress/ipv6.5 deleted file mode 100644 index d9ae23b..0000000 --- a/contrib/ipfilter/test/regress/ipv6.5 +++ /dev/null @@ -1,2 +0,0 @@ -pass out family inet6 all with v6hdr routing -block out family inet6 proto tcp all with v6hdr routing diff --git a/contrib/ipfilter/test/regress/ipv6.6 b/contrib/ipfilter/test/regress/ipv6.6 deleted file mode 100644 index 19a4df9..0000000 --- a/contrib/ipfilter/test/regress/ipv6.6 +++ /dev/null @@ -1,2 +0,0 @@ -pass out on gif0 proto udp all keep frag -block out all with bad diff --git a/contrib/ipfilter/test/regress/l1 b/contrib/ipfilter/test/regress/l1 deleted file mode 100644 index 88cca58..0000000 --- a/contrib/ipfilter/test/regress/l1 +++ /dev/null @@ -1,6 +0,0 @@ -log in all -pass in on anon0 all head 100 -pass in log quick from 3.3.3.3 to any group 100 -pass in log body quick from 2.2.2.2 to any -pass in log quick proto tcp from 1.1.1.1 to any flags S keep state -pass in log first quick proto tcp from 1.1.1.1 to any flags S keep state diff --git a/contrib/ipfilter/test/regress/n1 b/contrib/ipfilter/test/regress/n1 deleted file mode 100644 index 9bcf29b..0000000 --- a/contrib/ipfilter/test/regress/n1 +++ /dev/null @@ -1,3 +0,0 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 -map zx0 10.1.1.0/24 -> 10.3.4.0/24 diff --git a/contrib/ipfilter/test/regress/n10 b/contrib/ipfilter/test/regress/n10 deleted file mode 100644 index 0f48192..0000000 --- a/contrib/ipfilter/test/regress/n10 +++ /dev/null @@ -1,3 +0,0 @@ -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 100 -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 1000 -map ppp0 0/0 -> 203.203.203.203/32 mssclamp 10000 diff --git a/contrib/ipfilter/test/regress/n100 b/contrib/ipfilter/test/regress/n100 deleted file mode 100644 index a8b6dee..0000000 --- a/contrib/ipfilter/test/regress/n100 +++ /dev/null @@ -1 +0,0 @@ -rewrite out on zx0 from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16; diff --git a/contrib/ipfilter/test/regress/n101 b/contrib/ipfilter/test/regress/n101 deleted file mode 100644 index 2f5fcd9..0000000 --- a/contrib/ipfilter/test/regress/n101 +++ /dev/null @@ -1 +0,0 @@ -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32 dst 6.6.0.0/16; diff --git a/contrib/ipfilter/test/regress/n102 b/contrib/ipfilter/test/regress/n102 deleted file mode 100644 index f056633..0000000 --- a/contrib/ipfilter/test/regress/n102 +++ /dev/null @@ -1 +0,0 @@ -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000:2000 dst 6.6.0.0/16; diff --git a/contrib/ipfilter/test/regress/n103 b/contrib/ipfilter/test/regress/n103 deleted file mode 100644 index c3c27d6..0000000 --- a/contrib/ipfilter/test/regress/n103 +++ /dev/null @@ -1 +0,0 @@ -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16,4000:4001; diff --git a/contrib/ipfilter/test/regress/n104 b/contrib/ipfilter/test/regress/n104 deleted file mode 100644 index 785f0ad..0000000 --- a/contrib/ipfilter/test/regress/n104 +++ /dev/null @@ -1 +0,0 @@ -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 -> src 4.4.0.0/24,1000-1001 dst 6.6.0.0/16,4000:4001; diff --git a/contrib/ipfilter/test/regress/n105 b/contrib/ipfilter/test/regress/n105 deleted file mode 100644 index afe8966..0000000 --- a/contrib/ipfilter/test/regress/n105 +++ /dev/null @@ -1 +0,0 @@ -rewrite in on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16 port = 3128; diff --git a/contrib/ipfilter/test/regress/n106 b/contrib/ipfilter/test/regress/n106 deleted file mode 100644 index 6074ab0..0000000 --- a/contrib/ipfilter/test/regress/n106 +++ /dev/null @@ -1 +0,0 @@ -rewrite out on zx0 proto tcp from 0/0 to 2.2.0.0/16 port = 80 -> src 4.4.4.4/32,1000-1001 dst 6.6.0.0/16 port = 3128; diff --git a/contrib/ipfilter/test/regress/n10_6 b/contrib/ipfilter/test/regress/n10_6 deleted file mode 100644 index 738152d..0000000 --- a/contrib/ipfilter/test/regress/n10_6 +++ /dev/null @@ -1,3 +0,0 @@ -map ppp0 any -> 203.203.203.203/128 mssclamp 100 -map ppp0 any -> 203.203.203.203/128 mssclamp 1000 -map ppp0 any -> 203.203.203.203/128 mssclamp 10000 diff --git a/contrib/ipfilter/test/regress/n11 b/contrib/ipfilter/test/regress/n11 deleted file mode 100644 index 8cdf7fc..0000000 --- a/contrib/ipfilter/test/regress/n11 +++ /dev/null @@ -1,3 +0,0 @@ -bimap zx0 10.1.1.1/32 -> 1.6.7.8/32 -bimap zx0 10.1.1.0/24 -> 10.2.2.2/32 -bimap zx0 10.1.1.0/24 -> 10.3.4.5/24 diff --git a/contrib/ipfilter/test/regress/n11_6 b/contrib/ipfilter/test/regress/n11_6 deleted file mode 100644 index 7b428cc..0000000 --- a/contrib/ipfilter/test/regress/n11_6 +++ /dev/null @@ -1,3 +0,0 @@ -bimap zx0 10:1:1::1/128 -> 1::6:7:8/128 -bimap zx0 10:1:1::/112 -> 10::2:2:2/128 -bimap zx0 10:1:1::/112 -> 10::3:4:5/112 diff --git a/contrib/ipfilter/test/regress/n12 b/contrib/ipfilter/test/regress/n12 deleted file mode 100644 index 933856b..0000000 --- a/contrib/ipfilter/test/regress/n12 +++ /dev/null @@ -1 +0,0 @@ -map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential diff --git a/contrib/ipfilter/test/regress/n12_6 b/contrib/ipfilter/test/regress/n12_6 deleted file mode 100644 index bf21848..0000000 --- a/contrib/ipfilter/test/regress/n12_6 +++ /dev/null @@ -1 +0,0 @@ -map le0 c0a8:7e00::/112 -> 0/128 portmap tcp/udp 10000:20000 diff --git a/contrib/ipfilter/test/regress/n13 b/contrib/ipfilter/test/regress/n13 deleted file mode 100644 index 8047930..0000000 --- a/contrib/ipfilter/test/regress/n13 +++ /dev/null @@ -1 +0,0 @@ -map le0 192.168.0.0/16 -> range 203.1.1.23-203.1.3.45 diff --git a/contrib/ipfilter/test/regress/n13_6 b/contrib/ipfilter/test/regress/n13_6 deleted file mode 100644 index c1d1646..0000000 --- a/contrib/ipfilter/test/regress/n13_6 +++ /dev/null @@ -1 +0,0 @@ -map le0 192:168:1::0/48 -> range 203:0:1::1:23-203:0:1::3:45 diff --git a/contrib/ipfilter/test/regress/n14 b/contrib/ipfilter/test/regress/n14 deleted file mode 100644 index 6f5d571..0000000 --- a/contrib/ipfilter/test/regress/n14 +++ /dev/null @@ -1 +0,0 @@ -rdr gre0 0/0 port 80 -> 10.1.1.254,10.1.1.253 port 80 tcp sticky diff --git a/contrib/ipfilter/test/regress/n14_6 b/contrib/ipfilter/test/regress/n14_6 deleted file mode 100644 index 64e88ee..0000000 --- a/contrib/ipfilter/test/regress/n14_6 +++ /dev/null @@ -1 +0,0 @@ -rdr gre0 any port 80 -> 10:1:1::254,10:1:1::253 port 80 tcp sticky diff --git a/contrib/ipfilter/test/regress/n15 b/contrib/ipfilter/test/regress/n15 deleted file mode 100644 index 062b766..0000000 --- a/contrib/ipfilter/test/regress/n15 +++ /dev/null @@ -1,2 +0,0 @@ -rdr le0 0/0 port 80 -> 3.3.3.3 port 80 tcp -rdr le0 0/0 port 80 -> 3.3.3.3 port 80-88 tcp diff --git a/contrib/ipfilter/test/regress/n15_6 b/contrib/ipfilter/test/regress/n15_6 deleted file mode 100644 index e82dd82..0000000 --- a/contrib/ipfilter/test/regress/n15_6 +++ /dev/null @@ -1,2 +0,0 @@ -rdr le0 any port 80 -> 3:0:3::3:3 port 80 tcp -rdr le0 any port 80 -> 3:0:3::3:3 port 80-88 tcp diff --git a/contrib/ipfilter/test/regress/n16 b/contrib/ipfilter/test/regress/n16 deleted file mode 100644 index ff8958c..0000000 --- a/contrib/ipfilter/test/regress/n16 +++ /dev/null @@ -1 +0,0 @@ -rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp diff --git a/contrib/ipfilter/test/regress/n16_6 b/contrib/ipfilter/test/regress/n16_6 deleted file mode 100644 index ff8958c..0000000 --- a/contrib/ipfilter/test/regress/n16_6 +++ /dev/null @@ -1 +0,0 @@ -rdr vlan0 from any to 69.248.79.193 port = 38136 -> 172.31.83.24 port 2013 udp diff --git a/contrib/ipfilter/test/regress/n17 b/contrib/ipfilter/test/regress/n17 deleted file mode 100644 index 213f51f..0000000 --- a/contrib/ipfilter/test/regress/n17 +++ /dev/null @@ -1 +0,0 @@ -bimap zx0 0/0 -> 1.1.1.3 diff --git a/contrib/ipfilter/test/regress/n17_6 b/contrib/ipfilter/test/regress/n17_6 deleted file mode 100644 index 08ef77a..0000000 --- a/contrib/ipfilter/test/regress/n17_6 +++ /dev/null @@ -1 +0,0 @@ -bimap zx0 any -> 1::1:1:3 diff --git a/contrib/ipfilter/test/regress/n18 b/contrib/ipfilter/test/regress/n18 deleted file mode 100644 index 792f136..0000000 --- a/contrib/ipfilter/test/regress/n18 +++ /dev/null @@ -1,3 +0,0 @@ -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1:4 sequential -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:5000 sequential -map z0 0/0 -> 1.1.1.1/32 portmap tcp/udp 1000:50000 sequential diff --git a/contrib/ipfilter/test/regress/n1_6 b/contrib/ipfilter/test/regress/n1_6 deleted file mode 100644 index 341f136..0000000 --- a/contrib/ipfilter/test/regress/n1_6 +++ /dev/null @@ -1,3 +0,0 @@ -map zx0 10:1:1::1/128 -> 10::2:2:2/128 -map zx0 10:1:1::/112 -> 10::3:4:5/128 -map zx0 10:1:1::/112 -> 10::3:4:0/112 diff --git a/contrib/ipfilter/test/regress/n2 b/contrib/ipfilter/test/regress/n2 deleted file mode 100644 index 39a4d72..0000000 --- a/contrib/ipfilter/test/regress/n2 +++ /dev/null @@ -1,4 +0,0 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n200 b/contrib/ipfilter/test/regress/n200 deleted file mode 100644 index c792e54..0000000 --- a/contrib/ipfilter/test/regress/n200 +++ /dev/null @@ -1 +0,0 @@ -divert in on bar0 from any to any -> src 127.0.0.1,10101 dst 127.0.0.1,10101 udp; diff --git a/contrib/ipfilter/test/regress/n2_6 b/contrib/ipfilter/test/regress/n2_6 deleted file mode 100644 index 3a04f33..0000000 --- a/contrib/ipfilter/test/regress/n2_6 +++ /dev/null @@ -1,4 +0,0 @@ -map zx0 10:1:1::1/128 -> 10::2:2:2/128 portmap tcp 10000:20000 sequential -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential -map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n3 b/contrib/ipfilter/test/regress/n3 deleted file mode 100644 index 82c83dd..0000000 --- a/contrib/ipfilter/test/regress/n3 +++ /dev/null @@ -1,2 +0,0 @@ -map zz0 10.1.0.0/16 -> 192.168.2.0/24 portmap tcp/udp auto -map-block zz0 10.1.0.0/16 -> 192.168.1.0/24 ports 252 diff --git a/contrib/ipfilter/test/regress/n4 b/contrib/ipfilter/test/regress/n4 deleted file mode 100644 index e7c0314..0000000 --- a/contrib/ipfilter/test/regress/n4 +++ /dev/null @@ -1,6 +0,0 @@ -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 10.1.1.0/24 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 0/0 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 10.1.1.0/24 port 53 -> 10.2.2.1 port 10053 udp -rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 tcp -rdr zx0 10.1.1.0/24 port 0 -> 10.2.2.1 port 0 ip diff --git a/contrib/ipfilter/test/regress/n4_6 b/contrib/ipfilter/test/regress/n4_6 deleted file mode 100644 index 72dad4c..0000000 --- a/contrib/ipfilter/test/regress/n4_6 +++ /dev/null @@ -1,6 +0,0 @@ -rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 10:1:1::/112 port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 any port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 10:1:1::/112 port 53 -> 10::2:2:1 port 10053 udp -rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1 port 0 tcp -rdr zx0 10:1:1::/112 port 0 -> 10::2:2:1 port 0 ip diff --git a/contrib/ipfilter/test/regress/n5 b/contrib/ipfilter/test/regress/n5 deleted file mode 100644 index d9f1a88..0000000 --- a/contrib/ipfilter/test/regress/n5 +++ /dev/null @@ -1,6 +0,0 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 -map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32 -map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n5_6 b/contrib/ipfilter/test/regress/n5_6 deleted file mode 100644 index acefd7b..0000000 --- a/contrib/ipfilter/test/regress/n5_6 +++ /dev/null @@ -1,6 +0,0 @@ -map zx0 10:1:1::1/128 -> 10::2:2:2/128 -map zx0 from 10:1:1::/112 to 10:1::/32 -> 10::3:4:5/128 -map zx0 from 10:1:1::/112 ! to 10:1::/32 -> 10::3:4:0/112 -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap udp 10000:20000 sequential -map zx0 10:1::/32 -> 10::3:4:0/112 portmap tcp/udp 10000:20000 sequential -map zx0 10:1:1::/112 -> 10::3:4:5/128 portmap tcp/udp 40000:40001 sequential diff --git a/contrib/ipfilter/test/regress/n6 b/contrib/ipfilter/test/regress/n6 deleted file mode 100644 index 79f11a4..0000000 --- a/contrib/ipfilter/test/regress/n6 +++ /dev/null @@ -1,5 +0,0 @@ -rdr zx0 10.1.1.1/32 port 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 from any to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 from 10.2.0.0/16 to 10.1.1.0/24 port = 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 from 10.3.0.0/16 to 10.1.0.0/16 port = 23 -> 10.2.2.1 port 10023 tcp -rdr zx0 ! from 10.2.0.0/16 to 10.1.1.0/24 port = 53 -> 10.2.2.1 port 10053 udp diff --git a/contrib/ipfilter/test/regress/n6_6 b/contrib/ipfilter/test/regress/n6_6 deleted file mode 100644 index 3491c6b..0000000 --- a/contrib/ipfilter/test/regress/n6_6 +++ /dev/null @@ -1,5 +0,0 @@ -rdr zx0 10:1:1::1/128 port 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 from any to 10:1:1::/112 port = 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 from 10::/32 to 10:1:1::/112 port = 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 from 10:3::/32 to 10:1::/32 port = 23 -> 10::2:2:1 port 10023 tcp -rdr zx0 ! from 10::/32 to 10:1:1::/112 port = 53 -> 10::2:2:1 port 10053 udp diff --git a/contrib/ipfilter/test/regress/n7 b/contrib/ipfilter/test/regress/n7 deleted file mode 100644 index be995c2..0000000 --- a/contrib/ipfilter/test/regress/n7 +++ /dev/null @@ -1,3 +0,0 @@ -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port 10023 tcp -rdr zx0 10.1.1.1/32 port 23-79 -> 10.2.2.1 port = 10023 tcp -rdr zx0 10.1.1.0/24 port 80 -> 10.2.2.1,1.2.2.129 port 3128 tcp diff --git a/contrib/ipfilter/test/regress/n7_6 b/contrib/ipfilter/test/regress/n7_6 deleted file mode 100644 index 88055f6..0000000 --- a/contrib/ipfilter/test/regress/n7_6 +++ /dev/null @@ -1,3 +0,0 @@ -rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1 port 10023 tcp -rdr zx0 10:1:1::1/128 port 23-79 -> 10::2:2:1 port = 10023 tcp -rdr zx0 10:1:1::/112 port 80 -> 10::2:2:1,1::2:2:129 port 3128 tcp diff --git a/contrib/ipfilter/test/regress/n8 b/contrib/ipfilter/test/regress/n8 deleted file mode 100644 index bf0e94f..0000000 --- a/contrib/ipfilter/test/regress/n8 +++ /dev/null @@ -1 +0,0 @@ -map icmp0 2.2.2.0/24 -> 10.10.10.0/24 diff --git a/contrib/ipfilter/test/regress/n8_6 b/contrib/ipfilter/test/regress/n8_6 deleted file mode 100644 index 2f96be0..0000000 --- a/contrib/ipfilter/test/regress/n8_6 +++ /dev/null @@ -1 +0,0 @@ -map icmp0 2::2:2:0/112 -> 10:10:10::/112 diff --git a/contrib/ipfilter/test/regress/n9 b/contrib/ipfilter/test/regress/n9 deleted file mode 100644 index 81a7ccd..0000000 --- a/contrib/ipfilter/test/regress/n9 +++ /dev/null @@ -1 +0,0 @@ -rdr icmp0 4.4.4.0/24 port 0 -> 10.10.10.1 port 0 ip diff --git a/contrib/ipfilter/test/regress/n9_6 b/contrib/ipfilter/test/regress/n9_6 deleted file mode 100644 index 31e4615..0000000 --- a/contrib/ipfilter/test/regress/n9_6 +++ /dev/null @@ -1 +0,0 @@ -rdr icmp0 4:4:4::/112 port 0 -> 10:10:10::1 port 0 ip diff --git a/contrib/ipfilter/test/regress/ni1.ipf b/contrib/ipfilter/test/regress/ni1.ipf deleted file mode 100644 index c7e5797..0000000 --- a/contrib/ipfilter/test/regress/ni1.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out proto udp from any to any keep state -pass out proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni1.nat b/contrib/ipfilter/test/regress/ni1.nat deleted file mode 100644 index 077aab1..0000000 --- a/contrib/ipfilter/test/regress/ni1.nat +++ /dev/null @@ -1,3 +0,0 @@ -map df0 from 2.2.2.2/32 port 20000 >< 25000 to any -> 6.6.6.8/32 portmap udp 2000:2500 sequential -map df0 from 2.2.2.2/32 port 2000 >< 2500 to any -> 6.6.6.7/32 portmap udp 20000:25000 sequential -map df0 from 2.2.2.2/32 to any -> 6.6.6.6/32 diff --git a/contrib/ipfilter/test/regress/ni10.ipf b/contrib/ipfilter/test/regress/ni10.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni10.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni10.nat b/contrib/ipfilter/test/regress/ni10.nat deleted file mode 100644 index 2a04ef7..0000000 --- a/contrib/ipfilter/test/regress/ni10.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 2.2.2.2/32 -> 6.6.6.6 diff --git a/contrib/ipfilter/test/regress/ni11.ipf b/contrib/ipfilter/test/regress/ni11.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni11.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni11.nat b/contrib/ipfilter/test/regress/ni11.nat deleted file mode 100644 index 1d0018c..0000000 --- a/contrib/ipfilter/test/regress/ni11.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/ni12.ipf b/contrib/ipfilter/test/regress/ni12.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni12.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni12.nat b/contrib/ipfilter/test/regress/ni12.nat deleted file mode 100644 index 8c36bc8..0000000 --- a/contrib/ipfilter/test/regress/ni12.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/ni13.ipf b/contrib/ipfilter/test/regress/ni13.ipf deleted file mode 100644 index 04b6d13..0000000 --- a/contrib/ipfilter/test/regress/ni13.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass in quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni13.nat b/contrib/ipfilter/test/regress/ni13.nat deleted file mode 100644 index ac2be49..0000000 --- a/contrib/ipfilter/test/regress/ni13.nat +++ /dev/null @@ -1 +0,0 @@ -rdr pcn1 192.168.113.3/32 port 1723 -> 0.0.0.0 port 1723 tcp proxy pptp diff --git a/contrib/ipfilter/test/regress/ni14.ipf b/contrib/ipfilter/test/regress/ni14.ipf deleted file mode 100644 index 04b6d13..0000000 --- a/contrib/ipfilter/test/regress/ni14.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass in quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni14.nat b/contrib/ipfilter/test/regress/ni14.nat deleted file mode 100644 index 72a8a4a..0000000 --- a/contrib/ipfilter/test/regress/ni14.nat +++ /dev/null @@ -1 +0,0 @@ -rdr pcn1 192.168.113.3/32 port 1723 -> 127.0.0.1 port 1723 tcp proxy pptp diff --git a/contrib/ipfilter/test/regress/ni15.ipf b/contrib/ipfilter/test/regress/ni15.ipf deleted file mode 100644 index 1b9a013..0000000 --- a/contrib/ipfilter/test/regress/ni15.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass out quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni15.nat b/contrib/ipfilter/test/regress/ni15.nat deleted file mode 100644 index 420c7b7..0000000 --- a/contrib/ipfilter/test/regress/ni15.nat +++ /dev/null @@ -1 +0,0 @@ -map pcn1 0/0 -> 0/0 proxy port 1723 pptp/tcp diff --git a/contrib/ipfilter/test/regress/ni16.ipf b/contrib/ipfilter/test/regress/ni16.ipf deleted file mode 100644 index 1b9a013..0000000 --- a/contrib/ipfilter/test/regress/ni16.ipf +++ /dev/null @@ -1,3 +0,0 @@ -pass out quick on pcn1 proto tcp from any to any port = 1723 keep state -block in all -block out all diff --git a/contrib/ipfilter/test/regress/ni16.nat b/contrib/ipfilter/test/regress/ni16.nat deleted file mode 100644 index 5fad3cd..0000000 --- a/contrib/ipfilter/test/regress/ni16.nat +++ /dev/null @@ -1 +0,0 @@ -map pcn1 10.2.2.2/32 -> 0/32 proxy port 1723 pptp/tcp diff --git a/contrib/ipfilter/test/regress/ni17.ipf b/contrib/ipfilter/test/regress/ni17.ipf deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/regress/ni17.ipf +++ /dev/null diff --git a/contrib/ipfilter/test/regress/ni17.nat b/contrib/ipfilter/test/regress/ni17.nat deleted file mode 100644 index 3da6338..0000000 --- a/contrib/ipfilter/test/regress/ni17.nat +++ /dev/null @@ -1,4 +0,0 @@ -rdr le0 0/0 port 80 -> 10.1.1.252 port 3128 tcp round-robin -rdr le0 0/0 port 80 -> 10.1.2.252 port 3128 tcp round-robin -rdr le0 0/0 port 80 -> 10.1.3.252 port 3128 tcp round-robin sticky -rdr le0 0/0 port 80 -> 10.1.1.253,10.1.2.253 port 3128 tcp round-robin sticky diff --git a/contrib/ipfilter/test/regress/ni18.ipf b/contrib/ipfilter/test/regress/ni18.ipf deleted file mode 100644 index e69de29..0000000 --- a/contrib/ipfilter/test/regress/ni18.ipf +++ /dev/null diff --git a/contrib/ipfilter/test/regress/ni18.nat b/contrib/ipfilter/test/regress/ni18.nat deleted file mode 100644 index 40113c1..0000000 --- a/contrib/ipfilter/test/regress/ni18.nat +++ /dev/null @@ -1,4 +0,0 @@ -rdr hme0 192.168.1.0/24 port 80 -> 1.1.1.1 port 80 tcp; -no rdr hme0 192.168.1.1 port 80 tcp; -map hme1 10.1.0.0/16 -> 203.1.1.1/32 portmap tcp/udp 10000:20000 -no map hme1 10.1.1.0/24 tcp; diff --git a/contrib/ipfilter/test/regress/ni19.ipf b/contrib/ipfilter/test/regress/ni19.ipf deleted file mode 100644 index c6fcec1..0000000 --- a/contrib/ipfilter/test/regress/ni19.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block in all -pass out quick on bge0 proto tcp from any to any port = shell flags S keep state -block out all diff --git a/contrib/ipfilter/test/regress/ni19.nat b/contrib/ipfilter/test/regress/ni19.nat deleted file mode 100644 index 56b81a9..0000000 --- a/contrib/ipfilter/test/regress/ni19.nat +++ /dev/null @@ -1 +0,0 @@ -map bge0 192.168.113.0/24 -> 10.1.1.1/32 proxy port shell rcmd/tcp diff --git a/contrib/ipfilter/test/regress/ni2.ipf b/contrib/ipfilter/test/regress/ni2.ipf deleted file mode 100644 index 5956cf9..0000000 --- a/contrib/ipfilter/test/regress/ni2.ipf +++ /dev/null @@ -1 +0,0 @@ -pass out quick proto tcp from any to any flags S/SAFR keep state diff --git a/contrib/ipfilter/test/regress/ni2.nat b/contrib/ipfilter/test/regress/ni2.nat deleted file mode 100644 index 43d2c83..0000000 --- a/contrib/ipfilter/test/regress/ni2.nat +++ /dev/null @@ -1 +0,0 @@ -map xl0 10.0.0.0/8 -> 1.1.1.1/32 portmap tcp/udp 40000:60000 sequential diff --git a/contrib/ipfilter/test/regress/ni20.ipf b/contrib/ipfilter/test/regress/ni20.ipf deleted file mode 100644 index c6f6d84..0000000 --- a/contrib/ipfilter/test/regress/ni20.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block in all -pass in quick on bge0 proto tcp from any to any port = shell flags S keep state -block out all diff --git a/contrib/ipfilter/test/regress/ni20.nat b/contrib/ipfilter/test/regress/ni20.nat deleted file mode 100644 index f2dd0a7..0000000 --- a/contrib/ipfilter/test/regress/ni20.nat +++ /dev/null @@ -1 +0,0 @@ -rdr bge0 10.1.1.4/32 port shell -> 192.168.113.4 port shell tcp proxy rcmd diff --git a/contrib/ipfilter/test/regress/ni21.ipf b/contrib/ipfilter/test/regress/ni21.ipf deleted file mode 100644 index 6d6ed08..0000000 --- a/contrib/ipfilter/test/regress/ni21.ipf +++ /dev/null @@ -1 +0,0 @@ -pass out on lan0 to eri0:1.1.1.1 from 2.2.2.2 to any diff --git a/contrib/ipfilter/test/regress/ni21.nat b/contrib/ipfilter/test/regress/ni21.nat deleted file mode 100644 index 6b2d46a..0000000 --- a/contrib/ipfilter/test/regress/ni21.nat +++ /dev/null @@ -1 +0,0 @@ -map lan0,eri0 2.2.2.2 -> 4.4.4.4 diff --git a/contrib/ipfilter/test/regress/ni23.ipf b/contrib/ipfilter/test/regress/ni23.ipf deleted file mode 100644 index 49ebcf7..0000000 --- a/contrib/ipfilter/test/regress/ni23.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block out all -block in all -pass in on le0,hme0 out-via ppp0,bge0 to ppp0:3.3.3.254 proto udp all keep state diff --git a/contrib/ipfilter/test/regress/ni23.nat b/contrib/ipfilter/test/regress/ni23.nat deleted file mode 100644 index 094d377..0000000 --- a/contrib/ipfilter/test/regress/ni23.nat +++ /dev/null @@ -1,2 +0,0 @@ -rdr le0,bge0 1.1.0.0/16 -> 2.2.2.2 -map hme0,ppp0 3.3.3.0/24 -> 4.4.4.4/32 diff --git a/contrib/ipfilter/test/regress/ni3.ipf b/contrib/ipfilter/test/regress/ni3.ipf deleted file mode 100644 index c7e5797..0000000 --- a/contrib/ipfilter/test/regress/ni3.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out proto udp from any to any keep state -pass out proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni3.nat b/contrib/ipfilter/test/regress/ni3.nat deleted file mode 100644 index 4306f4b..0000000 --- a/contrib/ipfilter/test/regress/ni3.nat +++ /dev/null @@ -1 +0,0 @@ -map df0 2.2.2.2/32 -> 6.6.6.6/32 diff --git a/contrib/ipfilter/test/regress/ni4.ipf b/contrib/ipfilter/test/regress/ni4.ipf deleted file mode 100644 index c7e5797..0000000 --- a/contrib/ipfilter/test/regress/ni4.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass out proto udp from any to any keep state -pass out proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni4.nat b/contrib/ipfilter/test/regress/ni4.nat deleted file mode 100644 index e9d5cc1..0000000 --- a/contrib/ipfilter/test/regress/ni4.nat +++ /dev/null @@ -1 +0,0 @@ -map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000 sequential diff --git a/contrib/ipfilter/test/regress/ni5.ipf b/contrib/ipfilter/test/regress/ni5.ipf deleted file mode 100644 index 8f11424..0000000 --- a/contrib/ipfilter/test/regress/ni5.ipf +++ /dev/null @@ -1,3 +0,0 @@ -block in all -pass out quick on ppp0 proto tcp from any to any port = ftp flags S keep state -block out all diff --git a/contrib/ipfilter/test/regress/ni5.nat b/contrib/ipfilter/test/regress/ni5.nat deleted file mode 100644 index 8e80d22..0000000 --- a/contrib/ipfilter/test/regress/ni5.nat +++ /dev/null @@ -1 +0,0 @@ -map ppp0 192.168.1.0/24 -> 1.1.1.1/32 proxy port ftp ftp/tcp diff --git a/contrib/ipfilter/test/regress/ni6.ipf b/contrib/ipfilter/test/regress/ni6.ipf deleted file mode 100644 index f5b83b2..0000000 --- a/contrib/ipfilter/test/regress/ni6.ipf +++ /dev/null @@ -1,9 +0,0 @@ -block out log quick on qfe0 from 192.168.7.0/24 to any -block out log quick on nf0 from 192.168.6.0/24 to any -pass in quick on nf0 proto tcp from any to any port = 111 flags S keep state -pass in quick on nf0 proto udp from any to any port = 111 keep state -block return-rst in log quick on nf0 proto tcp from any to any -block in log quick on nf0 from 192.168.7.0/24 to any -block return-rst in log quick on qfe0 proto tcp from any to any -block in log quick on qfe0 from 192.168.6.0/24 to any - diff --git a/contrib/ipfilter/test/regress/ni6.nat b/contrib/ipfilter/test/regress/ni6.nat deleted file mode 100644 index 00d57d0..0000000 --- a/contrib/ipfilter/test/regress/ni6.nat +++ /dev/null @@ -1,3 +0,0 @@ -rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 udp proxy rpcbu -rdr nf0 192.168.6.2 port 111 -> 192.168.7.1 port 111 tcp proxy rpcbt -map qfe0 192.168.6.0/24 -> 192.168.7.2/32 diff --git a/contrib/ipfilter/test/regress/ni7.ipf b/contrib/ipfilter/test/regress/ni7.ipf deleted file mode 100644 index 4151b6e..0000000 --- a/contrib/ipfilter/test/regress/ni7.ipf +++ /dev/null @@ -1,4 +0,0 @@ -block in all -block out all -pass in proto udp from any to any keep state -pass in proto tcp from any to any flags S keep state diff --git a/contrib/ipfilter/test/regress/ni7.nat b/contrib/ipfilter/test/regress/ni7.nat deleted file mode 100644 index 2a04ef7..0000000 --- a/contrib/ipfilter/test/regress/ni7.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 2.2.2.2/32 -> 6.6.6.6 diff --git a/contrib/ipfilter/test/regress/ni8.ipf b/contrib/ipfilter/test/regress/ni8.ipf deleted file mode 100644 index 6666241..0000000 --- a/contrib/ipfilter/test/regress/ni8.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in quick proto tcp from any to any flags S/SAFR keep state diff --git a/contrib/ipfilter/test/regress/ni8.nat b/contrib/ipfilter/test/regress/ni8.nat deleted file mode 100644 index 1d0018c..0000000 --- a/contrib/ipfilter/test/regress/ni8.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/ni9.ipf b/contrib/ipfilter/test/regress/ni9.ipf deleted file mode 100644 index 6666241..0000000 --- a/contrib/ipfilter/test/regress/ni9.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in quick proto tcp from any to any flags S/SAFR keep state diff --git a/contrib/ipfilter/test/regress/ni9.nat b/contrib/ipfilter/test/regress/ni9.nat deleted file mode 100644 index 8c36bc8..0000000 --- a/contrib/ipfilter/test/regress/ni9.nat +++ /dev/null @@ -1 +0,0 @@ -rdr df0 10.0.0.0/8 port 1000:2000 -> 1.1.1.1 port = 40000 tcp/udp diff --git a/contrib/ipfilter/test/regress/p1.ipf b/contrib/ipfilter/test/regress/p1.ipf deleted file mode 100644 index acaf639..0000000 --- a/contrib/ipfilter/test/regress/p1.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in from pool/100 to any diff --git a/contrib/ipfilter/test/regress/p1.pool b/contrib/ipfilter/test/regress/p1.pool deleted file mode 100644 index aa262a7..0000000 --- a/contrib/ipfilter/test/regress/p1.pool +++ /dev/null @@ -1,2 +0,0 @@ -table role = ipf type = tree number = 100 - { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; ef00::5/128; }; diff --git a/contrib/ipfilter/test/regress/p10.nat b/contrib/ipfilter/test/regress/p10.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p10.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p10.pool b/contrib/ipfilter/test/regress/p10.pool deleted file mode 100644 index 2be554a..0000000 --- a/contrib/ipfilter/test/regress/p10.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy hash;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p11.nat b/contrib/ipfilter/test/regress/p11.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p11.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p11.pool b/contrib/ipfilter/test/regress/p11.pool deleted file mode 100644 index a79d9ea..0000000 --- a/contrib/ipfilter/test/regress/p11.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy dst-hash;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p12.nat b/contrib/ipfilter/test/regress/p12.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p12.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p12.pool b/contrib/ipfilter/test/regress/p12.pool deleted file mode 100644 index c9afcda..0000000 --- a/contrib/ipfilter/test/regress/p12.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy src-hash;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p13.ipf b/contrib/ipfilter/test/regress/p13.ipf deleted file mode 100644 index acaf639..0000000 --- a/contrib/ipfilter/test/regress/p13.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in from pool/100 to any diff --git a/contrib/ipfilter/test/regress/p13.pool b/contrib/ipfilter/test/regress/p13.pool deleted file mode 100644 index de80f72..0000000 --- a/contrib/ipfilter/test/regress/p13.pool +++ /dev/null @@ -1,2 +0,0 @@ -table role = all type = tree number = 100 - { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; ef00::5/128; }; diff --git a/contrib/ipfilter/test/regress/p2.ipf b/contrib/ipfilter/test/regress/p2.ipf deleted file mode 100644 index 4cfb388..0000000 --- a/contrib/ipfilter/test/regress/p2.ipf +++ /dev/null @@ -1,2 +0,0 @@ -pass out from hash=(127.0.0.1,4.4.0.0/16) to any -block in from hash=(127.0.0.1,4.4.0.0/16) to any diff --git a/contrib/ipfilter/test/regress/p3.ipf b/contrib/ipfilter/test/regress/p3.ipf deleted file mode 100644 index a598d88..0000000 --- a/contrib/ipfilter/test/regress/p3.ipf +++ /dev/null @@ -1,6 +0,0 @@ -call now srcgrpmap/1010 in all -call now dstgrpmap/2010 out all -pass in all group 1020 -block in all group 1030 -pass out all group 2020 -block out all group 2040 diff --git a/contrib/ipfilter/test/regress/p3.pool b/contrib/ipfilter/test/regress/p3.pool deleted file mode 100644 index 3fadd59..0000000 --- a/contrib/ipfilter/test/regress/p3.pool +++ /dev/null @@ -1,4 +0,0 @@ -group-map in role = ipf number = 1010 - { 1.1.1.1/32, group = 1020; 3.3.0.0/16, group = 1030; }; -group-map out role = ipf number = 2010 group = 2020 - { 2.2.2.2/32; 4.4.0.0/16; 5.0.0.0/8, group = 2040; }; diff --git a/contrib/ipfilter/test/regress/p4.nat b/contrib/ipfilter/test/regress/p4.nat deleted file mode 100644 index d504ac9..0000000 --- a/contrib/ipfilter/test/regress/p4.nat +++ /dev/null @@ -1 +0,0 @@ -map * from pool/100 to any -> 1.2.3.4/32 diff --git a/contrib/ipfilter/test/regress/p4.pool b/contrib/ipfilter/test/regress/p4.pool deleted file mode 100644 index 6ed0e49..0000000 --- a/contrib/ipfilter/test/regress/p4.pool +++ /dev/null @@ -1,2 +0,0 @@ -table role = nat type = tree number = 100 - { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; }; diff --git a/contrib/ipfilter/test/regress/p5.ipf b/contrib/ipfilter/test/regress/p5.ipf deleted file mode 100644 index ada9f56..0000000 --- a/contrib/ipfilter/test/regress/p5.ipf +++ /dev/null @@ -1 +0,0 @@ -pass in from pool/letters to any diff --git a/contrib/ipfilter/test/regress/p5.pool b/contrib/ipfilter/test/regress/p5.pool deleted file mode 100644 index 9a8eaa3..0000000 --- a/contrib/ipfilter/test/regress/p5.pool +++ /dev/null @@ -1,2 +0,0 @@ -table role = ipf type = tree name = letters - { 1.1.1.1/32; !2.2.0.0/16; 2.2.2.0/24; }; diff --git a/contrib/ipfilter/test/regress/p6.ipf b/contrib/ipfilter/test/regress/p6.ipf deleted file mode 100644 index b9b8937..0000000 --- a/contrib/ipfilter/test/regress/p6.ipf +++ /dev/null @@ -1 +0,0 @@ -block in from pool/microsoft to any diff --git a/contrib/ipfilter/test/regress/p6.pool b/contrib/ipfilter/test/regress/p6.pool deleted file mode 100644 index 83e818c..0000000 --- a/contrib/ipfilter/test/regress/p6.pool +++ /dev/null @@ -1 +0,0 @@ -pool ipf/tree (name microsoft;) { whois file "regress/p6.whois"; }; diff --git a/contrib/ipfilter/test/regress/p6.whois b/contrib/ipfilter/test/regress/p6.whois deleted file mode 100644 index 284244e..0000000 --- a/contrib/ipfilter/test/regress/p6.whois +++ /dev/null @@ -1,241 +0,0 @@ -# This query resulted in more than 256 records. Remaining results -# have been truncated. For more specific results, go to -# http://ws.arin.net/whois for help in refining your query. -Microsoft Corp (MSFT) -Microsoft Corp., MSN Operations (MCMO) -MICROSOFT CORPORATION (MICRO-101) -MICROSOFT CORPORATION (MICRO-97) -MICROSOFT CORPORATION (MICRO-100) -Microsoft Corporation (MICRO-111) -MICROSOFT CORPORATION (MICRO-117) -Microsoft Corporation (ZM23-ARIN) noc@microsoft.com +1-425-882-8080 -Microsoft (ZM39-ARIN) noc@microsoft.com +1-425-882-8080 -Microsoft Corp (AS8068) MICROSOFT-CORP---MSN-AS-BLOCK 8068 - 8075 -Microsoft Corp (AS13811) MSLI 13811 -Microsoft Corp (AS14719) MICROSOFT-CORP-BCENTRAL 14719 -Microsoft Corp (AS3598) MICROSOFT-CORP-AS 3598 -Microsoft Corp (AS5761) MICROSOFT-CORP---MSN-AS---SATURN 5761 -Microsoft Corp (AS6182) MICROSOFT-CORP--MSN-AS-4 6182 -Microsoft Corp (AS6194) MICROSOFT-CORP--MSN-AS-3 6194 -Microsoft Corp (AS6291) MICROSOFT-CORP---MSN-AS 6291 -Microsoft Corp (AS13399) MICROSOFT-CORP---MSN-AS-2 13399 -Microsoft Corp (AS23468) MICROSOFT-CORP-XBOX-ONLINE 23468 -Microsoft Corp MICROSOFT (NET-131-107-0-0-1) 131.107.0.0 - 131.107.255.255 -Microsoft Corp MICROSOFT-VEXCEL (NET-192-92-90-0-1) 192.92.90.0 - 192.92.90.255 -Microsoft Corp NETBLK-MSOFT-NET (NET-198-105-232-0-1) 198.105.232.0 - 198.105.235.255 -Microsoft Corp MICROSOFT19-NET58 (NET-204-231-58-0-1) 204.231.58.0 - 204.231.58.255 -Microsoft Corp MICROSOFT15 (NET-204-140-77-0-1) 204.140.77.0 - 204.140.77.255 -Microsoft Corp MICROSOFT16 (NET-204-140-80-0-1) 204.140.80.0 - 204.140.83.255 -Microsoft Corp MICROSOFT-CORP-MSN-1 (NET-199-60-28-0-1) 199.60.28.0 - 199.60.28.255 -Microsoft Corp MICROSOFT-1 (NET-199-103-90-0-1) 199.103.90.0 - 199.103.91.255 -Microsoft Corp MICROSOFT-CORP-MSN-3 (NET-199-103-122-0-1) 199.103.122.0 - 199.103.122.255 -Microsoft Corp MICROSOFT8 (NET-204-79-101-0-1) 204.79.101.0 - 204.79.101.255 -Microsoft Corp MICROSOFT18 (NET-192-237-67-0-1) 192.237.67.0 - 192.237.67.255 -Microsoft Corp MICROSOFT19 (NET-198-137-97-0-1) 198.137.97.0 - 198.137.97.255 -Microsoft Corp MICROSOFT-HK (NET-204-79-135-0-1) 204.79.135.0 - 204.79.135.255 -Microsoft Corp MICROSOFT-PLACEWARE-1 (NET-204-79-179-0-1) 204.79.179.0 - 204.79.179.255 -Microsoft Corp MICROSOFT11 (NET-204-79-180-0-1) 204.79.180.0 - 204.79.181.255 -Microsoft Corp MICROSOFT-PLACEWARE-2 (NET-204-79-188-0-1) 204.79.188.0 - 204.79.188.255 -Microsoft Corp MICROSOFT13 (NET-204-79-195-0-1) 204.79.195.0 - 204.79.197.255 -Microsoft Corp MICROSOFT17 (NET-199-6-92-0-1) 199.6.92.0 - 199.6.94.255 -Microsoft Corp MICROSOFT-2 (NET-204-79-7-0-1) 204.79.7.0 - 204.79.7.255 -Microsoft Corp MICROSOFT-NET1 (NET-204-79-27-0-1) 204.79.27.0 - 204.79.27.255 -Microsoft Corp MICROSOFT2 (NET-198-180-74-0-1) 198.180.74.0 - 198.180.75.255 -Microsoft Corp MICROSOFT3 (NET-198-180-95-0-1) 198.180.95.0 - 198.180.97.255 -Microsoft Corp MICROSOFT28 (NET-204-231-236-0-1) 204.231.236.0 - 204.231.236.255 -Microsoft Corp MICROSOFT29 (NET-205-248-10-0-1) 205.248.10.0 - 205.248.15.255 -Microsoft Corp SPRINT-CDA33F (NET-205-163-63-0-1) 205.163.63.0 - 205.163.63.255 -Microsoft Corp SPRINT-CDA33E (NET-205-163-62-0-1) 205.163.62.0 - 205.163.62.255 -Microsoft Corp SPRINT-CDA39F (NET-205-163-144-0-1) 205.163.144.0 - 205.163.159.255 -Microsoft Corp MICROSOFT30 (NET-205-248-41-0-1) 205.248.41.0 - 205.248.43.255 -Microsoft Corp MICROSOFT31 (NET-205-248-50-0-1) 205.248.50.0 - 205.248.51.255 -Microsoft Corp MICROSOFT32 (NET-205-248-61-0-1) 205.248.61.0 - 205.248.63.255 -Microsoft Corp MICROSOFT34 (NET-205-248-72-0-1) 205.248.72.0 - 205.248.72.255 -Microsoft Corp MICROSOFT35 (NET-205-248-212-0-1) 205.248.212.0 - 205.248.215.255 -Microsoft Corp MICROSOFT36 (NET-205-248-228-0-1) 205.248.228.0 - 205.248.228.255 -Microsoft Corp MICROSOFT37 (NET-205-248-235-0-1) 205.248.235.0 - 205.248.235.255 -Microsoft Corp MICROSOFT20 (NET-204-231-76-0-1) 204.231.76.0 - 204.231.76.255 -Microsoft Corp MICROSOFT26 (NET-204-231-192-0-1) 204.231.192.0 - 204.231.192.255 -Microsoft Corp MICROSOFT27 (NET-204-231-194-0-1) 204.231.194.0 - 204.231.223.255 -Microsoft Corp SOCRATIC (NET-207-78-80-0-1) 207.78.80.0 - 207.78.80.255 -Microsoft Corp DAVELADD (NET-207-78-81-0-1) 207.78.81.0 - 207.78.81.255 -Microsoft Corp RSEGAL (NET-207-78-82-0-1) 207.78.82.0 - 207.78.82.255 -Microsoft Corp MICROSOFT44 (NET-205-248-243-0-1) 205.248.243.0 - 205.248.244.255 -Microsoft Corp MICROSOFT48 (NET-207-117-3-0-1) 207.117.3.0 - 207.117.3.255 -Microsoft Corp UU-207-18-117 (NET-207-18-117-0-1) 207.18.117.0 - 207.18.117.255 -Microsoft Corp CW-208-139-27-B (NET-208-139-27-0-1) 208.139.27.0 - 208.139.27.255 -Microsoft Corp MICROSOFT55 (NET-209-28-213-0-1) 209.28.213.0 - 209.28.213.255 -Microsoft Corp MICROSOFT50 (NET-207-209-68-0-1) 207.209.68.0 - 207.209.68.255 -Microsoft Corp SPRINT-CC5F6F (NET-204-95-96-0-1) 204.95.96.0 - 204.95.111.255 -Microsoft Corp CYBR-LCCLAB (NET-207-158-93-192-1) 207.158.93.192 - 207.158.93.223 -Microsoft Corp MSBPN-2 (NET-207-240-123-192-1) 207.240.123.192 - 207.240.123.223 -Microsoft Corp SPRINT-D01ACD (NET-208-26-205-0-1) 208.26.205.0 - 208.26.205.255 -Microsoft Corp MICROSOFT-CORP-MSN-2 (NET-192-197-157-0-1) 192.197.157.0 - 192.197.157.255 -Microsoft Corp MICROSOFTDENVER (NET-204-133-231-0-1) 204.133.231.0 - 204.133.231.255 -Microsoft Corp MICROSOFTG1-COM (NET-216-72-96-0-1) 216.72.96.0 - 216.72.99.255 -Microsoft Corp EACT-CUST-JLEZNEK (NET-207-229-166-152-1) 207.229.166.152 - 207.229.166.159 -Microsoft Corp SPRINT-CC5F95-8 (NET-204-95-149-0-1) 204.95.149.0 - 204.95.149.255 -Microsoft Corp NET-CSAMSI (NET-209-192-213-72-1) 209.192.213.72 - 209.192.213.79 -Microsoft Corp MICROSOFT57 (NET-206-73-203-0-1) 206.73.203.0 - 206.73.203.255 -Microsoft Corp MICROSOFT56 (NET-206-73-118-0-1) 206.73.118.0 - 206.73.118.255 -Microsoft Corp QWEST-208-45-54-16 (NET-208-45-54-16-1) 208.45.54.16 - 208.45.54.23 -Microsoft Corp QWEST-208-45-54-8 (NET-208-45-54-8-1) 208.45.54.8 - 208.45.54.15 -Microsoft Corp MICROSOFT58 (NET-206-73-31-0-1) 206.73.31.0 - 206.73.31.255 -Microsoft Corp SPRINT-3FA132 (NET-63-161-50-128-1) 63.161.50.128 - 63.161.50.255 -Microsoft Corp SPRINT-3FA132-6 (NET-63-161-50-0-1) 63.161.50.0 - 63.161.50.127 -Microsoft Corp MICROSOFT-8-18 (NET-207-240-8-224-1) 207.240.8.224 - 207.240.8.239 -Microsoft Corp MICROSOFT-BBLK (NET-157-54-0-0-1) 157.54.0.0 - 157.60.255.255 -Microsoft Corp QWEST-208-45-89-248A (NET-208-45-89-248-1) 208.45.89.248 - 208.45.89.255 -Microsoft Corp MICROSOFT61 (NET-206-182-69-0-1) 206.182.69.0 - 206.182.69.255 -Microsoft Corp MICROSOFT63 (NET-206-182-240-0-1) 206.182.240.0 - 206.182.240.255 -Microsoft Corp MICROSOFT64 (NET-206-182-241-0-1) 206.182.241.0 - 206.182.241.255 -Microsoft Corp MICROSOFT59 (NET-206-73-67-0-1) 206.73.67.0 - 206.73.67.255 -Microsoft Corp MICROSOFT66 (NET-206-182-251-0-1) 206.182.251.0 - 206.182.251.255 -Microsoft Corp MICROSOFT65 (NET-206-182-247-0-1) 206.182.247.0 - 206.182.247.255 -Microsoft Corp MICROSOFT62 (NET-206-182-236-0-1) 206.182.236.0 - 206.182.236.255 -Microsoft Corp QWEST-63-236-198-64 (NET-63-236-198-64-1) 63.236.198.64 - 63.236.198.71 -Microsoft Corp QWEST-63-236-198-152 (NET-63-236-198-152-1) 63.236.198.152 - 63.236.198.159 -Microsoft Corp ERMS-6799349 (NET-165-121-253-232-1) 165.121.253.232 - 165.121.253.239 -Microsoft Corp QWEST-63-236-170-64 (NET-63-236-170-64-1) 63.236.170.64 - 63.236.170.71 -Microsoft Corp QWEST-63-236-186-64 (NET-63-236-186-64-1) 63.236.186.64 - 63.236.186.71 -Microsoft Corp QWEST-63-236-187-104 (NET-63-236-187-104-1) 63.236.187.104 - 63.236.187.111 -Microsoft Corp QWEST-63-236-187-128 (NET-63-236-187-128-1) 63.236.187.128 - 63.236.187.135 -Microsoft Corp QWEST-63-236-187-160 (NET-63-236-187-160-1) 63.236.187.160 - 63.236.187.167 -Microsoft Corp FON-3338832128690 (NET-199-2-137-0-1) 199.2.137.0 - 199.2.137.255 -Microsoft Corp CUST-86-24614 (NET-216-222-104-224-1) 216.222.104.224 - 216.222.104.239 -Microsoft Corp QWEST-63-151-87-64 (NET-63-151-87-64-1) 63.151.87.64 - 63.151.87.71 -Microsoft Corp HP-64-77-82-96 (NET-64-77-82-96-1) 64.77.82.96 - 64.77.82.103 -Microsoft Corp HP-64-77-93-80 (NET-64-77-93-80-1) 64.77.93.80 - 64.77.93.95 -Microsoft Corp MICROSOFT-1BLK (NET-65-52-0-0-1) 65.52.0.0 - 65.55.255.255 -Microsoft Corp MICROSOFT-GLOBAL-NET (NET-207-46-0-0-1) 207.46.0.0 - 207.46.255.255 -Microsoft Corp MICROSOFT-CORP-MSN-BLK (NET-207-68-128-0-1) 207.68.128.0 - 207.68.207.255 -Microsoft Corp FON-343451648081865 (NET-204-182-144-0-1) 204.182.144.0 - 204.182.159.255 -Microsoft Corp FON-346312755281299 (NET-206-107-34-0-1) 206.107.34.0 - 206.107.34.255 -Microsoft Corp FON-34550983681918 (NET-205-240-158-0-1) 205.240.158.0 - 205.240.159.255 -Microsoft Corp MICROSOFT-PLACEWARE-2 (NET-204-79-252-0-1) 204.79.252.0 - 204.79.252.255 -Microsoft Corp WLCO-TWC1057147-MICROSOFT (NET-64-200-211-16-1) 64.200.211.16 - 64.200.211.31 -Microsoft Corp MICROSOF81-163-0 (NET-12-178-163-0-1) 12.178.163.0 - 12.178.163.31 -Microsoft Corp WLCO-TWC1057147-MICROSOFT-1 (NET-69-44-126-80-1) 69.44.126.80 - 69.44.126.95 -Microsoft Corp SPRINTLINK (NET-63-173-42-128-1) 63.173.42.128 - 63.173.42.255 -Microsoft Corp MICROSOF33-108-0 (NET-12-28-108-0-1) 12.28.108.0 - 12.28.108.127 -Microsoft Corp SPRINTLINK (NET-65-170-29-0-1) 65.170.29.0 - 65.170.29.7 -Microsoft Corp Q0903-67-132-133-96 (NET-67-132-133-96-1) 67.132.133.96 - 67.132.133.103 -Microsoft Corp MICROSOFT-IPV6-BLK (NET6-2001-4898-1) 2001:4898:0000:0000:0000:0000:0000:0000 - 2001:4898:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF -Microsoft Corp LVLT-MSFT-8-6-176 (NET-8-6-176-0-1) 8.6.176.0 - 8.6.176.255 -Microsoft Corp MICROSOFT33 (NET-205-248-80-0-1) 205.248.80.0 - 205.248.129.255 -Microsoft Corp Q0523-63-148-123-240 (NET-63-148-123-240-1) 63.148.123.240 - 63.148.123.247 -Microsoft Corp SAVV-S233608-1 (NET-64-41-193-0-1) 64.41.193.0 - 64.41.193.255 -Microsoft Corp SAVV-S233053-1 (NET-64-85-70-32-1) 64.85.70.32 - 64.85.70.47 -Microsoft Corp SAVV-S233053-2 (NET-64-85-81-96-1) 64.85.81.96 - 64.85.81.103 -Microsoft Corp SAVV-S233053-3 (NET-64-85-81-104-1) 64.85.81.104 - 64.85.81.111 -Microsoft Corp SAVV-S233053-7 (NET-216-32-168-224-1) 216.32.168.224 - 216.32.168.255 -Microsoft Corp SAVV-S233053-6 (NET-206-79-74-32-1) 206.79.74.32 - 206.79.74.47 -Microsoft Corp SAVV-S233053-8 (NET-216-32-175-224-1) 216.32.175.224 - 216.32.175.255 -Microsoft Corp SAVV-S233053-9 (NET-216-32-180-0-1) 216.32.180.0 - 216.32.183.255 -Microsoft Corp SAVV-S233053-11 (NET-216-33-229-224-1) 216.33.229.224 - 216.33.229.255 -Microsoft Corp SAVV-S233053-12 (NET-216-33-236-0-1) 216.33.236.0 - 216.33.239.255 -Microsoft Corp SAVV-S233053-13 (NET-216-33-240-0-1) 216.33.240.0 - 216.33.243.255 -Microsoft Corp SAVV-S233053-10 (NET-216-32-240-0-1) 216.32.240.0 - 216.32.243.255 -Microsoft Corp SAVV-S233608-3 (NET-216-34-51-0-1) 216.34.51.0 - 216.34.51.255 -Microsoft Corp SAVV-S233053-4 (NET-209-1-112-0-1) 209.1.112.0 - 209.1.112.255 -Microsoft Corp SAVV-S233053-5 (NET-209-1-113-0-1) 209.1.113.0 - 209.1.113.255 -Microsoft Corp SAVV-S233608-2 (NET-209-1-15-0-1) 209.1.15.0 - 209.1.15.255 -Microsoft Corp SAVV-S233608-4 (NET-216-34-53-176-1) 216.34.53.176 - 216.34.53.191 -Microsoft Corp SAVV-S233608-5 (NET-216-35-8-224-1) 216.35.8.224 - 216.35.8.239 -Microsoft Corp SAVV-S233053-14 (NET-209-185-128-0-1) 209.185.128.0 - 209.185.131.255 -Microsoft Corp Q0112-65-114-175-128 (NET-65-114-175-128-1) 65.114.175.128 - 65.114.175.159 -Microsoft Corp SAVV-S233053-15 (NET-64-15-229-96-1) 64.15.229.96 - 64.15.229.127 -Microsoft Corp SAVV-S233050-5 (NET-64-15-177-0-1) 64.15.177.0 - 64.15.177.255 -Microsoft Corp SAVV-S233050-4 (NET-64-15-170-192-1) 64.15.170.192 - 64.15.170.199 -Microsoft Corp SAVV-S233050-2 (NET-209-143-238-0-1) 209.143.238.0 - 209.143.238.255 -Microsoft Corp SAVV-S233050-6 (NET-64-15-178-0-1) 64.15.178.0 - 64.15.178.255 -Microsoft Corp SAVV-S232995-2 (NET-66-35-209-120-1) 66.35.209.120 - 66.35.209.127 -Microsoft Corp SAVV-S232995-3 (NET-66-35-211-128-1) 66.35.211.128 - 66.35.211.191 -Microsoft Corp SAVV-S232995-1 (NET-66-35-208-48-1) 66.35.208.48 - 66.35.208.63 -Microsoft Corp SAVV-S233053-16 (NET-216-33-148-0-1) 216.33.148.0 - 216.33.151.255 -Microsoft Corp., MSN Operations SAVV-S233052-4 (NET-216-35-66-88-1) 216.35.66.88 - 216.35.66.95 -MICROSOFT CORPORATION MICROSOF32-32-160 (NET-12-230-32-160-1) 12.230.32.160 - 12.230.32.167 -MICROSOFT CORPORATION MICROSOF43-124-0 (NET-12-53-124-0-1) 12.53.124.0 - 12.53.124.31 -MICROSOFT CORPORATION MICROSOF82-18-96 (NET-12-232-18-96-1) 12.232.18.96 - 12.232.18.127 -MICROSOFT CORPORATION MICROSOF25-158 (NET-12-190-158-0-1) 12.190.158.0 - 12.190.158.255 -MICROSOFT CORPORATION MICROSOF61-196-32 (NET-12-71-196-32-1) 12.71.196.32 - 12.71.196.47 -Microsoft Corporation MICROSOFT-ONLINE-SERVICES (NET-209-240-192-0-1) 209.240.192.0 - 209.240.223.255 -Microsoft Corporation MICROSOFT-DYNAMIC-HOSTING (NET-70-37-0-0-1) 70.37.0.0 - 70.37.191.255 -Microsoft Corporation MS-ONLINE-SERVICES-NJ (NET-70-37-128-0-1) 70.37.128.0 - 70.37.129.255 -Microsoft Corporation MS-GLOBAL-ONLINE-SERVICES (NET-70-37-135-0-1) 70.37.135.0 - 70.37.135.255 -MICROSOFT CORPORATION MICROSOF82-87-192 (NET-12-49-87-192-1) 12.49.87.192 - 12.49.87.255 -Microsoft MICROSOFT (NET-74-93-205-144-1) 74.93.205.144 - 74.93.205.151 -Microsoft MICROSOFT (NET-74-93-205-152-1) 74.93.205.152 - 74.93.205.159 -Microsoft MICROSOFT (NET-74-93-206-64-1) 74.93.206.64 - 74.93.206.71 -Microsoft MICROSOFT (NET-70-89-139-120-1) 70.89.139.120 - 70.89.139.127 -Microsoft DIRECP-NET1-206-71-11 (NET-206-71-119-0-1) 206.71.119.0 - 206.71.119.255 -Microsoft DIRECP-NET1-117 (NET-206-71-117-0-1) 206.71.117.0 - 206.71.117.255 -Microsoft DIRECP-NET1-118 (NET-206-71-118-0-1) 206.71.118.0 - 206.71.118.255 -Microsoft UUHIL-BLK1-C155-112 (NET-209-154-155-112-1) 209.154.155.112 - 209.154.155.119 -Microsoft SBCIS-101411-164355 (NET-65-68-62-152-1) 65.68.62.152 - 65.68.62.159 -MICROSOFT SBC067039208168020503 (NET-67-39-208-168-1) 67.39.208.168 - 67.39.208.175 -Microsoft UU-65-242-67 (NET-65-242-67-0-1) 65.242.67.0 - 65.242.67.255 -Microsoft CW-204-71-191-0 (NET-204-71-191-0-1) 204.71.191.0 - 204.71.191.255 -Microsoft SBC063194155144021023 (NET-63-194-155-144-1) 63.194.155.144 - 63.194.155.151 -Microsoft SBC066136085192030113 (NET-66-136-85-192-1) 66.136.85.192 - 66.136.85.199 -MICROSOFT MFN-T280-64-124-184-72-29 (NET-64-124-184-72-1) 64.124.184.72 - 64.124.184.79 -MICROSOFT MFN-T133-216-200-206-0-24 (NET-216-200-206-0-1) 216.200.206.0 - 216.200.206.255 -Microsoft UU-63-80-93-D4 (NET-63-80-93-0-1) 63.80.93.0 - 63.80.93.127 -Microsoft RSPC-1218167167199384 (NET-67-192-225-208-1) 67.192.225.208 - 67.192.225.223 -Microsoft CVNET-454AA20 (NET-69-74-162-0-1) 69.74.162.0 - 69.74.162.255 -Microsoft UU-65-221-5 (NET-65-221-5-0-1) 65.221.5.0 - 65.221.5.255 -Microsoft - Partner Campaign Builder (PCB) MICROSOFT-PARTNER-CAMPAIGN-BUILDER-PCB (NET-216-182-89-192-1) 216.182.89.192 - 216.182.89.207 -Microsoft - Partner Campaign Builder (PCB) MICROSOFT-PARTNER-CAMPAIGN-BUILDER-PCB (NET-216-182-89-48-1) 216.182.89.48 - 216.182.89.63 -MICROSOFT AUSTIN-STO UU-65-248-85-D4 (NET-65-248-85-0-1) 65.248.85.0 - 65.248.85.255 -Microsoft Canada MIC0923-CA (NET-199-243-157-192-1) 199.243.157.192 - 199.243.157.223 -Microsoft Canada MIC0702-CA (NET-199-243-157-112-1) 199.243.157.112 - 199.243.157.119 -Microsoft Corp UU-65-194-210-224 (NET-65-194-210-224-1) 65.194.210.224 - 65.194.210.255 -Microsoft Corp UU-208-194-139 (NET-208-194-139-0-1) 208.194.139.0 - 208.194.139.255 -Microsoft Corp UU-208-204-49-128-B (NET-208-204-49-128-1) 208.204.49.128 - 208.204.49.255 -Microsoft Corp UU-208-205-26 (NET-208-205-26-0-1) 208.205.26.0 - 208.205.26.255 -Microsoft Corp UU-208-217-184-D1 (NET-208-217-184-0-1) 208.217.184.0 - 208.217.187.255 -Microsoft Corp UU-208-222-172 (NET-208-222-172-0-1) 208.222.172.0 - 208.222.172.255 -Microsoft Corp UU-208-224-200-64 (NET-208-224-200-64-1) 208.224.200.64 - 208.224.200.95 -Microsoft Corp UU-208-229-100-D1 (NET-208-229-100-0-1) 208.229.100.0 - 208.229.101.255 -Microsoft Corp UU-208-241-19 (NET-208-241-19-0-1) 208.241.19.0 - 208.241.19.15 -Microsoft Corp UU-208-241-19-16 (NET-208-241-19-16-1) 208.241.19.16 - 208.241.19.31 -Microsoft Corp UU-208-241-9-224 (NET-208-241-9-224-1) 208.241.9.224 - 208.241.9.239 -Microsoft Corp UU-208-244-108-D2 (NET-208-244-108-0-1) 208.244.108.0 - 208.244.108.15 -Microsoft Corp UU-208-245-16 (NET-208-245-16-0-1) 208.245.16.0 - 208.245.16.31 -Microsoft Corp UU-208-249-17-160 (NET-208-249-17-160-1) 208.249.17.160 - 208.249.17.175 -Microsoft Corp UU-63-104-216-D2 (NET-63-104-216-0-1) 63.104.216.0 - 63.104.216.127 -Microsoft Corp UU-63-69-245 (NET-63-69-245-0-1) 63.69.245.0 - 63.69.245.255 -Microsoft Corp SBC068090141072031030 (NET-68-90-141-72-1) 68.90.141.72 - 68.90.141.79 -Microsoft Corp 10825385 SBC06319812316029040317151513 (NET-63-198-123-160-1) 63.198.123.160 - 63.198.123.167 -MICROSOFT CORP-040821020257 SBC06824804806429040821020303 (NET-68-248-48-64-1) 68.248.48.64 - 68.248.48.71 -MICROSOFT CORP-040821020338 SBC06824804807229040821020347 (NET-68-248-48-72-1) 68.248.48.72 - 68.248.48.79 -MICROSOFT CORP-081024181821 SBC-99-49-8-248-29-0810241850 (NET-99-49-8-248-1) 99.49.8.248 - 99.49.8.255 -Microsoft Corp. HUGE-65-38-172-72-29 (NET-65-38-172-72-1) 65.38.172.72 - 65.38.172.79 -Microsoft Corp. HUGE-65-38-172-96-28 (NET-65-38-172-96-1) 65.38.172.96 - 65.38.172.111 -Microsoft Corporation MICROSOFT-CORPORATION (NET-75-149-174-16-1) 75.149.174.16 - 75.149.174.23 -Microsoft Corporation MICROSOFT-CORPORATION (NET-75-151-100-240-1) 75.151.100.240 - 75.151.100.255 -Microsoft Corporation SPEK-647057-0 (NET-64-81-8-96-1) 64.81.8.96 - 64.81.8.127 -Microsoft Corporation SBC067112255144030130 (NET-67-112-255-144-1) 67.112.255.144 - 67.112.255.151 -Microsoft Corporation ATTENS-010075-004522 (NET-63-240-201-176-1) 63.240.201.176 - 63.240.201.191 -Microsoft Corporation ATTENS-010075-004523 (NET-206-16-209-208-1) 206.16.209.208 - 206.16.209.223 -Microsoft Corporation ATTENS-010075-004525 (NET-63-240-195-208-1) 63.240.195.208 - 63.240.195.223 -Microsoft Corporation ATTENS-010075-004526 (NET-206-16-204-64-1) 206.16.204.64 - 206.16.204.79 -Microsoft Corporation ATTENS-010075-004450 (NET-206-16-223-0-1) 206.16.223.0 - 206.16.223.255 -Microsoft Corporation ATTENS-010075-005028 (NET-63-240-216-0-1) 63.240.216.0 - 63.240.219.255 -Microsoft Corporation ATTENS-010075-005057 (NET-63-240-220-0-1) 63.240.220.0 - 63.240.223.255 -Microsoft Corporation ATTENS-010075-005135 (NET-206-16-246-24-1) 206.16.246.24 - 206.16.246.31 -Microsoft Corporation ATTENS-010075-004524 (NET-63-240-195-192-1) 63.240.195.192 - 63.240.195.207 -Microsoft Corporation ATTENS-010075-005880 (NET-206-16-224-160-1) 206.16.224.160 - 206.16.224.191 -Microsoft Corporation (managed segment) RSPC-1229444888833780 (NET-98-129-187-144-1) 98.129.187.144 - 98.129.187.151 -Microsoft Corporation - Secure Dimensions ( RSPC-33955-12072007 (NET-67-192-39-48-1) 67.192.39.48 - 67.192.39.63 -Microsoft Corporation - Whale RSPC-108457-1170047010 (NET-72-32-240-160-1) 72.32.240.160 - 72.32.240.175 -Microsoft Corporation - Whale RSPC-108456-1173386392 (NET-72-32-201-152-1) 72.32.201.152 - 72.32.201.159 -MICROSOFT CROP SBC067039081152020503 (NET-67-39-81-152-1) 67.39.81.152 - 67.39.81.159 -Microsoft Education Programs RSPC-48725-1096578571 (NET-69-20-127-32-1) 69.20.127.32 - 69.20.127.39 -Microsoft License PNAP-SFJ-MSLI-RM-01 (NET-216-52-28-0-1) 216.52.28.0 - 216.52.28.255 -Microsoft License INAP-PHX003-MSLICENSE-25271 (NET-70-42-230-0-1) 70.42.230.0 - 70.42.231.255 -Microsoft License INAP-SFJ-MSLICENSE-13982 (NET-63-251-97-0-1) 63.251.97.0 - 63.251.97.255 -Microsoft Licensing SBC067120132128020815 (NET-67-120-132-128-1) 67.120.132.128 - 67.120.132.135 -Microsoft Licensing SBC067120132152020815 (NET-67-120-132-152-1) 67.120.132.152 - 67.120.132.159 -Microsoft Licensing SBC067120132192020816 (NET-67-120-132-192-1) 67.120.132.192 - 67.120.132.207 -Microsoft Licensing SBC0671201322080208 diff --git a/contrib/ipfilter/test/regress/p7.nat b/contrib/ipfilter/test/regress/p7.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p7.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p7.pool b/contrib/ipfilter/test/regress/p7.pool deleted file mode 100644 index 451b374d..0000000 --- a/contrib/ipfilter/test/regress/p7.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy weighted connection;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/regress/p9.nat b/contrib/ipfilter/test/regress/p9.nat deleted file mode 100644 index 3c3fa7c..0000000 --- a/contrib/ipfilter/test/regress/p9.nat +++ /dev/null @@ -1 +0,0 @@ -rewrite in on bge0 proto tcp from any to any port = 80 -> src 0/0 dst dstlist/servers; diff --git a/contrib/ipfilter/test/regress/p9.pool b/contrib/ipfilter/test/regress/p9.pool deleted file mode 100644 index c452ffc..0000000 --- a/contrib/ipfilter/test/regress/p9.pool +++ /dev/null @@ -1,2 +0,0 @@ -pool nat/dstlist (name servers; policy round-robin;) - { 1.1.1.2; 1.1.1.4; 1.1.1.5; 1.1.1.9; }; diff --git a/contrib/ipfilter/test/test.format b/contrib/ipfilter/test/test.format deleted file mode 100644 index 64f7d9b..0000000 --- a/contrib/ipfilter/test/test.format +++ /dev/null @@ -1,148 +0,0 @@ -#test input-format output-format options -bpf-f1 text text -bpf1 text text -f1 text text -f2 text text -f3 text text -f4 text text -f5 text text -f6 text text -f7 text text -f8 text text -f9 text text -f10 text text -f11 text text -D -f12 hex hex -f13 hex hex -f14 text text -f15 text text -f16 text text -f17 hex hex -f18 text text -D -f19 text text state_max=3 -f20 text text -f21 hex text -f22 hex text -i1 text ipf -i2 text ipf -i3 text ipf -i4 text ipf -i5 text ipf -i6 text ipf -i7 text ipf -i8 text ipf -i9 text ipf -i10 text ipf -i11 text ipf -i12 text ipf -i13 text ipf -i14 text ipf -i15 text ipf -i16 text ipf -i17 text ipftest -i18 text ipf -i19 text ipf -i20 text ipf -i21 text ipf -i22 text ipf -i23 text ipf -in1 text text -in2 text text -in3 text text -in4 text text -in5 text text -in6 text text -in7 text text -in8 text text -in100 text text -in101 text text -in102 text text -ip1 text text -ip2 text text -ip3 text text -ipv6.1 hex hex -ipv6.2 hex hex -ipv6.3 hex hex -ipv6.4 hex hex -ipv6.5 hex hex -l1 hex hex -n1 text text -n2 text text -n3 text text -n4 text text -n5 text text -n6 text text -n7 text text -n8 hex hex update_ipid=0 -n9 hex hex update_ipid=0 -n10 hex hex update_ipid=0 -n11 text text -n12 hex hex update_ipid=0 -v -n15 text text update_ipid=0 -n100 text text -n101 text text -n102 text text -n103 text text -n104 hex hex update_ipid=0 -n105 hex hex update_ipid=0 -n106 hex hex update_ipid=0 -n200 hex hex update_ipid=0 -ni1 hex hex update_ipid=1 -ni2 hex hex update_ipid=1 -ni3 hex hex update_ipid=1 -ni4 hex hex update_ipid=1 -ni5 hex hex update_ipid=1 -ni6 hex text update_ipid=1 -D -ni7 hex hex update_ipid=1 -ni8 hex hex update_ipid=1 -ni9 hex hex update_ipid=1 -ni10 hex hex update_ipid=1 -ni11 hex hex update_ipid=1 -ni12 hex hex update_ipid=1 -ni13 hex hex update_ipid=1 -ni14 hex hex update_ipid=1 -ni15 hex hex update_ipid=1 -ni16 hex hex update_ipid=1 -ni17 text text -ni18 text text -ni19 hex hex update_ipid=0 -ni20 hex hex update_ipid=0 -D -ni21 text text -ni23 text text -D -p1 text text -p2 text text -p3 text text -p4 text text -p5 text text -p6 text text -p7 text text -p9 text text -p10 text text -p11 text text -p12 text text -p13 text text -n16 hex hex -D -n17 hex hex -D -f24 hex text -ipv6.6 hex text -f25 hex text -D -f26 text text -f27 hex text -n1_6 text text -6 -n2_6 text text -6 -n4_6 text text -6 -n5_6 text text -6 -n6_6 text text -6 -n7_6 text text -6 -n8_6 hex hex -6D -n9_6 hex hex -6D -n11_6 text text -6 -n12_6 hex hex -D6 -n15_6 text text -6 -n17_6 hex hex -6 -n13 text text -n14 text text -n18 text text -D -f28 text text -f29 text text -f30 text text diff --git a/contrib/ipfilter/test/vfycksum.pl b/contrib/ipfilter/test/vfycksum.pl deleted file mode 100755 index 0272e4b..0000000 --- a/contrib/ipfilter/test/vfycksum.pl +++ /dev/null @@ -1,424 +0,0 @@ - -# -# validate the IPv4 header checksum. -# $bytes[] is an array of 16bit values, with $cnt elements in the array. -# -sub dump { - print "\n"; - for ($i = 0; $i < $#bytes; $i++) { - printf "%04x ", $bytes[$i]; - } - print "\n"; -} - -sub dosum { - local($seed) = $_[0]; - local($start) = $_[1]; - local($max) = $_[2]; - local($idx) = $start; - local($lsum) = $seed; - - for ($idx = $start, $lsum = $seed; $idx < $max; $idx++) { -#printf "%#x += %#x\n", $lsum, $bytes[$idx]; - $lsum += $bytes[$idx]; - } - while ($lsum > 0xffff) { - $lsum = ($lsum & 0xffff) + ($lsum >> 16); - } - $lsum = ~$lsum & 0xffff; - return $lsum; -} - - -sub ipv4addrsum { - local($b) = $_[0]; - local($as) = 0; - - $as += $bytes[$b + 6]; # source address - $as += $bytes[$b + 7]; - $as += $bytes[$b + 8]; # destination address - $as += $bytes[$b + 9]; - return ($as); -} - -sub ipv6addrsum { - local($b) = $_[0]; - local($as) = 0; - - $as += $bytes[$b + 4]; # source address - $as += $bytes[$b + 5]; - $as += $bytes[$b + 6]; - $as += $bytes[$b + 7]; - $as += $bytes[$b + 8]; - $as += $bytes[$b + 9]; - $as += $bytes[$b + 10]; - $as += $bytes[$b + 11]; - $as += $bytes[$b + 12]; # destination address - $as += $bytes[$b + 13]; - $as += $bytes[$b + 14]; - $as += $bytes[$b + 15]; - $as += $bytes[$b + 16]; - $as += $bytes[$b + 17]; - $as += $bytes[$b + 18]; - $as += $bytes[$b + 19]; - return ($as); -} - -sub tcpcommon { - local($base) = $_[0]; - local($hl) = $_[1]; - local($hs) = $_[2]; - local($lenoffset) = $_[3]; - - local($thl) = $bytes[$base + $hl + 6]; - $thl &= 0xf0; - $thl >>= 2; - - local($x) = $bytes[$base + $lenoffset]; - local($y) = ($cnt - $base) * 2; - local($z) = 0; - - if ($bytes[$base + $lenoffset] > ($cnt - $base) * 2) { - print "[cnt=$cnt base=$base]"; - $x = $bytes[$base + $lenoffset]; - $y = ($cnt - $base) * 2; - $z = 1; - } elsif (($cnt - $base) * 2 < $hl + $hl) { - $x = ($cnt - $base) * 2; - $y = $hl + 20; - $z = 2; - } elsif (($cnt - $base) * 2 < $hl + $thl) { - $x = ($cnt - $base) * 2; - $y = $hl + $thl; - $z = 3; - } elsif ($len < $thl) { - $x = ($cnt - $base) * 2; - $y = $len; - $z = 4; - } elsif (($cnt - $base) * 2 < 20) { - $x = ($cnt - $base) * 2; - $y = $len; - $z = 5; - } - - if ($z) { - print " TCP: missing data($x $y $z) $hl"; -# &dump(); - return; - } - - local($tcpat) = $base + $hl; - $hs = &dosum($_[2], $tcpat, $cnt); - if ($hs != 0) { - local($osum) = $bytes[$tcpat + 8]; - $bytes[$base + $hl + 8] = 0; - local($hs2) = &dosum($_[2], $tcpat, $cnt); - $bytes[$tcpat + 8] = $osum; - printf " TCP: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " TCP: ok ($x $y)"; - } -} - -sub udpcommon { - local($base) = $_[0]; - local($hl) = $_[1]; - local($hs) = $_[2]; - - if ($bytes[$base + 1] > ($cnt - $base) * 2) { - print " UDP: missing data(1)"; - return; - } elsif ($bytes[$base + 1] < ($hl << 1) + 8) { - print " UDP: missing data(2)"; - return; - } elsif (($cnt - $base) * 2 < ($hl << 1) + 8) { - print " UDP: missing data(3)"; - return; - } - - local($udpat) = $base + $hl; - $hs = &dosum($udpsum, $udpat, $cnt); - local($osum) = $bytes[$udpat + 3]; - - # - # It is valid for UDP packets to have a 0 checksum field. - # If it is 0, then display what it would otherwise be. - # - if ($osum == 0) { - printf " UDP: => %x", $hs; - } elsif ($hs != 0) { - $bytes[$udpat + 3] = 0; - local($hs2) = &dosum($udpsum, $udpat, $cnt); - $bytes[$udpat + 3] = $osum; - printf " UDP: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " UDP: ok"; - } -} - -sub ipv6check { - local($base) = $_[0]; - $hl = $bytes[$base] / 256; - return if (($hl >> 4) != 6); # IPv4 ? - $hl = 40; - - print " IPv6($base): ok "; - - if (($bytes[$base + 3] >> 8) == 6) { - &tcpcheck6($base); - } elsif (($bytes[$base + 3] >> 8) == 58) { - &icmpcheck6($base); - } - print "\n"; -} - -sub tcpcheck6 { - local($base) = $_[0]; - local($hl) = $bytes[$base] / 256; - return if (($hl >> 4) != 6); - $hl = 20; - - local($hs) = 6; # TCP - local($len) = $bytes[$base + 2]; - $hs += $len; - $hs += &ipv6addrsum($base); - - &tcpcommon($base, $hl, $hs, 2); -} - -sub icmpcheck6 { - local($base) = $_[0]; - local($hl) = 20; - - local($hs) = 58; # ICMP6 - local($len) = $bytes[$base + 2]; - $hs += $len; - $hs += &ipv6addrsum($base); - - local($len) = $bytes[$base + 1] - ($hl << 1); - - if ($bytes[$base + 2] > ($cnt - $base) * 2) { - print " ICMPv6: missing data(1)"; - return; - } elsif ($bytes[$base + 2] < 8) { - print " ICMPv6: missing data(2)"; - return; - } - - local($osum) = $bytes[$base + $hl + 1]; - $bytes[$base + $hl + 1] = 0; - local($hs2) = &dosum($hs, $base + $hl, $cnt); - $bytes[$base + $hl + 1] = $osum; - - if ($osum != $hs2) { - printf " ICMPv6: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " ICMPv6: ok"; - } -# if ($base == 0) { -# $type = $bytes[$hl] >> 8; -# if ($type == 3 || $type == 4 || $type == 5 || -# $type == 11 || $type == 12) { -# &ipv4check($hl + 4); -# } -# } -} - -sub ipv4check { - local($base) = $_[0]; - $hl = $bytes[$base] / 256; - if (($hl >> 4) == 6) { - &ipv6check($_[0]); - } - return if (($hl >> 4) != 4); # IPv4 ? - $hl &= 0xf; - $hl <<= 1; # get the header length in 16bit words - - $hs = &dosum(0, $base, $base + $hl); - $osum = $bytes[$base + 5]; - - if ($hs != 0) { - $bytes[$base + 5] = 0; - $hs2 = &dosum(0, $base, $base + $hl); - $bytes[$base + 5] = $osum; - printf " IPv4: ($hl,%x) %x != %x", $hs, $osum, $hs2; - } else { - print " IPv4($base): ok "; - } - - # - # Recognise TCP & UDP and calculate checksums for each of these. - # - if (($bytes[$base + 4] & 0xff) == 4) { - &ipv4check($hl); - } - if (($bytes[$base + 4] & 0xff) == 6) { - &tcpcheck($base); - } - - if (($bytes[$base + 4] & 0xff) == 17) { - &udpcheck($base); - } - - if (($bytes[$base + 4] & 0xff) == 1) { - &icmpcheck($base); - } - if ($base == 0) { - print "\n"; - } -} - -sub tcpcheck { - local($base) = $_[0]; - local($hl) = $bytes[$base] / 256; - return if (($hl >> 4) != 4); - if ($bytes[$base + 3] & 0x3fff) { - print " TCP: fragment"; - return; - } - $hl &= 0xf; - $hl <<= 1; - - local($hs) = 6; # TCP - local($len) = $bytes[$base + 1] - ($hl << 1); - $hs += $len; - $hs += &ipv4addrsum($base); - - &tcpcommon($base, $hl, $hs, 1); -} - -sub udpcheck { - local($base) = $_[0]; - local($hl) = $bytes[0] / 256; - return if (($hl >> 4) != 4); - if ($bytes[$base + 3] & 0x3fff) { - print " UDP: fragment"; - return; - } - $hl &= 0xf; - $hl <<= 1; - - local($hs) = 17; # UDP - local($len) = $bytes[$base + 1] - ($hl << 1); - $hs += $len; - $hs += &ipv4addrsum($base); - local($udpsum) = $hs; - &udpcommon($base, $hl, $hs); -} - -sub icmpcheck { - local($base) = $_[0]; - local($hl) = $bytes[$base + 0] / 256; - return if (($hl >> 4) != 4); - return if ($bytes[3] & 0x1fff); - $hl &= 0xf; - $hl <<= 1; - - local($hs); - local($hs2); - - local($len) = $bytes[$base + 1] - ($hl << 1); - - if ($bytes[$base + 1] > ($cnt - $base) * 2) { - print " ICMP: missing data(1)"; - return; - } elsif ($bytes[$base + 1] < ($hl << 1) + 8) { - print " ICMP: missing data(2)"; - return; - } elsif (($cnt - $base) * 2 < ($hl << 1) + 8) { - print " ICMP: missing data(3)"; - return; - } - - local($osum) = $bytes[$base + $hl + 1]; - $bytes[$base + $hl + 1] = 0; - $hs2 = &dosum(0, $base + $hl, $cnt); - $bytes[$base + $hl + 1] = $osum; - - if ($osum != $hs2) { - printf " ICMP: (%x) %x != %x", $hs, $osum, $hs2; - } else { - print " ICMP: ok"; - } - if ($base == 0) { - $type = $bytes[$hl] >> 8; - if ($type == 3 || $type == 4 || $type == 5 || - $type == 11 || $type == 12) { - &ipv4check($hl + 4); - } - } -} - -while ($#ARGV >= 0) { - open(I, "$ARGV[0]") || die $!; - print "--- $ARGV[0] ---\n"; - $multi = 0; - while (<I>) { - chop; - s/#.*//g; - - # - # If the first non-comment, non-empty line of input starts - # with a '[', then allow the input to be a multi-line hex - # string, otherwise it has to be all on one line. - # - if (/^\[/) { - $multi=1; - s/^\[[^]]*\]//g; - - } - s/^ *//g; - if (length == 0) { - next if ($cnt == 0); - &ipv4check(0); - $cnt = 0; - $multi = 0; - next; - } - - # - # look for 16 bits, represented with leading 0's as required, - # in hex. - # - s/\t/ /g; - while (/^[0-9a-fA-F][0-9a-fA-F] [0-9a-fA-F][0-9a-fA-F] .*/) { - s/^([0-9a-fA-F][0-9a-fA-F]) ([0-9a-fA-F][0-9a-fA-F]) (.*)/$1$2 $3/; - } - while (/.* [0-9a-fA-F][0-9a-fA-F] [0-9a-fA-F][0-9a-fA-F] .*/) { -$b=$_; - s/(.*?) ([0-9a-fA-F][0-9a-fA-F]) ([0-9a-fA-F][0-9a-fA-F]) (.*)/$1 $2$3 $4/g; - } - if (/.* [0-9a-fA-F][0-9a-fA-F] [0-9a-fA-F][0-9a-fA-F]/) { -$b=$_; - s/(.*?) ([0-9a-fA-F][0-9a-fA-F]) ([0-9a-fA-F][0-9a-fA-F])/$1 $2$3/g; - } - while (/^[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F].*/) { - $x = $_; - $x =~ s/([0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]).*/$1/; - $x =~ s/ *//g; - $y = hex $x; - s/[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F] *(.*)/$1/; - $bytes[$cnt] = $y; -#print "bytes[$cnt] = $x\n"; - $cnt++; - } - - # - # Pick up stragler bytes. - # - if (/^[0-9a-fA-F][0-9a-fA-F]/) { - $y = hex $_; - $bytes[$cnt++] = $y * 256; - } - if ($multi == 0 && $cnt > 0) { - &ipv4check(0); - $cnt = 0; - } - } - - if ($cnt > 0) { - &ipv4check(0); - } - close(I); - shift(@ARGV); -} diff --git a/contrib/ipfilter/todo b/contrib/ipfilter/todo deleted file mode 100644 index 3f558d1..0000000 --- a/contrib/ipfilter/todo +++ /dev/null @@ -1,90 +0,0 @@ -BUGS: ------ -* fix "to <ifname>" bug on FreeBSD 2.2.8 -fastroute works - -=============================================================================== -GENERAL: --------- - -* support redirection like "rdr tun0 0/32 port 80 ..." - -* use fr_tcpstate() with NAT code for increased NAT usage security or even - fr_checkstate() - suspect this is not possible. - -* add another alias for <thishost> for interfaces <thisif>? as well as - all IP#'s associated with the box <myaddrs>? - -time permitting: - -* load balancing across interfaces - -* record buffering for TCP/UDP - -* document bimap - -* document NAT rule order processing - -* add more docs -in progress - -3.4: -XDDD. I agree. Bandwidth Shapping and QoS (Quality of Service, AKA -traffic priorization) should be *TOP* in the TO DO list. - -* Bandwidth limiting!!! -maybe for solaris, otherwise "ALTQ" -* More examples -* More documentation -* Load balancing features added to the NAT code, so that I can have -something coming in for 20.20.20.20:80 and it gets shuffled around between -internal addresses 10.10.10.1:8000 and 10.10.10.2:8000. or whatever. -- done, stage 1 (round robin/split) -The one thing that Cisco's PIX has on IPF that I can see is that -rewrites the sequence numbers with semi-random ones. -- done - -I would also love to see a more extensive NAT. It can choose to do -rdr and map based on saddr, daddr, sport and dport. (Does the kernel -module already have functionality for that and it just needs support in -the userland ipnat?) --done - - * intrusion detection - detection of port scans - detection of multiple connection attempts - - * support for multiple log files - i.e. all connections to ftp and telnet logged to - a seperate log file - - * multiple levels of log severity with E-mail notification - of intrusion alerts or other high priority errors - - * poison pill facility - after detection of a port scan, start sending back - large packets of garbage or other packets to - otherwise confuse the intruder (ping of death?) - -IPv6: ------ -* NAT is yet not available, either as a null proxy or address translation - -BSD: -* "to <if>" and "to <if>:<ip>" are not supported, but "fastroute" is. - -Solaris: -* "to <if>:<ip>" is not supported, but "fastroute" is and "to <if>" are. - -Tru64: ------- -* IPv6 checksum calculation for RST's and ICMP packets is not done (there - are routines in the Tru64 kernel to do this but what is the interface?) - -does bimap allow equal sized subnets? - -make return-icmp 'intelligent' if no type is given about what type to use? - -reply-to - enforce packets to pass through interfaces in particular -combinations - opposite to "to", set reverse path interface - |
