From e2e28d4361fc9bdb67694eedaf349bdc7ca088a3 Mon Sep 17 00:00:00 2001
From: darrenr <darrenr@FreeBSD.org>
Date: Mon, 4 Jun 2007 02:50:28 +0000
Subject: Import IPFilter 4.1.23 to vendor branch. See
 src/contrib/ipfilter/HISTORY for details of changes since 4.1.13

---
 contrib/ipfilter/lib/Makefile          |  68 ++++++------
 contrib/ipfilter/lib/addicmp.c         |   4 +-
 contrib/ipfilter/lib/addipopt.c        |   4 +-
 contrib/ipfilter/lib/alist_free.c      |  20 ++++
 contrib/ipfilter/lib/alist_new.c       |  64 ++++++++++++
 contrib/ipfilter/lib/bcopywrap.c       |   8 ++
 contrib/ipfilter/lib/binprint.c        |   4 +-
 contrib/ipfilter/lib/buildopts.c       |   4 +-
 contrib/ipfilter/lib/checkrev.c        |   4 +-
 contrib/ipfilter/lib/count4bits.c      |   4 +-
 contrib/ipfilter/lib/count6bits.c      |   4 +-
 contrib/ipfilter/lib/debug.c           |   4 +-
 contrib/ipfilter/lib/facpri.c          |   6 +-
 contrib/ipfilter/lib/facpri.h          |   4 +-
 contrib/ipfilter/lib/fill6bits.c       |   4 +-
 contrib/ipfilter/lib/flags.c           |   4 +-
 contrib/ipfilter/lib/gethost.c         |   8 ++
 contrib/ipfilter/lib/getifname.c       |  16 +++
 contrib/ipfilter/lib/getnattype.c      |  29 ++++--
 contrib/ipfilter/lib/getport.c         |   8 ++
 contrib/ipfilter/lib/getportproto.c    |   8 ++
 contrib/ipfilter/lib/getproto.c        |   8 ++
 contrib/ipfilter/lib/getsumd.c         |   8 ++
 contrib/ipfilter/lib/hostname.c        |   9 ++
 contrib/ipfilter/lib/icmpcode.c        |   4 +-
 contrib/ipfilter/lib/initparse.c       |   4 +-
 contrib/ipfilter/lib/ionames.c         |   4 +-
 contrib/ipfilter/lib/ipf_dotuning.c    |   8 ++
 contrib/ipfilter/lib/ipft_ef.c         |  23 +++--
 contrib/ipfilter/lib/ipft_hx.c         |   4 +-
 contrib/ipfilter/lib/ipft_pc.c         |   6 +-
 contrib/ipfilter/lib/ipft_sn.c         |   6 +-
 contrib/ipfilter/lib/ipft_td.c         |  10 +-
 contrib/ipfilter/lib/ipft_tx.c         |  17 ++-
 contrib/ipfilter/lib/ipoptsec.c        |   4 +-
 contrib/ipfilter/lib/kmem.c            |   4 +-
 contrib/ipfilter/lib/kmem.h            |   4 +-
 contrib/ipfilter/lib/kmemcpywrap.c     |   8 ++
 contrib/ipfilter/lib/kvatoname.c       |   8 ++
 contrib/ipfilter/lib/load_file.c       |  88 ++++++++++++++++
 contrib/ipfilter/lib/load_hash.c       |   8 +-
 contrib/ipfilter/lib/load_hashnode.c   |   4 +-
 contrib/ipfilter/lib/load_http.c       | 182 +++++++++++++++++++++++++++++++++
 contrib/ipfilter/lib/load_pool.c       |   4 +-
 contrib/ipfilter/lib/load_poolnode.c   |   6 +-
 contrib/ipfilter/lib/load_url.c        |  31 ++++++
 contrib/ipfilter/lib/mutex_emul.c      |   8 ++
 contrib/ipfilter/lib/nametokva.c       |   8 ++
 contrib/ipfilter/lib/nat_setgroupmap.c |   4 +-
 contrib/ipfilter/lib/ntomask.c         |   8 ++
 contrib/ipfilter/lib/optname.c         |   4 +-
 contrib/ipfilter/lib/optprint.c        |   4 +-
 contrib/ipfilter/lib/optprintv6.c      |   4 +-
 contrib/ipfilter/lib/optvalue.c        |   4 +-
 contrib/ipfilter/lib/portname.c        |   4 +-
 contrib/ipfilter/lib/print_toif.c      |   4 +-
 contrib/ipfilter/lib/printactivenat.c  |  16 +--
 contrib/ipfilter/lib/printaps.c        |   4 +-
 contrib/ipfilter/lib/printbuf.c        |   4 +-
 contrib/ipfilter/lib/printfr.c         |   9 +-
 contrib/ipfilter/lib/printfraginfo.c   |  13 +--
 contrib/ipfilter/lib/printhash.c       | 102 ++----------------
 contrib/ipfilter/lib/printhash_live.c  |  77 ++++++++++++++
 contrib/ipfilter/lib/printhashdata.c   | 112 ++++++++++++++++++++
 contrib/ipfilter/lib/printhashnode.c   |   3 +-
 contrib/ipfilter/lib/printhostmap.c    |  12 ++-
 contrib/ipfilter/lib/printhostmask.c   |   4 +-
 contrib/ipfilter/lib/printifname.c     |   4 +-
 contrib/ipfilter/lib/printip.c         |   4 +-
 contrib/ipfilter/lib/printlog.c        |   4 +-
 contrib/ipfilter/lib/printmask.c       |   4 +-
 contrib/ipfilter/lib/printnat.c        |  14 ++-
 contrib/ipfilter/lib/printpacket.c     |   5 +-
 contrib/ipfilter/lib/printpacket6.c    |   8 ++
 contrib/ipfilter/lib/printpool.c       |  56 +---------
 contrib/ipfilter/lib/printpool_live.c  |  78 ++++++++++++++
 contrib/ipfilter/lib/printpooldata.c   |  78 ++++++++++++++
 contrib/ipfilter/lib/printpoolnode.c   |   8 +-
 contrib/ipfilter/lib/printportcmp.c    |   4 +-
 contrib/ipfilter/lib/printproto.c      |   4 +-
 contrib/ipfilter/lib/printsbuf.c       |   8 ++
 contrib/ipfilter/lib/printstate.c      | 156 ++++++++++++++--------------
 contrib/ipfilter/lib/printtqtable.c    |  25 +++++
 contrib/ipfilter/lib/printtunable.c    |   8 ++
 contrib/ipfilter/lib/remove_hash.c     |   4 +-
 contrib/ipfilter/lib/remove_hashnode.c |   4 +-
 contrib/ipfilter/lib/remove_pool.c     |   4 +-
 contrib/ipfilter/lib/remove_poolnode.c |   4 +-
 contrib/ipfilter/lib/resetlexer.c      |   8 ++
 contrib/ipfilter/lib/rwlock_emul.c     |   8 ++
 contrib/ipfilter/lib/tcp_flags.c       |   4 +-
 contrib/ipfilter/lib/tcpflags.c        |   4 +-
 contrib/ipfilter/lib/tcpoptnames.c     |   4 +-
 contrib/ipfilter/lib/v6ionames.c       |   4 +-
 contrib/ipfilter/lib/v6optvalue.c      |   4 +-
 contrib/ipfilter/lib/var.c             |   8 ++
 contrib/ipfilter/lib/verbose.c         |   4 +-
 97 files changed, 1260 insertions(+), 421 deletions(-)
 create mode 100644 contrib/ipfilter/lib/alist_free.c
 create mode 100644 contrib/ipfilter/lib/alist_new.c
 create mode 100644 contrib/ipfilter/lib/load_file.c
 create mode 100644 contrib/ipfilter/lib/load_http.c
 create mode 100644 contrib/ipfilter/lib/load_url.c
 create mode 100644 contrib/ipfilter/lib/printhash_live.c
 create mode 100644 contrib/ipfilter/lib/printhashdata.c
 create mode 100644 contrib/ipfilter/lib/printpool_live.c
 create mode 100644 contrib/ipfilter/lib/printpooldata.c
 create mode 100644 contrib/ipfilter/lib/printtqtable.c

(limited to 'contrib/ipfilter/lib')

diff --git a/contrib/ipfilter/lib/Makefile b/contrib/ipfilter/lib/Makefile
index 3dcf3a1..b0d5052 100644
--- a/contrib/ipfilter/lib/Makefile
+++ b/contrib/ipfilter/lib/Makefile
@@ -1,7 +1,16 @@
+#
+# Copyright (C) 1993-2001 by Darren Reed.
+# 
+# See the IPFILTER.LICENCE file for details on licencing.  
+#   
+# $Id: Makefile,v 1.41.2.13 2007/05/10 06:02:19 darrenr Exp $ 
+#     
 INCDEP=$(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ipf.h
 
 LIBOBJS=$(DEST)/addicmp.o \
      $(DEST)/addipopt.o \
+     $(DEST)/alist_free.o \
+     $(DEST)/alist_new.o \
      $(DEST)/bcopywrap.o \
      $(DEST)/binprint.o \
      $(DEST)/buildopts.o \
@@ -9,23 +18,17 @@ LIBOBJS=$(DEST)/addicmp.o \
      $(DEST)/count6bits.o \
      $(DEST)/count4bits.o \
      $(DEST)/debug.o \
-     $(DEST)/extras.o \
      $(DEST)/facpri.o \
      $(DEST)/flags.o \
      $(DEST)/fill6bits.o \
-     $(DEST)/genmask.o \
      $(DEST)/gethost.o \
      $(DEST)/getifname.o \
-     $(DEST)/getline.o \
      $(DEST)/getnattype.o \
      $(DEST)/getport.o \
      $(DEST)/getportproto.o \
      $(DEST)/getproto.o \
      $(DEST)/getsumd.o \
-     $(DEST)/hexdump.o \
-     $(DEST)/hostmask.o \
      $(DEST)/hostname.o \
-     $(DEST)/hostnum.o \
      $(DEST)/icmpcode.o \
      $(DEST)/inet_addr.o \
      $(DEST)/initparse.o \
@@ -41,11 +44,13 @@ LIBOBJS=$(DEST)/addicmp.o \
      $(DEST)/kmem.o \
      $(DEST)/kmemcpywrap.o \
      $(DEST)/kvatoname.o \
+     $(DEST)/load_file.o \
      $(DEST)/load_hash.o \
      $(DEST)/load_hashnode.o \
+     $(DEST)/load_http.o \
      $(DEST)/load_pool.o \
      $(DEST)/load_poolnode.o \
-     $(DEST)/loglevel.o \
+     $(DEST)/load_url.o \
      $(DEST)/mutex_emul.o \
      $(DEST)/nametokva.o \
      $(DEST)/nat_setgroupmap.o \
@@ -55,17 +60,19 @@ LIBOBJS=$(DEST)/addicmp.o \
      $(DEST)/optprintv6.o \
      $(DEST)/optvalue.o \
      $(DEST)/portname.o \
-     $(DEST)/portnum.o \
-     $(DEST)/ports.o \
      $(DEST)/print_toif.o \
      $(DEST)/printactivenat.o \
      $(DEST)/printaps.o \
      $(DEST)/printbuf.o \
      $(DEST)/printhash.o \
+     $(DEST)/printhashdata.o \
      $(DEST)/printhashnode.o \
+     $(DEST)/printhash_live.o \
      $(DEST)/printip.o \
      $(DEST)/printpool.o \
+     $(DEST)/printpooldata.o \
      $(DEST)/printpoolnode.o \
+     $(DEST)/printpool_live.o \
      $(DEST)/printproto.o \
      $(DEST)/printfr.o \
      $(DEST)/printfraginfo.o \
@@ -80,9 +87,8 @@ LIBOBJS=$(DEST)/addicmp.o \
      $(DEST)/printpacket6.o \
      $(DEST)/printsbuf.o \
      $(DEST)/printstate.o \
+     $(DEST)/printtqtable.o \
      $(DEST)/printtunable.o \
-     $(DEST)/ratoi.o \
-     $(DEST)/ratoui.o \
      $(DEST)/remove_hash.o \
      $(DEST)/remove_hashnode.o \
      $(DEST)/remove_pool.o \
@@ -91,7 +97,6 @@ LIBOBJS=$(DEST)/addicmp.o \
      $(DEST)/rwlock_emul.o \
      $(DEST)/tcpflags.o \
      $(DEST)/tcp_flags.o \
-     $(DEST)/to_interface.o \
      $(DEST)/var.o \
      $(DEST)/verbose.o \
      $(DEST)/v6ionames.o \
@@ -106,6 +111,10 @@ $(DEST)/addicmp.o: $(LIBSRC)/addicmp.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/addicmp.c -o $@
 $(DEST)/addipopt.o: $(LIBSRC)/addipopt.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/addipopt.c -o $@
+$(DEST)/alist_free.o: $(LIBSRC)/alist_free.c $(INCDEP)
+	$(CC) $(CCARGS) -c $(LIBSRC)/alist_free.c -o $@
+$(DEST)/alist_new.o: $(LIBSRC)/alist_new.c $(INCDEP)
+	$(CC) $(CCARGS) -c $(LIBSRC)/alist_new.c -o $@
 $(DEST)/bcopywrap.o: $(LIBSRC)/bcopywrap.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/bcopywrap.c -o $@
 $(DEST)/binprint.o: $(LIBSRC)/binprint.c $(INCDEP)
@@ -120,16 +129,12 @@ $(DEST)/count4bits.o: $(LIBSRC)/count4bits.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/count4bits.c -o $@
 $(DEST)/debug.o: $(LIBSRC)/debug.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/debug.c -o $@
-$(DEST)/extras.o: $(LIBSRC)/extras.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/extras.c -o $@
 $(DEST)/facpri.o: $(LIBSRC)/facpri.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/facpri.c -o $@
 $(DEST)/fill6bits.o: $(LIBSRC)/fill6bits.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/fill6bits.c -o $@
 $(DEST)/flags.o: $(LIBSRC)/flags.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/flags.c -o $@
-$(DEST)/genmask.o: $(LIBSRC)/genmask.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/genmask.c -o $@
 $(DEST)/getline.o: $(LIBSRC)/getline.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/getline.c -o $@
 $(DEST)/gethost.o: $(LIBSRC)/gethost.c $(INCDEP)
@@ -146,14 +151,8 @@ $(DEST)/getproto.o: $(LIBSRC)/getproto.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/getproto.c -o $@
 $(DEST)/getsumd.o: $(LIBSRC)/getsumd.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/getsumd.c -o $@
-$(DEST)/hexdump.o: $(LIBSRC)/hexdump.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/hexdump.c -o $@
-$(DEST)/hostmask.o: $(LIBSRC)/hostmask.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/hostmask.c -o $@
 $(DEST)/hostname.o: $(LIBSRC)/hostname.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/hostname.c -o $@
-$(DEST)/hostnum.o: $(LIBSRC)/hostnum.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/hostnum.c -o $@
 $(DEST)/icmpcode.o: $(LIBSRC)/icmpcode.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/icmpcode.c -o $@
 $(DEST)/ipoptsec.o: $(LIBSRC)/ipoptsec.c $(INCDEP)
@@ -184,14 +183,20 @@ $(DEST)/kmemcpywrap.o: $(LIBSRC)/kmemcpywrap.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/kmemcpywrap.c -o $@
 $(DEST)/kvatoname.o: $(LIBSRC)/kvatoname.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/kvatoname.c -o $@
+$(DEST)/load_file.o: $(LIBSRC)/load_file.c $(INCDEP)
+	$(CC) $(CCARGS) -c $(LIBSRC)/load_file.c -o $@
 $(DEST)/load_hash.o: $(LIBSRC)/load_hash.c $(INCDEP) $(TOP)/ip_htable.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/load_hash.c -o $@
 $(DEST)/load_hashnode.o: $(LIBSRC)/load_hashnode.c $(INCDEP) $(TOP)/ip_htable.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/load_hashnode.c -o $@
+$(DEST)/load_http.o: $(LIBSRC)/load_http.c $(INCDEP)
+	$(CC) $(CCARGS) -c $(LIBSRC)/load_http.c -o $@
 $(DEST)/load_pool.o: $(LIBSRC)/load_pool.c $(INCDEP) $(TOP)/ip_pool.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/load_pool.c -o $@
 $(DEST)/load_poolnode.o: $(LIBSRC)/load_poolnode.c $(INCDEP) $(TOP)/ip_pool.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/load_poolnode.c -o $@
+$(DEST)/load_url.o: $(LIBSRC)/load_url.c $(INCDEP)
+	$(CC) $(CCARGS) -c $(LIBSRC)/load_url.c -o $@
 $(DEST)/make_range.o: $(LIBSRC)/make_range.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/make_range.c -o $@
 $(DEST)/mutex_emul.o: $(LIBSRC)/mutex_emul.c $(INCDEP)
@@ -203,8 +208,6 @@ $(DEST)/nat_setgroupmap.o: $(LIBSRC)/nat_setgroupmap.c $(TOP)/ip_compat.h \
 	$(CC) $(CCARGS) -c $(LIBSRC)/nat_setgroupmap.c -o $@
 $(DEST)/ntomask.o: $(LIBSRC)/ntomask.c $(TOP)/ip_compat.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/ntomask.c -o $@
-$(DEST)/loglevel.o: $(LIBSRC)/loglevel.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/loglevel.c -o $@
 $(DEST)/optname.o: $(LIBSRC)/optname.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/optname.c -o $@
 $(DEST)/optprint.o: $(LIBSRC)/optprint.c $(INCDEP)
@@ -233,16 +236,25 @@ $(DEST)/printfraginfo.o: $(LIBSRC)/printfraginfo.c $(TOP)/ip_fil.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printfraginfo.c -o $@
 $(DEST)/printhash.o: $(LIBSRC)/printhash.c $(TOP)/ip_fil.h $(TOP)/ip_htable.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printhash.c -o $@
+$(DEST)/printhashdata.o: $(LIBSRC)/printhash.c $(TOP)/ip_fil.h $(TOP)/ip_htable.h
+	$(CC) $(CCARGS) -c $(LIBSRC)/printhashdata.c -o $@
 $(DEST)/printhashnode.o: $(LIBSRC)/printhashnode.c $(TOP)/ip_fil.h \
     $(TOP)/ip_htable.h $(TOP)/ip_lookup.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printhashnode.c -o $@
+$(DEST)/printhash_live.o: $(LIBSRC)/printhash_live.c $(TOP)/ip_fil.h $(TOP)/ip_htable.h
+	$(CC) $(CCARGS) -c $(LIBSRC)/printhash_live.c -o $@
 $(DEST)/printip.o: $(LIBSRC)/printip.c $(TOP)/ip_fil.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printip.c -o $@
 $(DEST)/printpool.o: $(LIBSRC)/printpool.c $(TOP)/ip_fil.h $(TOP)/ip_pool.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printpool.c -o $@
+$(DEST)/printpooldata.o: $(LIBSRC)/printpooldata.c $(TOP)/ip_fil.h $(TOP)/ip_pool.h
+	$(CC) $(CCARGS) -c $(LIBSRC)/printpooldata.c -o $@
 $(DEST)/printpoolnode.o: $(LIBSRC)/printpoolnode.c $(TOP)/ip_fil.h \
     $(TOP)/ip_pool.h $(TOP)/ip_lookup.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printpoolnode.c -o $@
+$(DEST)/printpool_live.o: $(LIBSRC)/printpool_live.c $(TOP)/ip_fil.h \
+    $(TOP)/ip_pool.h $(TOP)/ip_lookup.h
+	$(CC) $(CCARGS) -c $(LIBSRC)/printpool_live.c -o $@
 $(DEST)/printproto.o: $(LIBSRC)/printproto.c $(TOP)/ip_fil.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printproto.c -o $@
 $(DEST)/printhostmap.o: $(LIBSRC)/printhostmap.c $(TOP)/ip_fil.h
@@ -267,12 +279,10 @@ $(DEST)/printsbuf.o: $(LIBSRC)/printsbuf.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/printsbuf.c -o $@
 $(DEST)/printstate.o: $(LIBSRC)/printstate.c $(INCDEP) $(TOP)/ip_state.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/printstate.c -o $@
+$(DEST)/printtqtable.o: $(LIBSRC)/printtqtable.c $(INCDEP)
+	$(CC) $(CCARGS) -c $(LIBSRC)/printtqtable.c -o $@
 $(DEST)/printtunable.o: $(LIBSRC)/printtunable.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/printtunable.c -o $@
-$(DEST)/ratoi.o: $(LIBSRC)/ratoi.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/ratoi.c -o $@
-$(DEST)/ratoui.o: $(LIBSRC)/ratoui.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/ratoui.c -o $@
 $(DEST)/remove_hash.o: $(LIBSRC)/remove_hash.c $(INCDEP) \
     $(TOP)/ip_htable.h
 	$(CC) $(CCARGS) -c $(LIBSRC)/remove_hash.c -o $@
@@ -289,8 +299,6 @@ $(DEST)/resetlexer.o: $(LIBSRC)/resetlexer.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/resetlexer.c -o $@
 $(DEST)/rwlock_emul.o: $(LIBSRC)/rwlock_emul.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/rwlock_emul.c -o $@
-$(DEST)/to_interface.o: $(LIBSRC)/to_interface.c $(INCDEP)
-	$(CC) $(CCARGS) -c $(LIBSRC)/to_interface.c -o $@
 $(DEST)/tcpflags.o: $(LIBSRC)/tcpflags.c $(INCDEP)
 	$(CC) $(CCARGS) -c $(LIBSRC)/tcpflags.c -o $@
 $(DEST)/tcp_flags.o: $(LIBSRC)/tcp_flags.c $(INCDEP)
diff --git a/contrib/ipfilter/lib/addicmp.c b/contrib/ipfilter/lib/addicmp.c
index c83ecfe..2567397 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/contrib/ipfilter/lib/addicmp.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: addicmp.c,v 1.10.2.4 2006/02/25 17:41:57 darrenr Exp $
+ * $Id: addicmp.c,v 1.10.2.5 2006/06/16 17:20:55 darrenr Exp $
  */
 
 #include <ctype.h>
diff --git a/contrib/ipfilter/lib/addipopt.c b/contrib/ipfilter/lib/addipopt.c
index e39484f..17fac0d 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/contrib/ipfilter/lib/addipopt.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: addipopt.c,v 1.7 2002/01/28 06:50:45 darrenr Exp $
+ * $Id: addipopt.c,v 1.7.4.1 2006/06/16 17:20:56 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/alist_free.c b/contrib/ipfilter/lib/alist_free.c
new file mode 100644
index 0000000..3c1a518
--- /dev/null
+++ b/contrib/ipfilter/lib/alist_free.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2006 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ *
+ * $Id: alist_free.c,v 1.1.2.1 2006/08/25 21:13:04 darrenr Exp $
+ */
+#include "ipf.h"
+
+void
+alist_free(hosts)
+alist_t *hosts;
+{
+	alist_t *a, *next;
+
+	for (a = hosts; a != NULL; a = next) {
+		next = a->al_next;
+		free(a);
+	}
+}
diff --git a/contrib/ipfilter/lib/alist_new.c b/contrib/ipfilter/lib/alist_new.c
new file mode 100644
index 0000000..72da866
--- /dev/null
+++ b/contrib/ipfilter/lib/alist_new.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2006 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ *
+ * $Id: alist_new.c,v 1.1.2.2 2006/08/25 22:43:21 darrenr Exp $
+ */
+
+#include "ipf.h"
+
+alist_t *     
+alist_new(int v, char *host)
+{
+	int a, b, c, d, bits;
+	char *slash;    
+	alist_t *al;  
+	u_int mask;     
+
+	al = calloc(1, sizeof(*al));
+	if (al == NULL) {
+		fprintf(stderr, "alist_new out of memory\n");
+		return NULL;
+	}
+
+	bits = -1;      
+	slash = strchr(host, '/');
+	if (slash != NULL) {
+		*slash = '\0';
+		bits = atoi(slash + 1);
+	}
+
+	a = b = c = d = -1;
+	sscanf(host, "%d.%d.%d.%d", &a, &b, &c, &d);
+
+	if (bits > 0 && bits < 33) {
+		mask = 0xffffffff << (32 - bits);
+	} else if (b == -1) {
+		mask = 0xff000000;
+		b = c = d = 0;  
+	} else if (c == -1) {
+		mask = 0xffff0000;
+		c = d = 0;
+	} else if (d == -1) {
+		mask = 0xffffff00;
+		d = 0;
+	} else {
+		mask = 0xffffffff;
+	}
+
+	if (*host == '!') {
+		al->al_not = 1;
+		host++;
+	}
+
+	if (gethost(host, &al->al_addr) == -1) {
+		*slash = '/';
+		fprintf(stderr, "Cannot parse hostname\n");
+		free(al);
+		return NULL;
+	}
+	al->al_mask = htonl(mask);
+	*slash = '/';
+	return al;
+}
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/contrib/ipfilter/lib/bcopywrap.c
index 1800373..83fd04b 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/contrib/ipfilter/lib/bcopywrap.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ *   
+ * $Id: bcopywrap.c,v 1.1.4.1 2006/06/16 17:20:56 darrenr Exp $
+ */  
+
 #include "ipf.h"
 
 int bcopywrap(from, to, size)
diff --git a/contrib/ipfilter/lib/binprint.c b/contrib/ipfilter/lib/binprint.c
index b07dfb0..4eb3828 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/contrib/ipfilter/lib/binprint.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: binprint.c,v 1.8 2002/05/14 15:18:56 darrenr Exp $
+ * $Id: binprint.c,v 1.8.4.1 2006/06/16 17:20:56 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/buildopts.c b/contrib/ipfilter/lib/buildopts.c
index 706e7b7..d493f5e 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/contrib/ipfilter/lib/buildopts.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: buildopts.c,v 1.6 2002/01/28 06:50:45 darrenr Exp $
+ * $Id: buildopts.c,v 1.6.4.1 2006/06/16 17:20:56 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/checkrev.c b/contrib/ipfilter/lib/checkrev.c
index f95cc79..3c40226 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/contrib/ipfilter/lib/checkrev.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: checkrev.c,v 1.12.2.1 2004/03/09 14:44:39 darrenr Exp $
+ * $Id: checkrev.c,v 1.12.2.2 2006/06/16 17:20:56 darrenr Exp $
  */
 
 #include <sys/ioctl.h>
diff --git a/contrib/ipfilter/lib/count4bits.c b/contrib/ipfilter/lib/count4bits.c
index e3857fa..51e6025 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/contrib/ipfilter/lib/count4bits.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: count4bits.c,v 1.1 2002/06/15 04:46:39 darrenr Exp $
+ * $Id: count4bits.c,v 1.1.4.1 2006/06/16 17:20:57 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/count6bits.c b/contrib/ipfilter/lib/count6bits.c
index e9a5159..be090b7 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/contrib/ipfilter/lib/count6bits.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: count6bits.c,v 1.4 2001/06/09 17:09:23 darrenr Exp $
+ * $Id: count6bits.c,v 1.4.4.1 2006/06/16 17:20:57 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/debug.c b/contrib/ipfilter/lib/debug.c
index 9f3f4cc..144bc02 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/contrib/ipfilter/lib/debug.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: debug.c,v 1.6 2001/06/09 17:09:24 darrenr Exp $
+ * $Id: debug.c,v 1.6.4.1 2006/06/16 17:20:57 darrenr Exp $
  */
 
 #if defined(__STDC__)
diff --git a/contrib/ipfilter/lib/facpri.c b/contrib/ipfilter/lib/facpri.c
index c438a1c..6785e22 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/contrib/ipfilter/lib/facpri.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: facpri.c,v 1.6.2.4 2006/03/17 22:28:41 darrenr Exp $
+ * $Id: facpri.c,v 1.6.2.5 2006/06/16 17:20:58 darrenr Exp $
  */
 
 #include <stdio.h>
@@ -20,7 +20,7 @@
 #include "facpri.h"
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: facpri.c,v 1.6.2.4 2006/03/17 22:28:41 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: facpri.c,v 1.6.2.5 2006/06/16 17:20:58 darrenr Exp $";
 #endif
 
 
diff --git a/contrib/ipfilter/lib/facpri.h b/contrib/ipfilter/lib/facpri.h
index d0d488a..b6d5f5a 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/contrib/ipfilter/lib/facpri.h
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1999-2001 by Darren Reed.
+ * Copyright (C) 2000-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: facpri.h,v 1.3 2001/06/09 17:19:50 darrenr Exp $
+ * $Id: facpri.h,v 1.3.4.1 2006/06/16 17:20:58 darrenr Exp $
  */
 
 #ifndef	__FACPRI_H__
diff --git a/contrib/ipfilter/lib/fill6bits.c b/contrib/ipfilter/lib/fill6bits.c
index 421a075..a5f459a 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/contrib/ipfilter/lib/fill6bits.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: fill6bits.c,v 1.5 2002/03/27 15:09:57 darrenr Exp $
+ * $Id: fill6bits.c,v 1.5.4.1 2006/06/16 17:20:58 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/flags.c b/contrib/ipfilter/lib/flags.c
index 49f28e6..4baf3bd 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/contrib/ipfilter/lib/flags.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2001-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: flags.c,v 1.4 2002/11/02 07:16:36 darrenr Exp $
+ * $Id: flags.c,v 1.4.4.1 2006/06/16 17:20:58 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/gethost.c b/contrib/ipfilter/lib/gethost.c
index afcd3b5..d97766f 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/contrib/ipfilter/lib/gethost.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2004 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: gethost.c,v 1.3.2.2 2006/06/16 17:20:59 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 int gethost(name, hostp)
diff --git a/contrib/ipfilter/lib/getifname.c b/contrib/ipfilter/lib/getifname.c
index 1480c1f..6163239 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/contrib/ipfilter/lib/getifname.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2004 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: getifname.c,v 1.5.2.3 2006/07/14 06:12:24 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 #include "kmem.h"
@@ -6,6 +14,7 @@
  * Given a pointer to an interface in the kernel, return a pointer to a
  * string which is the interface name.
  */
+#if 0
 char *getifname(ptr)
 struct ifnet *ptr;
 {
@@ -72,3 +81,10 @@ struct ifnet *ptr;
 # endif
 #endif
 }
+#else
+char *getifname(ptr)
+struct ifnet *ptr;
+{
+	return "X";
+}
+#endif
diff --git a/contrib/ipfilter/lib/getnattype.c b/contrib/ipfilter/lib/getnattype.c
index 312a862..04463c2 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/contrib/ipfilter/lib/getnattype.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
@@ -9,26 +9,34 @@
 #include "kmem.h"
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: getnattype.c,v 1.3 2004/01/17 17:26:07 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: getnattype.c,v 1.3.2.2 2006/07/14 06:12:24 darrenr Exp $";
 #endif
 
 
 /*
  * Get a nat filter type given its kernel address.
  */
-char *getnattype(ipnat)
-ipnat_t *ipnat;
+char *getnattype(nat, alive)
+nat_t *nat;
+int alive;
 {
 	static char unknownbuf[20];
-	ipnat_t ipnatbuff;
+	ipnat_t *ipn, ipnat;
 	char *which;
+	int type;
 
-	if (!ipnat)
+	if (!nat)
 		return "???";
-	if (kmemcpy((char *)&ipnatbuff, (long)ipnat, sizeof(ipnatbuff)))
-		return "!!!";
+	if (alive) {
+		type = nat->nat_redir;
+	} else {
+		ipn = nat->nat_ptr;
+		if (kmemcpy((char *)&ipnat, (long)ipn, sizeof(ipnat)))
+			return "!!!";
+		type = ipnat.in_redir;
+	}
 
-	switch (ipnatbuff.in_redir)
+	switch (type)
 	{
 	case NAT_MAP :
 		which = "MAP";
@@ -43,8 +51,7 @@ ipnat_t *ipnat;
 		which = "BIMAP";
 		break;
 	default :
-		sprintf(unknownbuf, "unknown(%04x)",
-			ipnatbuff.in_redir & 0xffffffff);
+		sprintf(unknownbuf, "unknown(%04x)", type & 0xffffffff);
 		which = unknownbuf;
 		break;
 	}
diff --git a/contrib/ipfilter/lib/getport.c b/contrib/ipfilter/lib/getport.c
index bb14fb3..1c5177c 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/contrib/ipfilter/lib/getport.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2005 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: getport.c,v 1.1.4.6 2006/06/16 17:21:00 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 int getport(fr, name, port)
diff --git a/contrib/ipfilter/lib/getportproto.c b/contrib/ipfilter/lib/getportproto.c
index d76e761..5a247ae 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/contrib/ipfilter/lib/getportproto.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2005 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: getportproto.c,v 1.2.4.4 2006/06/16 17:21:00 darrenr Exp $ 
+ */     
+
 #include <ctype.h>
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/getproto.c b/contrib/ipfilter/lib/getproto.c
index 58e82bd..9714da2 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/contrib/ipfilter/lib/getproto.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2005 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: getproto.c,v 1.2.2.3 2006/06/16 17:21:00 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 int getproto(name)
diff --git a/contrib/ipfilter/lib/getsumd.c b/contrib/ipfilter/lib/getsumd.c
index 346c445..00974bc 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/contrib/ipfilter/lib/getsumd.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: getsumd.c,v 1.2.4.1 2006/06/16 17:21:01 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 char *getsumd(sum)
diff --git a/contrib/ipfilter/lib/hostname.c b/contrib/ipfilter/lib/hostname.c
index a883fc6..b8295d4 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/contrib/ipfilter/lib/hostname.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (C) 2002-2003 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: hostname.c,v 1.6.2.2 2007/01/16 02:25:22 darrenr Exp $ 
+ */     
 
 #include "ipf.h"
 
@@ -10,6 +17,8 @@ void *ip;
 	struct in_addr ipa;
 	struct netent *np;
 
+	memset(&ipa, 0, sizeof(ipa));	/* XXX gcc */
+
 	if (v == 4) {
 		ipa.s_addr = *(u_32_t *)ip;
 		if (ipa.s_addr == htonl(0xfedcba98))
diff --git a/contrib/ipfilter/lib/icmpcode.c b/contrib/ipfilter/lib/icmpcode.c
index b60d247..69841e0 100644
--- a/contrib/ipfilter/lib/icmpcode.c
+++ b/contrib/ipfilter/lib/icmpcode.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: icmpcode.c,v 1.7.2.4 2006/02/25 17:40:22 darrenr Exp $
+ * $Id: icmpcode.c,v 1.7.2.5 2006/06/16 17:21:02 darrenr Exp $
  */
 
 #include <ctype.h>
diff --git a/contrib/ipfilter/lib/initparse.c b/contrib/ipfilter/lib/initparse.c
index d875925..b9f162f 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/contrib/ipfilter/lib/initparse.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: initparse.c,v 1.6 2002/01/28 06:50:46 darrenr Exp $
+ * $Id: initparse.c,v 1.6.4.1 2006/06/16 17:21:02 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/ionames.c b/contrib/ipfilter/lib/ionames.c
index b1f655c..cc9374d 100644
--- a/contrib/ipfilter/lib/ionames.c
+++ b/contrib/ipfilter/lib/ionames.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ionames.c,v 1.7 2002/01/28 06:50:46 darrenr Exp $
+ * $Id: ionames.c,v 1.7.4.1 2006/06/16 17:21:02 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c
index daff025..8f90fdb 100644
--- a/contrib/ipfilter/lib/ipf_dotuning.c
+++ b/contrib/ipfilter/lib/ipf_dotuning.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2003-2005 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: ipf_dotuning.c,v 1.2.4.3 2006/06/16 17:21:02 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 #include "netinet/ipl.h"
 #include <sys/ioctl.h>
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/contrib/ipfilter/lib/ipft_ef.c
index 237febc..52eb508 100644
--- a/contrib/ipfilter/lib/ipft_ef.c
+++ b/contrib/ipfilter/lib/ipft_ef.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipft_ef.c,v 1.14 2004/01/08 13:34:31 darrenr Exp $
+ * $Id: ipft_ef.c,v 1.14.2.2 2006/06/16 17:21:02 darrenr Exp $
  */
 
 /*
@@ -31,7 +31,7 @@ etherfind -n -t
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipft_ef.c	1.6 2/4/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 1.14 2004/01/08 13:34:31 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 1.14.2.2 2006/06/16 17:21:02 darrenr Exp $";
 #endif
 
 static	int	etherf_open __P((char *));
@@ -96,13 +96,18 @@ int	cnt, *dir;
 
 	switch (ip->ip_p) {
 	case IPPROTO_TCP :
+		if (isdigit(*sprt))
+			pkt.ti_sport = htons(atoi(sprt) & 65535);
+		if (isdigit(*dprt))
+			pkt.ti_dport = htons(atoi(dprt) & 65535);
+		extra = sizeof(struct tcphdr);
+		break;
 	case IPPROTO_UDP :
-		s = strtok(NULL, " :");
-		ip->ip_len += atoi(s);
-		if (ip->ip_p == IPPROTO_TCP)
-			extra = sizeof(struct tcphdr);
-		else if (ip->ip_p == IPPROTO_UDP)
-			extra = sizeof(struct udphdr);
+		if (isdigit(*sprt))
+			pkt.ti_sport = htons(atoi(sprt) & 65535);
+		if (isdigit(*dprt))
+			pkt.ti_dport = htons(atoi(dprt) & 65535);
+		extra = sizeof(struct udphdr);
 		break;
 #ifdef	IGMP
 	case IPPROTO_IGMP :
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/contrib/ipfilter/lib/ipft_hx.c
index c649107..4851fff 100644
--- a/contrib/ipfilter/lib/ipft_hx.c
+++ b/contrib/ipfilter/lib/ipft_hx.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 1995-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipft_hx.c	1.1 3/9/96 (C) 1996 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 1.11.4.3 2005/12/04 10:07:21 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_hx.c,v 1.11.4.4 2006/06/16 17:21:03 darrenr Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/contrib/ipfilter/lib/ipft_pc.c
index de15235..fbfe6b0 100644
--- a/contrib/ipfilter/lib/ipft_pc.c
+++ b/contrib/ipfilter/lib/ipft_pc.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipft_pc.c,v 1.10.2.1 2005/12/04 09:55:10 darrenr Exp $
+ * $Id: ipft_pc.c,v 1.10.2.2 2006/06/16 17:21:03 darrenr Exp $
  */
 #include "ipf.h"
 #include "pcap-ipf.h"
@@ -11,7 +11,7 @@
 #include "ipt.h"
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 1.10.2.1 2005/12/04 09:55:10 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_pc.c,v 1.10.2.2 2006/06/16 17:21:03 darrenr Exp $";
 #endif
 
 struct	llc	{
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/contrib/ipfilter/lib/ipft_sn.c
index 1b3e364..a4c7318 100644
--- a/contrib/ipfilter/lib/ipft_sn.c
+++ b/contrib/ipfilter/lib/ipft_sn.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipft_sn.c,v 1.7 2003/02/16 02:32:36 darrenr Exp $
+ * $Id: ipft_sn.c,v 1.7.4.1 2006/06/16 17:21:03 darrenr Exp $
  */
 
 /*
@@ -14,7 +14,7 @@
 #include "ipt.h"
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 1.7 2003/02/16 02:32:36 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_sn.c,v 1.7.4.1 2006/06/16 17:21:03 darrenr Exp $";
 #endif
 
 struct	llc	{
diff --git a/contrib/ipfilter/lib/ipft_td.c b/contrib/ipfilter/lib/ipft_td.c
index 1aa6166..21bb764 100644
--- a/contrib/ipfilter/lib/ipft_td.c
+++ b/contrib/ipfilter/lib/ipft_td.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipft_td.c,v 1.15 2004/01/08 13:34:31 darrenr Exp $
+ * $Id: ipft_td.c,v 1.15.2.2 2006/06/16 17:21:03 darrenr Exp $
  */
 
 /*
@@ -40,7 +40,7 @@ tcpdump -nqte
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipft_td.c	1.8 2/4/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_td.c,v 1.15 2004/01/08 13:34:31 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_td.c,v 1.15.2.2 2006/06/16 17:21:03 darrenr Exp $";
 #endif
 
 static	int	tcpd_open __P((char *));
@@ -142,6 +142,8 @@ int	cnt, *dir;
 	IP_HL_A(ip, sizeof(ip_t));
 
 	s = strtok(misc, " :");
+	if (s == NULL)
+		return 0;
 	ip->ip_p = getproto(s);
 
 	switch (ip->ip_p)
@@ -149,6 +151,8 @@ int	cnt, *dir;
 	case IPPROTO_TCP :
 	case IPPROTO_UDP :
 		s = strtok(NULL, " :");
+		if (s == NULL)
+			return 0;
 		ip->ip_len += atoi(s);
 		if (ip->ip_p == IPPROTO_TCP)
 			extra = sizeof(struct tcphdr);
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/contrib/ipfilter/lib/ipft_tx.c
index 04c2dab..302f177 100644
--- a/contrib/ipfilter/lib/ipft_tx.c
+++ b/contrib/ipfilter/lib/ipft_tx.c
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 1995-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipft_tx.c,v 1.15.2.7 2005/12/18 14:53:39 darrenr Exp $
+ * $Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipft_tx.c	1.7 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.7 2005/12/18 14:53:39 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $";
 #endif
 
 #include <ctype.h>
@@ -127,6 +127,7 @@ int	cnt, *dir;
 {
 	register char *s;
 	char	line[513];
+	ip_t	*ip;
 
 	*ifn = NULL;
 	while (fgets(line, sizeof(line)-1, tfp)) {
@@ -142,12 +143,10 @@ int	cnt, *dir;
 			printf("input: %s\n", line);
 		*ifn = NULL;
 		*dir = 0;
-		if (!parseline(line, (ip_t *)buf, ifn, dir))
-#if 0
-			return sizeof(ip_t) + sizeof(tcphdr_t);
-#else
-			return sizeof(ip_t);
-#endif
+		if (!parseline(line, (ip_t *)buf, ifn, dir)) {
+			ip = (ip_t *)buf;
+			return ntohs(ip->ip_len);
+		}
 	}
 	if (feof(tfp))
 		return 0;
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/contrib/ipfilter/lib/ipoptsec.c
index 558ae58..a59db23 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/contrib/ipfilter/lib/ipoptsec.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2001-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: ipoptsec.c,v 1.2 2002/01/28 06:50:46 darrenr Exp $
+ * $Id: ipoptsec.c,v 1.2.4.1 2006/06/16 17:21:04 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c
index 1fd00ab..07830fb 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/contrib/ipfilter/lib/kmem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -42,7 +42,7 @@
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)kmem.c	1.4 1/12/96 (C) 1992 Darren Reed";
-static const char rcsid[] = "@(#)$Id: kmem.c,v 1.16.2.2 2005/06/12 07:18:41 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: kmem.c,v 1.16.2.3 2006/06/16 17:21:04 darrenr Exp $";
 #endif
 
 
diff --git a/contrib/ipfilter/lib/kmem.h b/contrib/ipfilter/lib/kmem.h
index 2cdd5fb..70f0a7a 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/contrib/ipfilter/lib/kmem.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
- * $Id: kmem.h,v 1.2 2002/08/21 22:57:36 darrenr Exp $
+ * $Id: kmem.h,v 1.2.4.1 2006/06/16 17:21:04 darrenr Exp $
  */
 
 #ifndef	__KMEM_H__
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/contrib/ipfilter/lib/kmemcpywrap.c
index 35715dc..7a4a161 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/contrib/ipfilter/lib/kmemcpywrap.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: kmemcpywrap.c,v 1.1.4.1 2006/06/16 17:21:05 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 #include "kmem.h"
 
diff --git a/contrib/ipfilter/lib/kvatoname.c b/contrib/ipfilter/lib/kvatoname.c
index b3f4af9..b0fe69d 100644
--- a/contrib/ipfilter/lib/kvatoname.c
+++ b/contrib/ipfilter/lib/kvatoname.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: kvatoname.c,v 1.1.4.1 2006/06/16 17:21:05 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/load_file.c b/contrib/ipfilter/lib/load_file.c
new file mode 100644
index 0000000..9bb3899
--- /dev/null
+++ b/contrib/ipfilter/lib/load_file.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2006 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ *
+ * $Id: load_file.c,v 1.1.2.1 2006/08/25 21:13:04 darrenr Exp $
+ */
+
+#include "ipf.h"
+
+alist_t *
+load_file(char *filename)
+{
+	alist_t *a, *rtop, *rbot;
+	char *s, line[1024], *t;
+	int linenum, not;
+	FILE *fp;
+
+	fp = fopen(filename + 7, "r");
+	if (fp == NULL) {
+		fprintf(stderr, "load_file cannot open '%s'\n", filename);
+		return NULL;
+	}       
+
+	a = NULL;
+	rtop = NULL;
+	rbot = NULL;
+	linenum = 0;    
+		
+	while (fgets(line, sizeof(line) - 1, fp)) {
+		line[sizeof(line) - 1] = '\0';
+		linenum++;
+		/*
+		 * Hunt for CR/LF.  If no LF, stop processing.
+		 */
+		s = strchr(line, '\n');
+		if (s == NULL) {
+			fprintf(stderr, "%d:%s: line too long\n", linenum, filename);
+			fclose(fp);
+			alist_free(rtop);
+			return NULL;
+		}
+
+		*s = '\0';
+		s = strchr(line, '\r');
+		if (s != NULL)
+			*s = '\0';
+		for (t = line; isspace(*t); t++)
+			;
+		if (*t == '!') {
+			not = 1;
+			t++;
+		} else
+			not = 0;
+
+		/*
+		 * Remove comment markers
+		 */
+		for (s = t; *s; s++) {
+			if (*s == '#')
+				*s = '\0';
+		}
+		if (!*t)
+			continue;
+		/*
+		 * Trim off tailing white spaces
+		 */
+		s = strlen(t) + t - 1;
+		while (isspace(*s))
+			*s-- = '\0';
+
+		if (isdigit(*t)) {
+			a = alist_new(4, t);
+			a->al_not = not;
+			if (rbot != NULL)
+				rbot->al_next = a;
+			else
+				rtop = a;
+			rbot = a;
+		} else {
+			fprintf(stderr, "%s: unrecognised content line %d\n",
+				filename, linenum);
+		}
+	}
+	fclose(fp);
+
+	return rtop;
+}
diff --git a/contrib/ipfilter/lib/load_hash.c b/contrib/ipfilter/lib/load_hash.c
index 638e9f5..84abca0 100644
--- a/contrib/ipfilter/lib/load_hash.c
+++ b/contrib/ipfilter/lib/load_hash.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: load_hash.c,v 1.11.2.3 2005/11/13 15:41:12 darrenr Exp $
+ * $Id: load_hash.c,v 1.11.2.5 2006/07/14 06:12:25 darrenr Exp $
  */
 
 #include <fcntl.h>
@@ -60,6 +60,7 @@ ioctlfunc_t iocfunc;
 	iph.iph_size = size;
 	iph.iph_seed = iphp->iph_seed;
 	iph.iph_table = NULL;
+	iph.iph_list = NULL;
 	iph.iph_ref = 0;
 
 	if ((opts & OPT_REMOVE) == 0) {
@@ -83,9 +84,10 @@ ioctlfunc_t iocfunc;
 			perror("calloc(size, sizeof(*iph.iph_table))");
 			return -1;
 		}
-		iph.iph_table[0] = list;
+		iph.iph_list = list;
 		printhash(&iph, bcopywrap, iph.iph_name, opts);
 		free(iph.iph_table);
+		iph.iph_list = NULL;
 
 		for (a = list; a != NULL; a = a->ipe_next) {
 			a->ipe_addr.in4_addr = htonl(a->ipe_addr.in4_addr);
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/contrib/ipfilter/lib/load_hashnode.c
index cee0338..8ff907a 100644
--- a/contrib/ipfilter/lib/load_hashnode.c
+++ b/contrib/ipfilter/lib/load_hashnode.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2003-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: load_hashnode.c,v 1.2.4.1 2004/03/06 14:33:28 darrenr Exp $
+ * $Id: load_hashnode.c,v 1.2.4.2 2006/06/16 17:21:05 darrenr Exp $
  */
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/load_http.c b/contrib/ipfilter/lib/load_http.c
new file mode 100644
index 0000000..164b8b4
--- /dev/null
+++ b/contrib/ipfilter/lib/load_http.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2006 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ *
+ * $Id: load_http.c,v 1.1.2.1 2006/08/25 21:13:04 darrenr Exp $
+ */
+
+#include "ipf.h"
+
+/*
+ * Format expected is one addres per line, at the start of each line.
+ */
+alist_t *
+load_http(char *url)
+{
+	int fd, len, left, port, endhdr, removed;
+	char *s, *t, *u, buffer[1024], *myurl;
+	alist_t *a, *rtop, *rbot;
+	struct sockaddr_in sin;
+	struct hostent *host;
+
+	/*
+	 * More than this would just be absurd.
+	 */
+	if (strlen(url) > 512) {
+		fprintf(stderr, "load_http has a URL > 512 bytes?!\n");
+		return NULL;
+	}
+
+	fd = -1;
+	rtop = NULL;
+	rbot = NULL;
+
+	sprintf(buffer, "GET %s HTTP/1.0\r\n", url);
+
+	myurl = strdup(url);
+	if (myurl == NULL)
+		goto done;
+
+	s = myurl + 7;			/* http:// */
+	t = strchr(s, '/');
+	if (t == NULL) {
+		fprintf(stderr, "load_http has a malformed URL '%s'\n", url);
+		free(myurl);
+		return NULL;
+	}
+	*t++ = '\0';
+
+	u = strchr(s, '@');
+	if (u != NULL)
+		s = u + 1;		/* AUTH */
+
+	sprintf(buffer + strlen(buffer), "Host: %s\r\n\r\n", s);
+
+	u = strchr(s, ':');
+	if (u != NULL) {
+		*u++ = '\0';
+		port = atoi(u);
+		if (port < 0 || port > 65535)
+			goto done;
+	} else {
+		port = 80;
+	}
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(port);
+
+	if (isdigit(*s)) {
+		if (inet_aton(s, &sin.sin_addr) == -1) {
+			goto done;
+		}
+	} else {
+		host = gethostbyname(s);
+		if (host == NULL)
+			goto done;
+		memcpy(&sin.sin_addr, host->h_addr_list[0],
+		       sizeof(sin.sin_addr));
+	}
+
+	fd = socket(AF_INET, SOCK_STREAM, 0);
+	if (fd == -1)
+		goto done;
+
+	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
+		close(fd);
+		goto done;
+	}
+
+	len = strlen(buffer);
+	if (write(fd, buffer, len) != len) {
+		close(fd);
+		goto done;
+	}
+
+	s = buffer;
+	endhdr = 0;
+	left = sizeof(buffer) - 1;
+
+	while ((len = read(fd, s, left)) > 0) {
+		s[len] = '\0';
+		left -= len;
+		s += len;
+
+		if (endhdr >= 0) {
+			if (endhdr == 0) {
+				t = strchr(buffer, ' ');
+				if (t == NULL)
+					continue;
+				t++;
+				if (*t != '2')
+					break;
+			}
+
+			u = buffer;
+			while ((t = strchr(u, '\r')) != NULL) {
+				if (t == u) {
+					if (*(t + 1) == '\n') {
+						u = t + 2;
+						endhdr = -1;
+						break;
+					} else
+						t++;
+				} else if (*(t + 1) == '\n') {
+					endhdr++;
+					u = t + 2;
+				} else
+					u = t + 1;
+			}
+			if (endhdr >= 0)
+				continue;
+			removed = (u - buffer) + 1;
+			memmove(buffer, u, (sizeof(buffer) - left) - removed);
+			s -= removed;
+			left += removed;
+		}
+
+		do {
+			t = strchr(buffer, '\n');
+			if (t == NULL)
+				break;
+
+			*t++ = '\0';
+			for (u = buffer; isdigit(*u) || (*u == '.'); u++)
+				;
+			if (*u == '/') {
+				char *slash;
+
+				slash = u;
+				u++;
+				while (isdigit(*u))
+					u++;
+				if (!isspace(*u) && *u)
+					u = slash;
+			}
+			*u = '\0';
+
+			a = alist_new(4, buffer);
+			if (a != NULL) {
+				if (rbot != NULL)
+					rbot->al_next = a;
+				else
+					rtop = a;
+				rbot = a;
+			}
+
+			removed = t - buffer;
+			memmove(buffer, t, sizeof(buffer) - left - removed);
+			s -= removed;
+			left += removed;
+
+		} while (1);
+	}
+
+done:
+	if (myurl != NULL)
+		free(myurl);
+	if (fd != -1)
+		close(fd);
+	return rtop;
+}
diff --git a/contrib/ipfilter/lib/load_pool.c b/contrib/ipfilter/lib/load_pool.c
index 9cf22a2..f22b063 100644
--- a/contrib/ipfilter/lib/load_pool.c
+++ b/contrib/ipfilter/lib/load_pool.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: load_pool.c,v 1.14.2.3 2005/11/13 15:41:13 darrenr Exp $
+ * $Id: load_pool.c,v 1.14.2.4 2006/06/16 17:21:06 darrenr Exp $
  */
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/contrib/ipfilter/lib/load_poolnode.c
index e992a80..2afc4d2 100644
--- a/contrib/ipfilter/lib/load_poolnode.c
+++ b/contrib/ipfilter/lib/load_poolnode.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2003-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: load_poolnode.c,v 1.3.2.1 2004/03/06 14:33:29 darrenr Exp $
+ * $Id: load_poolnode.c,v 1.3.2.3 2006/06/16 17:21:06 darrenr Exp $
  */
 
 #include <fcntl.h>
@@ -52,7 +52,7 @@ ioctlfunc_t iocfunc;
 
 	if (err != 0) {
 		if ((opts & OPT_DONOTHING) == 0) {
-			perror("load_pool:SIOCLOOKUP*NODE");
+			perror("load_poolnode:SIOCLOOKUP*NODE");
 			return -1;
 		}
 	}
diff --git a/contrib/ipfilter/lib/load_url.c b/contrib/ipfilter/lib/load_url.c
new file mode 100644
index 0000000..7709153
--- /dev/null
+++ b/contrib/ipfilter/lib/load_url.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2006 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ *
+ * $Id: load_url.c,v 1.1.2.1 2006/08/25 21:13:04 darrenr Exp $
+ */
+
+#include "ipf.h"
+
+alist_t *
+load_url(char *url)
+{
+	alist_t *hosts = NULL;
+
+	if (strncmp(url, "file://", 7) == 0) { 
+		/*      
+		 * file:///etc/passwd
+		 *        ^------------s
+		 */     
+		hosts = load_file(url);
+
+	} else if (*url == '/' || *url == '.') {
+		hosts = load_file(url);
+
+	} else if (strncmp(url, "http://", 7) == 0) {
+		hosts = load_http(url);
+	}
+
+	return hosts;  
+}
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/contrib/ipfilter/lib/mutex_emul.c
index 9497ffe..1a58156 100644
--- a/contrib/ipfilter/lib/mutex_emul.c
+++ b/contrib/ipfilter/lib/mutex_emul.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2003 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: mutex_emul.c,v 1.2.4.1 2006/06/16 17:21:06 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 #define	EMM_MAGIC	0x9d7adba3
diff --git a/contrib/ipfilter/lib/nametokva.c b/contrib/ipfilter/lib/nametokva.c
index 9250d7c..89e3474 100644
--- a/contrib/ipfilter/lib/nametokva.c
+++ b/contrib/ipfilter/lib/nametokva.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: nametokva.c,v 1.1.4.1 2006/06/16 17:21:07 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 #include <sys/ioctl.h>
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/contrib/ipfilter/lib/nat_setgroupmap.c
index 00e0df1..ccf7864 100644
--- a/contrib/ipfilter/lib/nat_setgroupmap.c
+++ b/contrib/ipfilter/lib/nat_setgroupmap.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: nat_setgroupmap.c,v 1.1 2003/04/13 06:40:14 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: nat_setgroupmap.c,v 1.1.4.1 2006/06/16 17:21:07 darrenr Exp $";
 #endif
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/ntomask.c b/contrib/ipfilter/lib/ntomask.c
index cd4e983..4a50ef8 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/contrib/ipfilter/lib/ntomask.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2005 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: ntomask.c,v 1.6.2.1 2006/06/16 17:21:07 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 int ntomask(v, nbits, ap)
diff --git a/contrib/ipfilter/lib/optname.c b/contrib/ipfilter/lib/optname.c
index 1f604d1..33e5f17 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/contrib/ipfilter/lib/optname.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: optname.c,v 1.3 2001/06/09 17:09:24 darrenr Exp $
+ * $Id: optname.c,v 1.3.4.1 2006/06/16 17:21:07 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/optprint.c b/contrib/ipfilter/lib/optprint.c
index ec94bbb..8c14fe4 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/contrib/ipfilter/lib/optprint.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: optprint.c,v 1.6.4.1 2005/12/18 14:51:28 darrenr Exp $
+ * $Id: optprint.c,v 1.6.4.2 2006/06/16 17:21:08 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/optprintv6.c b/contrib/ipfilter/lib/optprintv6.c
index 4e4eee2..5172b5c 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/contrib/ipfilter/lib/optprintv6.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: optprintv6.c,v 1.2 2003/04/30 00:39:39 darrenr Exp $
+ * $Id: optprintv6.c,v 1.2.4.1 2006/06/16 17:21:08 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/optvalue.c b/contrib/ipfilter/lib/optvalue.c
index 21d37b4..37bfcf9 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/contrib/ipfilter/lib/optvalue.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2001-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: optvalue.c,v 1.2 2002/01/28 06:50:47 darrenr Exp $
+ * $Id: optvalue.c,v 1.2.4.1 2006/06/16 17:21:08 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/portname.c b/contrib/ipfilter/lib/portname.c
index 7136d8c..d8bf1d9 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/contrib/ipfilter/lib/portname.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: portname.c,v 1.7 2003/08/14 14:27:43 darrenr Exp $
+ * $Id: portname.c,v 1.7.2.1 2006/06/16 17:21:09 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/print_toif.c b/contrib/ipfilter/lib/print_toif.c
index 5d88ef9..696fcd3 100644
--- a/contrib/ipfilter/lib/print_toif.c
+++ b/contrib/ipfilter/lib/print_toif.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: print_toif.c,v 1.8 2002/01/28 06:50:47 darrenr Exp $
+ * $Id: print_toif.c,v 1.8.4.1 2006/06/16 17:21:09 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index 389818b..99f3e58 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/contrib/ipfilter/lib/printactivenat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
@@ -10,16 +10,17 @@
 
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printactivenat.c,v 1.3.2.4 2004/05/11 16:07:32 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: printactivenat.c,v 1.3.2.7 2006/12/12 16:13:00 darrenr Exp $";
 #endif
 
 
-void printactivenat(nat, opts)
+void printactivenat(nat, opts, alive, now)
 nat_t *nat;
-int opts;
+int opts, alive;
+u_long now;
 {
 
-	printf("%s", getnattype(nat->nat_ptr));
+	printf("%s", getnattype(nat, alive));
 
 	if (nat->nat_flags & SI_CLONE)
 		printf(" CLONE");
@@ -40,8 +41,9 @@ int opts;
 	printf("]");
 
 	if (opts & OPT_VERBOSE) {
-		printf("\n\tage %lu use %hu sumd %s/",
-			nat->nat_age, nat->nat_use, getsumd(nat->nat_sumd[0]));
+		printf("\n\tttl %lu use %hu sumd %s/",
+			nat->nat_age - now, nat->nat_use,
+			getsumd(nat->nat_sumd[0]));
 		printf("%s pr %u bkt %d/%d flags %x\n",
 			getsumd(nat->nat_sumd[1]), nat->nat_p,
 			nat->nat_hv[0], nat->nat_hv[1], nat->nat_flags);
diff --git a/contrib/ipfilter/lib/printaps.c b/contrib/ipfilter/lib/printaps.c
index 45b4b2f..c0c36d4 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/contrib/ipfilter/lib/printaps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
@@ -11,7 +11,7 @@
 
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printaps.c,v 1.4 2004/01/08 13:34:32 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: printaps.c,v 1.4.2.1 2006/06/16 17:21:10 darrenr Exp $";
 #endif
 
 
diff --git a/contrib/ipfilter/lib/printbuf.c b/contrib/ipfilter/lib/printbuf.c
index 613293a..bc097e0 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/contrib/ipfilter/lib/printbuf.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printbuf.c,v 1.5.4.1 2004/12/09 19:41:22 darrenr Exp $
+ * $Id: printbuf.c,v 1.5.4.2 2006/06/16 17:21:10 darrenr Exp $
  */
 
 #include <ctype.h>
diff --git a/contrib/ipfilter/lib/printfr.c b/contrib/ipfilter/lib/printfr.c
index 6e7a405..0750694 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/contrib/ipfilter/lib/printfr.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2006 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printfr.c,v 1.43.2.16 2006/03/29 11:19:59 darrenr Exp $
+ * $Id: printfr.c,v 1.43.2.18 2007/05/07 06:55:38 darrenr Exp $
  */
 
 #include "ipf.h"
@@ -468,7 +468,12 @@ ioctlfunc_t	iocfunc;
 		}
 		printf(")");
 	}
+
 	if (fp->fr_pps)
 		printf(" pps %d", fp->fr_pps);
+
+	if ((fp->fr_flags & FR_KEEPSTATE) && (opts & OPT_VERBOSE)) {
+		printf(" # count %d", fp->fr_statecnt);
+	}
 	(void)putchar('\n');
 }
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/contrib/ipfilter/lib/printfraginfo.c
index 557b031..012df06 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/contrib/ipfilter/lib/printfraginfo.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2004 by Darren Reed.
+ * Copyright (C) 2004-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printfraginfo.c,v 1.1.2.2 2004/03/23 15:15:45 darrenr Exp $
+ * $Id: printfraginfo.c,v 1.1.2.5 2006/12/25 15:10:37 darrenr Exp $
  */
 #include "ipf.h"
 #include "kmem.h"
@@ -17,11 +17,12 @@ struct ipfr *ifr;
 	fr.fr_flags = 0xffffffff;
 
 	printf("%s%s -> ", prefix, hostname(4, &ifr->ipfr_src));
+/*
 	if (kmemcpy((char *)&fr, (u_long)ifr->ipfr_rule,
 		    sizeof(fr)) == -1)
 		return;
-	printf("%s id %d ttl %d pr %d seen0 %d ifp %p tos %#02x = %#x\n",
-		hostname(4, &ifr->ipfr_dst), ifr->ipfr_id, ifr->ipfr_seen0,
-		ifr->ipfr_ttl, ifr->ipfr_p, ifr->ipfr_ifp, ifr->ipfr_tos,
-		fr.fr_flags);
+*/
+	printf("%s id %d ttl %ld pr %d seen0 %d ref %d tos %#02x\n",
+		hostname(4, &ifr->ipfr_dst), ifr->ipfr_id, ifr->ipfr_ttl,
+		ifr->ipfr_p, ifr->ipfr_seen0, ifr->ipfr_ref, ifr->ipfr_tos);
 }
diff --git a/contrib/ipfilter/lib/printhash.c b/contrib/ipfilter/lib/printhash.c
index 5411190..8e7948b 100644
--- a/contrib/ipfilter/lib/printhash.c
+++ b/contrib/ipfilter/lib/printhash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -18,7 +18,7 @@ int opts;
 {
 	iphtent_t *ipep, **table;
 	iphtable_t iph;
-	int i, printed;
+	int printed;
 	size_t sz;
 
 	if ((*copyfunc)((char *)hp, (char *)&iph, sizeof(iph)))
@@ -27,94 +27,10 @@ int opts;
 	if ((name != NULL) && strncmp(name, iph.iph_name, FR_GROUPLEN))
 		return iph.iph_next;
 
-	if ((opts & OPT_DEBUG) == 0) {
-		if ((iph.iph_type & IPHASH_ANON) == IPHASH_ANON)
-			PRINTF("# 'anonymous' table\n");
-		switch (iph.iph_type & ~IPHASH_ANON)
-		{
-		case IPHASH_LOOKUP :
-			PRINTF("table");
-			break;
-		case IPHASH_GROUPMAP :
-			PRINTF("group-map");
-			if (iph.iph_flags & FR_INQUE)
-				PRINTF(" in");
-			else if (iph.iph_flags & FR_OUTQUE)
-				PRINTF(" out");
-			else
-				PRINTF(" ???");
-			break;
-		default :
-			PRINTF("%#x", iph.iph_type);
-			break;
-		}
-		PRINTF(" role = ");
-	} else {
-		PRINTF("Hash Table Number: %s", iph.iph_name);
-		if ((iph.iph_type & IPHASH_ANON) == IPHASH_ANON)
-			PRINTF("(anon)");
-		putchar(' ');
-		PRINTF("Role: ");
-	}
-
-	switch (iph.iph_unit)
-	{
-	case IPL_LOGNAT :
-		PRINTF("nat");
-		break;
-	case IPL_LOGIPF :
-		PRINTF("ipf");
-		break;
-	case IPL_LOGAUTH :
-		PRINTF("auth");
-		break;
-	case IPL_LOGCOUNT :
-		PRINTF("count");
-		break;
-	default :
-		PRINTF("#%d", iph.iph_unit);
-		break;
-	}
-
-	if ((opts & OPT_DEBUG) == 0) {
-		if ((iph.iph_type & ~IPHASH_ANON) == IPHASH_LOOKUP)
-			PRINTF(" type = hash");
-		PRINTF(" number = %s size = %lu",
-			iph.iph_name, (u_long)iph.iph_size);
-		if (iph.iph_seed != 0)
-			PRINTF(" seed = %lu", iph.iph_seed);
-		putchar('\n');
-	} else {
-		PRINTF(" Type: ");
-		switch (iph.iph_type & ~IPHASH_ANON)
-		{
-		case IPHASH_LOOKUP :
-			PRINTF("lookup");
-			break;
-		case IPHASH_GROUPMAP :
-			PRINTF("groupmap Group. %s", iph.iph_name);
-			break;
-		default :
-			break;
-		}
+	printhashdata(hp, opts);
 
-		putchar('\n');
-		PRINTF("\t\tSize: %lu\tSeed: %lu",
-			(u_long)iph.iph_size, iph.iph_seed);
-		PRINTF("\tRef. Count: %d\tMasks: %#x\n", iph.iph_ref,
-			iph.iph_masks);
-	}
-
-	if ((opts & OPT_DEBUG) != 0) {
-		struct in_addr m;
-
-		for (i = 0; i < 32; i++) {
-			if ((1 << i) & iph.iph_masks) {
-				ntomask(4, i, &m.s_addr);
-				PRINTF("\t\tMask: %s\n", inet_ntoa(m));
-			}
-		}
-	}
+	if ((hp->iph_flags & IPHASH_DELETE) != 0)
+		PRINTF("# ");
 
 	if ((opts & OPT_DEBUG) == 0)
 		PRINTF("\t{");
@@ -124,11 +40,9 @@ int opts;
 	if ((*copyfunc)((char *)iph.iph_table, (char *)table, sz))
 		return NULL;
 
-	for (i = 0, printed = 0; i < iph.iph_size; i++) {
-		for (ipep = table[i]; ipep != NULL; ) {
-			ipep = printhashnode(&iph, ipep, copyfunc, opts);
-			printed++;
-		}
+	for (printed = 0, ipep = iph.iph_list; ipep != NULL; ) {
+		ipep = printhashnode(&iph, ipep, copyfunc, opts);
+		printed++;
 	}
 	if (printed == 0)
 		putchar(';');
diff --git a/contrib/ipfilter/lib/printhash_live.c b/contrib/ipfilter/lib/printhash_live.c
new file mode 100644
index 0000000..1afe632
--- /dev/null
+++ b/contrib/ipfilter/lib/printhash_live.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ */
+
+#include <sys/ioctl.h>
+#include "ipf.h"
+#include "netinet/ipl.h"
+
+#define	PRINTF	(void)printf
+#define	FPRINTF	(void)fprintf
+
+
+iphtable_t *printhash_live(hp, fd, name, opts)
+iphtable_t *hp;
+int fd;
+char *name;
+int opts;
+{
+	iphtent_t entry, *top, *node;
+	ipflookupiter_t iter;
+	int printed, last;
+	ipfobj_t obj;
+
+	if ((name != NULL) && strncmp(name, hp->iph_name, FR_GROUPLEN))
+		return hp->iph_next;
+
+	printhashdata(hp, opts);
+
+	if ((hp->iph_flags & IPHASH_DELETE) != 0)
+		PRINTF("# ");
+
+	if ((opts & OPT_DEBUG) == 0)
+		PRINTF("\t{");
+
+	obj.ipfo_rev = IPFILTER_VERSION;
+	obj.ipfo_type = IPFOBJ_LOOKUPITER;
+	obj.ipfo_ptr = &iter;
+	obj.ipfo_size = sizeof(iter);
+
+	iter.ili_data = &entry;
+	iter.ili_type = IPLT_HASH;
+	iter.ili_otype = IPFLOOKUPITER_NODE;
+	iter.ili_ival = IPFGENITER_LOOKUP;
+	iter.ili_unit = hp->iph_unit;
+	strncpy(iter.ili_name, hp->iph_name, FR_GROUPLEN);
+
+	last = 0;
+	top = NULL;
+	printed = 0;
+
+	while (!last && (ioctl(fd, SIOCLOOKUPITER, &obj) == 0)) {
+		if (entry.ipe_next == NULL)
+			last = 1;
+		entry.ipe_next = top;
+		top = malloc(sizeof(*top));
+		if (top == NULL)
+			break;
+		bcopy(&entry, top, sizeof(entry));
+	}
+
+	while (top != NULL) {
+		node = top;
+		(void) printhashnode(hp, node, bcopywrap, opts);
+		top = node->ipe_next;
+		free(node);
+		printed++;
+	}
+
+	if (printed == 0)
+		putchar(';');
+
+	if ((opts & OPT_DEBUG) == 0)
+		PRINTF(" };\n");
+	return hp->iph_next;
+}
diff --git a/contrib/ipfilter/lib/printhashdata.c b/contrib/ipfilter/lib/printhashdata.c
new file mode 100644
index 0000000..d278c36
--- /dev/null
+++ b/contrib/ipfilter/lib/printhashdata.c
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ */
+
+#include "ipf.h"
+
+#define	PRINTF	(void)printf
+#define	FPRINTF	(void)fprintf
+
+
+void printhashdata(hp, opts)
+iphtable_t *hp;
+int opts;
+{
+
+	if ((opts & OPT_DEBUG) == 0) {
+		if ((hp->iph_type & IPHASH_ANON) == IPHASH_ANON)
+			PRINTF("# 'anonymous' table\n");
+		if ((hp->iph_flags & IPHASH_DELETE) == IPHASH_DELETE)
+			PRINTF("# ");
+		switch (hp->iph_type & ~IPHASH_ANON)
+		{
+		case IPHASH_LOOKUP :
+			PRINTF("table");
+			break;
+		case IPHASH_GROUPMAP :
+			PRINTF("group-map");
+			if (hp->iph_flags & FR_INQUE)
+				PRINTF(" in");
+			else if (hp->iph_flags & FR_OUTQUE)
+				PRINTF(" out");
+			else
+				PRINTF(" ???");
+			break;
+		default :
+			PRINTF("%#x", hp->iph_type);
+			break;
+		}
+		PRINTF(" role = ");
+	} else {
+		PRINTF("Hash Table %s: %s",
+			isdigit(*hp->iph_name) ? "Number" : "Name",
+			hp->iph_name);
+		if ((hp->iph_type & IPHASH_ANON) == IPHASH_ANON)
+			PRINTF("(anon)");
+		putchar(' ');
+		PRINTF("Role: ");
+	}
+
+	switch (hp->iph_unit)
+	{
+	case IPL_LOGNAT :
+		PRINTF("nat");
+		break;
+	case IPL_LOGIPF :
+		PRINTF("ipf");
+		break;
+	case IPL_LOGAUTH :
+		PRINTF("auth");
+		break;
+	case IPL_LOGCOUNT :
+		PRINTF("count");
+		break;
+	default :
+		PRINTF("#%d", hp->iph_unit);
+		break;
+	}
+
+	if ((opts & OPT_DEBUG) == 0) {
+		if ((hp->iph_type & ~IPHASH_ANON) == IPHASH_LOOKUP)
+			PRINTF(" type = hash");
+		PRINTF(" %s = %s size = %lu",
+			isdigit(*hp->iph_name) ? "number" : "name",
+			hp->iph_name, (u_long)hp->iph_size);
+		if (hp->iph_seed != 0)
+			PRINTF(" seed = %lu", hp->iph_seed);
+		putchar('\n');
+	} else {
+		PRINTF(" Type: ");
+		switch (hp->iph_type & ~IPHASH_ANON)
+		{
+		case IPHASH_LOOKUP :
+			PRINTF("lookup");
+			break;
+		case IPHASH_GROUPMAP :
+			PRINTF("groupmap Group. %s", hp->iph_name);
+			break;
+		default :
+			break;
+		}
+
+		putchar('\n');
+		PRINTF("\t\tSize: %lu\tSeed: %lu",
+			(u_long)hp->iph_size, hp->iph_seed);
+		PRINTF("\tRef. Count: %d\tMasks: %#x\n", hp->iph_ref,
+			hp->iph_masks);
+	}
+
+	if ((opts & OPT_DEBUG) != 0) {
+		struct in_addr m;
+		int i;
+
+		for (i = 0; i < 32; i++) {
+			if ((1 << i) & hp->iph_masks) {
+				ntomask(4, i, &m.s_addr);
+				PRINTF("\t\tMask: %s\n", inet_ntoa(m));
+			}
+		}
+	}
+}
diff --git a/contrib/ipfilter/lib/printhashnode.c b/contrib/ipfilter/lib/printhashnode.c
index 05d4df7..9b51af9 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/contrib/ipfilter/lib/printhashnode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -45,6 +45,7 @@ int opts;
 		}
 		putchar(';');
 	}
+
 	ipep = ipe.ipe_next;
 	return ipep;
 }
diff --git a/contrib/ipfilter/lib/printhostmap.c b/contrib/ipfilter/lib/printhostmap.c
index bed0607..92996ed 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/contrib/ipfilter/lib/printhostmap.c
@@ -1,14 +1,20 @@
+/*
+ * Copyright (C) 2002-2005 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: printhostmap.c,v 1.3.2.3 2006/09/30 21:42:07 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 void printhostmap(hmp, hv)
 hostmap_t *hmp;
 u_int hv;
 {
-	struct in_addr in;
 
 	printf("%s,", inet_ntoa(hmp->hm_srcip));
 	printf("%s -> ", inet_ntoa(hmp->hm_dstip));
-	in.s_addr = htonl(hmp->hm_mapip.s_addr);
-	printf("%s ", inet_ntoa(in));
+	printf("%s ", inet_ntoa(hmp->hm_mapip));
 	printf("(use = %d hv = %u)\n", hmp->hm_ref, hv);
 }
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 207e363..105fb20 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/contrib/ipfilter/lib/printhostmask.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printhostmask.c,v 1.8 2002/04/11 15:01:19 darrenr Exp $
+ * $Id: printhostmask.c,v 1.8.4.1 2006/06/16 17:21:12 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printifname.c b/contrib/ipfilter/lib/printifname.c
index 12d46ff..1bfe27d 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/contrib/ipfilter/lib/printifname.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printifname.c,v 1.2 2002/01/28 06:50:47 darrenr Exp $
+ * $Id: printifname.c,v 1.2.4.1 2006/06/16 17:21:12 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printip.c b/contrib/ipfilter/lib/printip.c
index 828e0c1..fb91208 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/contrib/ipfilter/lib/printip.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printip.c,v 1.3 2002/07/13 12:10:27 darrenr Exp $
+ * $Id: printip.c,v 1.3.4.1 2006/06/16 17:21:12 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printlog.c b/contrib/ipfilter/lib/printlog.c
index bf84eee..192c671 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/contrib/ipfilter/lib/printlog.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printlog.c,v 1.6.4.2 2005/12/18 14:49:06 darrenr Exp $
+ * $Id: printlog.c,v 1.6.4.3 2006/06/16 17:21:12 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printmask.c b/contrib/ipfilter/lib/printmask.c
index 18bf46f..27b3e6c 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/contrib/ipfilter/lib/printmask.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printmask.c,v 1.5 2002/06/15 04:48:33 darrenr Exp $
+ * $Id: printmask.c,v 1.5.4.1 2006/06/16 17:21:13 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printnat.c b/contrib/ipfilter/lib/printnat.c
index 8ca4125..da375d9 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/contrib/ipfilter/lib/printnat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
@@ -11,7 +11,7 @@
 
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.11 2005/11/14 17:45:06 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.13 2006/12/09 10:37:47 darrenr Exp $";
 #endif
 
 /*
@@ -46,10 +46,16 @@ int opts;
 		break;
 	}
 
-	printf(" %s", np->in_ifnames[0]);
+	if (!strcmp(np->in_ifnames[0], "-"))
+		printf(" \"%s\"", np->in_ifnames[0]);
+	else
+		printf(" %s", np->in_ifnames[0]);
 	if ((np->in_ifnames[1][0] != '\0') &&
 	    (strncmp(np->in_ifnames[0], np->in_ifnames[1], LIFNAMSIZ) != 0)) {
-		printf(",%s", np->in_ifnames[1]);
+		if (!strcmp(np->in_ifnames[1], "-"))
+			printf(",\"%s\"", np->in_ifnames[1]);
+		else
+			printf(",%s", np->in_ifnames[1]);
 	}
 	putchar(' ');
 
diff --git a/contrib/ipfilter/lib/printpacket.c b/contrib/ipfilter/lib/printpacket.c
index dada8d0..142028a 100644
--- a/contrib/ipfilter/lib/printpacket.c
+++ b/contrib/ipfilter/lib/printpacket.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printpacket.c,v 1.12.4.2 2005/12/04 09:33:06 darrenr Exp $
+ * $Id: printpacket.c,v 1.12.4.4 2006/09/30 21:44:43 darrenr Exp $
  */
 
 #include "ipf.h"
@@ -41,6 +41,7 @@ struct ip *ip;
 			putchar(' ');
 		}
 		putchar('\n');
+		putchar('\n');
 		return;
 	}
 
diff --git a/contrib/ipfilter/lib/printpacket6.c b/contrib/ipfilter/lib/printpacket6.c
index f0147f1..16c807d 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/contrib/ipfilter/lib/printpacket6.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: printpacket6.c,v 1.3.4.1 2006/06/16 17:21:13 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 /*
diff --git a/contrib/ipfilter/lib/printpool.c b/contrib/ipfilter/lib/printpool.c
index 6af4460..cfb1e78 100644
--- a/contrib/ipfilter/lib/printpool.c
+++ b/contrib/ipfilter/lib/printpool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -24,58 +24,12 @@ int opts;
 	if ((name != NULL) && strncmp(name, ipp.ipo_name, FR_GROUPLEN))
 		return ipp.ipo_next;
 
-	if ((opts & OPT_DEBUG) == 0) {
-		if ((ipp.ipo_flags & IPOOL_ANON) != 0)
-			PRINTF("# 'anonymous' tree %s\n", ipp.ipo_name);
-		PRINTF("table role = ");
-	} else {
-		PRINTF("Name: %s", ipp.ipo_name);
-		if ((ipp.ipo_flags & IPOOL_ANON) == IPOOL_ANON)
-			PRINTF("(anon)");
-		putchar(' ');
-		PRINTF("Role: ");
-	}
-
-	switch (ipp.ipo_unit)
-	{
-	case IPL_LOGIPF :
-		printf("ipf");
-		break;
-	case IPL_LOGNAT :
-		printf("nat");
-		break;
-	case IPL_LOGSTATE :
-		printf("state");
-		break;
-	case IPL_LOGAUTH :
-		printf("auth");
-		break;
-	case IPL_LOGSYNC :
-		printf("sync");
-		break;
-	case IPL_LOGSCAN :
-		printf("scan");
-		break;
-	case IPL_LOGLOOKUP :
-		printf("lookup");
-		break;
-	case IPL_LOGCOUNT :
-		printf("count");
-		break;
-	default :
-		printf("unknown(%d)", ipp.ipo_unit);
-	}
+	printpooldata(&ipp, opts);
 
-	if ((opts & OPT_DEBUG) == 0) {
-		PRINTF(" type = tree number = %s\n", ipp.ipo_name);
+	if ((ipp.ipo_flags & IPOOL_DELETE) != 0)
+		PRINTF("# ");
+	if ((opts & OPT_DEBUG) == 0)
 		PRINTF("\t{");
-	} else {
-		putchar(' ');
-
-		PRINTF("\tReferences: %d\tHits: %lu\n", ipp.ipo_ref,
-			ipp.ipo_hits);
-		PRINTF("\tNodes Starting at %p\n", ipp.ipo_list);
-	}
 
 	ipnpn = ipp.ipo_list;
 	ipp.ipo_list = NULL;
diff --git a/contrib/ipfilter/lib/printpool_live.c b/contrib/ipfilter/lib/printpool_live.c
new file mode 100644
index 0000000..0588cfb
--- /dev/null
+++ b/contrib/ipfilter/lib/printpool_live.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ */
+
+#include <sys/ioctl.h>
+#include "ipf.h"
+#include "netinet/ipl.h"
+
+#define	PRINTF	(void)printf
+#define	FPRINTF	(void)fprintf
+
+
+ip_pool_t *printpool_live(pool, fd, name, opts)
+ip_pool_t *pool;
+int fd;
+char *name;
+int opts;
+{
+	ip_pool_node_t entry, *top, *node;
+	ipflookupiter_t iter;
+	int printed, last;
+	ipfobj_t obj;
+
+	if ((name != NULL) && strncmp(name, pool->ipo_name, FR_GROUPLEN))
+		return pool->ipo_next;
+
+	printpooldata(pool, opts);
+
+	if ((pool->ipo_flags & IPOOL_DELETE) != 0)
+		PRINTF("# ");
+	if ((opts & OPT_DEBUG) == 0)
+		PRINTF("\t{");
+
+	obj.ipfo_rev = IPFILTER_VERSION;
+	obj.ipfo_type = IPFOBJ_LOOKUPITER;
+	obj.ipfo_ptr = &iter;
+	obj.ipfo_size = sizeof(iter);
+
+	iter.ili_data = &entry;
+	iter.ili_type = IPLT_POOL;
+	iter.ili_otype = IPFLOOKUPITER_NODE;
+	iter.ili_ival = IPFGENITER_LOOKUP;
+	iter.ili_unit = pool->ipo_unit;
+	strncpy(iter.ili_name, pool->ipo_name, FR_GROUPLEN);
+
+	last = 0;
+	top = NULL;
+	printed = 0;
+
+	while (!last && (ioctl(fd, SIOCLOOKUPITER, &obj) == 0)) {
+		if (entry.ipn_next == NULL)
+			last = 1;
+		entry.ipn_next = top;
+		top = malloc(sizeof(*top));
+		if (top == NULL)
+			break;
+		bcopy(&entry, top, sizeof(entry));
+	}
+
+	while (top != NULL) {
+		node = top;
+		(void) printpoolnode(node, opts);
+		if ((opts & OPT_DEBUG) == 0)
+			putchar(';');
+		top = node->ipn_next;
+		free(node);
+		printed++;
+	}
+
+	if (printed == 0)
+		putchar(';');
+
+	if ((opts & OPT_DEBUG) == 0)
+		PRINTF(" };\n");
+	return pool->ipo_next;
+}
diff --git a/contrib/ipfilter/lib/printpooldata.c b/contrib/ipfilter/lib/printpooldata.c
new file mode 100644
index 0000000..8d8e962
--- /dev/null
+++ b/contrib/ipfilter/lib/printpooldata.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ */
+
+#include "ipf.h"
+
+#define	PRINTF	(void)printf
+#define	FPRINTF	(void)fprintf
+
+void printpooldata(pool, opts)
+ip_pool_t *pool;
+int opts;
+{
+
+	if ((opts & OPT_DEBUG) == 0) {
+		if ((pool->ipo_flags & IPOOL_ANON) != 0)
+			PRINTF("# 'anonymous' tree %s\n", pool->ipo_name);
+		if ((pool->ipo_flags & IPOOL_DELETE) != 0)
+			PRINTF("# ");
+		PRINTF("table role = ");
+	} else {
+		if ((pool->ipo_flags & IPOOL_DELETE) != 0)
+			PRINTF("# ");
+		PRINTF("%s: %s",
+			isdigit(*pool->ipo_name) ? "Number" : "Name",
+			pool->ipo_name);
+		if ((pool->ipo_flags & IPOOL_ANON) == IPOOL_ANON)
+			PRINTF("(anon)");
+		putchar(' ');
+		PRINTF("Role: ");
+	}
+
+	switch (pool->ipo_unit)
+	{
+	case IPL_LOGIPF :
+		printf("ipf");
+		break;
+	case IPL_LOGNAT :
+		printf("nat");
+		break;
+	case IPL_LOGSTATE :
+		printf("state");
+		break;
+	case IPL_LOGAUTH :
+		printf("auth");
+		break;
+	case IPL_LOGSYNC :
+		printf("sync");
+		break;
+	case IPL_LOGSCAN :
+		printf("scan");
+		break;
+	case IPL_LOGLOOKUP :
+		printf("lookup");
+		break;
+	case IPL_LOGCOUNT :
+		printf("count");
+		break;
+	default :
+		printf("unknown(%d)", pool->ipo_unit);
+	}
+
+	if ((opts & OPT_DEBUG) == 0) {
+		PRINTF(" type = tree %s = %s\n",
+			isdigit(*pool->ipo_name) ? "number" : "name",
+			pool->ipo_name);
+	} else {
+		putchar(' ');
+
+		PRINTF("\tReferences: %d\tHits: %lu\n", pool->ipo_ref,
+			pool->ipo_hits);
+		if ((pool->ipo_flags & IPOOL_DELETE) != 0)
+			PRINTF("# ");
+		PRINTF("\tNodes Starting at %p\n", pool->ipo_list);
+	}
+}
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index e2f9536..a53ee33 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/contrib/ipfilter/lib/printpoolnode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -21,11 +21,11 @@ int opts;
 		printip((u_32_t *)&np->ipn_addr.adf_addr.in4);
 		printmask((u_32_t *)&np->ipn_mask.adf_addr);
 	} else {
-		PRINTF("\t\t%s%s", np->ipn_info ? "! " : "",
+		PRINTF("\tAddress: %s%s", np->ipn_info ? "! " : "",
 			inet_ntoa(np->ipn_addr.adf_addr.in4));
 		printmask((u_32_t *)&np->ipn_mask.adf_addr);
-		PRINTF("\n\t\tHits %lu\tName %s\n",
-			np->ipn_hits, np->ipn_name);
+		PRINTF("\t\tHits %lu\tName %s\tRef %d\n",
+			np->ipn_hits, np->ipn_name, np->ipn_ref);
 	}
 	return np->ipn_next;
 }
diff --git a/contrib/ipfilter/lib/printportcmp.c b/contrib/ipfilter/lib/printportcmp.c
index b1ecd36..a820387 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/contrib/ipfilter/lib/printportcmp.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: printportcmp.c,v 1.7 2003/02/16 02:31:05 darrenr Exp $
+ * $Id: printportcmp.c,v 1.7.4.1 2006/06/16 17:21:14 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/printproto.c b/contrib/ipfilter/lib/printproto.c
index dd0ce39..e65ec11 100644
--- a/contrib/ipfilter/lib/printproto.c
+++ b/contrib/ipfilter/lib/printproto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1993-2005 by Darren Reed.
+ * Copyright (C) 2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -8,7 +8,7 @@
 
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printproto.c,v 1.1.2.1 2005/06/12 07:21:53 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: printproto.c,v 1.1.2.2 2006/06/16 17:21:14 darrenr Exp $";
 #endif
 
 
diff --git a/contrib/ipfilter/lib/printsbuf.c b/contrib/ipfilter/lib/printsbuf.c
index b066b58..81f5e0b 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/contrib/ipfilter/lib/printsbuf.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2004 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: printsbuf.c,v 1.2.4.2 2006/06/16 17:21:14 darrenr Exp $ 
+ */     
+
 #ifdef	IPFILTER_SCAN
 
 #include <ctype.h>
diff --git a/contrib/ipfilter/lib/printstate.c b/contrib/ipfilter/lib/printstate.c
index 102b0ea..c1c1442 100644
--- a/contrib/ipfilter/lib/printstate.c
+++ b/contrib/ipfilter/lib/printstate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2002-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
@@ -15,64 +15,64 @@ ipstate_t *sp;
 int opts;
 u_long now;
 {
-	ipstate_t ips;
 	synclist_t ipsync;
 
-	if (kmemcpy((char *)&ips, (u_long)sp, sizeof(ips)))
-		return NULL;
-
-	PRINTF("%s -> ", hostname(ips.is_v, &ips.is_src.in4));
-	PRINTF("%s pass %#x pr %d state %d/%d bkt %d\n",
-		hostname(ips.is_v, &ips.is_dst.in4), ips.is_pass, ips.is_p,
-		ips.is_state[0], ips.is_state[1], ips.is_hv);
-	PRINTF("\ttag %u ttl %lu", ips.is_tag, ips.is_die - now);
+	if (sp->is_phnext == NULL)
+		PRINTF("ORPHAN ");
+	PRINTF("%s -> ", hostname(sp->is_v, &sp->is_src.in4));
+	PRINTF("%s pass %#x pr %d state %d/%d",
+		hostname(sp->is_v, &sp->is_dst.in4), sp->is_pass, sp->is_p,
+		sp->is_state[0], sp->is_state[1]);
+	if (opts & OPT_DEBUG)
+		PRINTF(" bkt %d ref %d", sp->is_hv, sp->is_ref);
+	PRINTF("\n\ttag %u ttl %lu", sp->is_tag, sp->is_die - now);
 
-	if (ips.is_p == IPPROTO_TCP) {
+	if (sp->is_p == IPPROTO_TCP) {
 		PRINTF("\n\t%hu -> %hu %x:%x %hu<<%d:%hu<<%d\n",
-			ntohs(ips.is_sport), ntohs(ips.is_dport),
-			ips.is_send, ips.is_dend,
-			ips.is_maxswin, ips.is_swinscale,
-			ips.is_maxdwin, ips.is_dwinscale);
+			ntohs(sp->is_sport), ntohs(sp->is_dport),
+			sp->is_send, sp->is_dend,
+			sp->is_maxswin, sp->is_swinscale,
+			sp->is_maxdwin, sp->is_dwinscale);
 		PRINTF("\tcmsk %04x smsk %04x isc %p s0 %08x/%08x\n",
-			ips.is_smsk[0], ips.is_smsk[1], ips.is_isc,
-			ips.is_s0[0], ips.is_s0[1]);
+			sp->is_smsk[0], sp->is_smsk[1], sp->is_isc,
+			sp->is_s0[0], sp->is_s0[1]);
 		PRINTF("\tFWD:ISN inc %x sumd %x\n",
-			ips.is_isninc[0], ips.is_sumd[0]);
+			sp->is_isninc[0], sp->is_sumd[0]);
 		PRINTF("\tREV:ISN inc %x sumd %x\n",
-			ips.is_isninc[1], ips.is_sumd[1]);
+			sp->is_isninc[1], sp->is_sumd[1]);
 #ifdef	IPFILTER_SCAN
 		PRINTF("\tsbuf[0] [");
-		printsbuf(ips.is_sbuf[0]);
+		printsbuf(sp->is_sbuf[0]);
 		PRINTF("] sbuf[1] [");
-		printsbuf(ips.is_sbuf[1]);
+		printsbuf(sp->is_sbuf[1]);
 		PRINTF("]\n");
 #endif
-	} else if (ips.is_p == IPPROTO_UDP) {
-		PRINTF(" %hu -> %hu\n", ntohs(ips.is_sport),
-			ntohs(ips.is_dport));
-	} else if (ips.is_p == IPPROTO_GRE) {
-		PRINTF(" call %hx/%hx\n", ntohs(ips.is_gre.gs_call[0]),
-		       ntohs(ips.is_gre.gs_call[1]));
-	} else if (ips.is_p == IPPROTO_ICMP
+	} else if (sp->is_p == IPPROTO_UDP) {
+		PRINTF(" %hu -> %hu\n", ntohs(sp->is_sport),
+			ntohs(sp->is_dport));
+	} else if (sp->is_p == IPPROTO_GRE) {
+		PRINTF(" call %hx/%hx\n", ntohs(sp->is_gre.gs_call[0]),
+		       ntohs(sp->is_gre.gs_call[1]));
+	} else if (sp->is_p == IPPROTO_ICMP
 #ifdef	USE_INET6
-		 || ips.is_p == IPPROTO_ICMPV6
+		 || sp->is_p == IPPROTO_ICMPV6
 #endif
 		)
-		PRINTF(" id %hu seq %hu type %d\n", ips.is_icmp.ici_id,
-			ips.is_icmp.ici_seq, ips.is_icmp.ici_type);
+		PRINTF(" id %hu seq %hu type %d\n", sp->is_icmp.ici_id,
+			sp->is_icmp.ici_seq, sp->is_icmp.ici_type);
 
 #ifdef        USE_QUAD_T
 	PRINTF("\tforward: pkts in %qd bytes in %qd pkts out %qd bytes out %qd\n\tbackward: pkts in %qd bytes in %qd pkts out %qd bytes out %qd\n",
-		ips.is_pkts[0], ips.is_bytes[0],
-		ips.is_pkts[1], ips.is_bytes[1],
-		ips.is_pkts[2], ips.is_bytes[2],
-		ips.is_pkts[3], ips.is_bytes[3]);
+		sp->is_pkts[0], sp->is_bytes[0],
+		sp->is_pkts[1], sp->is_bytes[1],
+		sp->is_pkts[2], sp->is_bytes[2],
+		sp->is_pkts[3], sp->is_bytes[3]);
 #else
 	PRINTF("\tforward: pkts in %ld bytes in %ld pkts out %ld bytes out %ld\n\tbackward: pkts in %ld bytes in %ld pkts out %ld bytes out %ld\n",
-		ips.is_pkts[0], ips.is_bytes[0],
-		ips.is_pkts[1], ips.is_bytes[1],
-		ips.is_pkts[2], ips.is_bytes[2],
-		ips.is_pkts[3], ips.is_bytes[3]);
+		sp->is_pkts[0], sp->is_bytes[0],
+		sp->is_pkts[1], sp->is_bytes[1],
+		sp->is_pkts[2], sp->is_bytes[2],
+		sp->is_pkts[3], sp->is_bytes[3]);
 #endif
 
 	PRINTF("\t");
@@ -81,11 +81,11 @@ u_long now;
 	 * Print out bits set in the result code for the state being
 	 * kept as they would for a rule.
 	 */
-	if (FR_ISPASS(ips.is_pass)) {
+	if (FR_ISPASS(sp->is_pass)) {
 		PRINTF("pass");
-	} else if (FR_ISBLOCK(ips.is_pass)) {
+	} else if (FR_ISBLOCK(sp->is_pass)) {
 		PRINTF("block");
-		switch (ips.is_pass & FR_RETMASK)
+		switch (sp->is_pass & FR_RETMASK)
 		{
 		case FR_RETICMP :
 			PRINTF(" return-icmp");
@@ -99,77 +99,77 @@ u_long now;
 		default :
 			break;
 		}
-	} else if ((ips.is_pass & FR_LOGMASK) == FR_LOG) {
+	} else if ((sp->is_pass & FR_LOGMASK) == FR_LOG) {
 			PRINTF("log");
-		if (ips.is_pass & FR_LOGBODY)
+		if (sp->is_pass & FR_LOGBODY)
 			PRINTF(" body");
-		if (ips.is_pass & FR_LOGFIRST)
+		if (sp->is_pass & FR_LOGFIRST)
 			PRINTF(" first");
-	} else if (FR_ISACCOUNT(ips.is_pass)) {
+	} else if (FR_ISACCOUNT(sp->is_pass)) {
 		PRINTF("count");
-	} else if (FR_ISPREAUTH(ips.is_pass)) {
+	} else if (FR_ISPREAUTH(sp->is_pass)) {
 		PRINTF("preauth");
-	} else if (FR_ISAUTH(ips.is_pass))
+	} else if (FR_ISAUTH(sp->is_pass))
 		PRINTF("auth");
 
-	if (ips.is_pass & FR_OUTQUE)
+	if (sp->is_pass & FR_OUTQUE)
 		PRINTF(" out");
 	else
 		PRINTF(" in");
 
-	if ((ips.is_pass & FR_LOG) != 0) {
+	if ((sp->is_pass & FR_LOG) != 0) {
 		PRINTF(" log");
-		if (ips.is_pass & FR_LOGBODY)
+		if (sp->is_pass & FR_LOGBODY)
 			PRINTF(" body");
-		if (ips.is_pass & FR_LOGFIRST)
+		if (sp->is_pass & FR_LOGFIRST)
 			PRINTF(" first");
-		if (ips.is_pass & FR_LOGORBLOCK)
+		if (sp->is_pass & FR_LOGORBLOCK)
 			PRINTF(" or-block");
 	}
-	if (ips.is_pass & FR_QUICK)
+	if (sp->is_pass & FR_QUICK)
 		PRINTF(" quick");
-	if (ips.is_pass & FR_KEEPFRAG)
+	if (sp->is_pass & FR_KEEPFRAG)
 		PRINTF(" keep frags");
 	/* a given; no? */
-	if (ips.is_pass & FR_KEEPSTATE) {
+	if (sp->is_pass & FR_KEEPSTATE) {
 		PRINTF(" keep state");
-		if (ips.is_pass & FR_STATESYNC)	
+		if (sp->is_pass & FR_STATESYNC)	
 			PRINTF(" ( sync )");
 	}
-	PRINTF("\tIPv%d", ips.is_v);
+	PRINTF("\tIPv%d", sp->is_v);
 	PRINTF("\n");
 
 	PRINTF("\tpkt_flags & %x(%x) = %x,\t",
-		ips.is_flags & 0xf, ips.is_flags,
-		ips.is_flags >> 4);
-	PRINTF("\tpkt_options & %x = %x, %x = %x \n", ips.is_optmsk[0],
-		ips.is_opt[0], ips.is_optmsk[1], ips.is_opt[1]);
+		sp->is_flags & 0xf, sp->is_flags,
+		sp->is_flags >> 4);
+	PRINTF("\tpkt_options & %x = %x, %x = %x \n", sp->is_optmsk[0],
+		sp->is_opt[0], sp->is_optmsk[1], sp->is_opt[1]);
 	PRINTF("\tpkt_security & %x = %x, pkt_auth & %x = %x\n",
-		ips.is_secmsk, ips.is_sec, ips.is_authmsk,
-		ips.is_auth);
-	PRINTF("\tis_flx %#x %#x %#x %#x\n", ips.is_flx[0][0], ips.is_flx[0][1],
-	       ips.is_flx[1][0], ips.is_flx[1][1]);
-	PRINTF("\tinterfaces: in %s[%s", getifname(ips.is_ifp[0]),
-		ips.is_ifname[0]);
+		sp->is_secmsk, sp->is_sec, sp->is_authmsk,
+		sp->is_auth);
+	PRINTF("\tis_flx %#x %#x %#x %#x\n", sp->is_flx[0][0], sp->is_flx[0][1],
+	       sp->is_flx[1][0], sp->is_flx[1][1]);
+	PRINTF("\tinterfaces: in %s[%s", getifname(sp->is_ifp[0]),
+		sp->is_ifname[0]);
 	if (opts & OPT_DEBUG)
-		PRINTF("/%p", ips.is_ifp[0]);
+		PRINTF("/%p", sp->is_ifp[0]);
 	putchar(']');
-	PRINTF(",%s[%s", getifname(ips.is_ifp[1]), ips.is_ifname[1]);
+	PRINTF(",%s[%s", getifname(sp->is_ifp[1]), sp->is_ifname[1]);
 	if (opts & OPT_DEBUG)
-		PRINTF("/%p", ips.is_ifp[1]);
+		PRINTF("/%p", sp->is_ifp[1]);
 	putchar(']');
-	PRINTF(" out %s[%s", getifname(ips.is_ifp[2]), ips.is_ifname[2]);
+	PRINTF(" out %s[%s", getifname(sp->is_ifp[2]), sp->is_ifname[2]);
 	if (opts & OPT_DEBUG)
-		PRINTF("/%p", ips.is_ifp[2]);
+		PRINTF("/%p", sp->is_ifp[2]);
 	putchar(']');
-	PRINTF(",%s[%s", getifname(ips.is_ifp[3]), ips.is_ifname[3]);
+	PRINTF(",%s[%s", getifname(sp->is_ifp[3]), sp->is_ifname[3]);
 	if (opts & OPT_DEBUG)
-		PRINTF("/%p", ips.is_ifp[3]);
+		PRINTF("/%p", sp->is_ifp[3]);
 	PRINTF("]\n");
 
-	if (ips.is_sync != NULL) {
+	if (sp->is_sync != NULL) {
 
-		if (kmemcpy((char *)&ipsync, (u_long)ips.is_sync, sizeof(ipsync))) {
+		if (kmemcpy((char *)&ipsync, (u_long)sp->is_sync, sizeof(ipsync))) {
 	
 			PRINTF("\tSync status: status could not be retrieved\n");
 			return NULL;
@@ -183,5 +183,5 @@ u_long now;
 		PRINTF("\tSync status: not synchronized\n");
 	}
 
-	return ips.is_next;
+	return sp->is_next;
 }
diff --git a/contrib/ipfilter/lib/printtqtable.c b/contrib/ipfilter/lib/printtqtable.c
new file mode 100644
index 0000000..67adb53
--- /dev/null
+++ b/contrib/ipfilter/lib/printtqtable.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2007 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ */
+
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include "ipf.h"
+
+
+void printtqtable(table)
+ipftq_t *table;
+{
+	int i;
+
+	printf("TCP Entries per state\n");
+	for (i = 0; i < IPF_TCP_NSTATES; i++)
+		printf(" %5d", i);
+	printf("\n");
+
+	for (i = 0; i < IPF_TCP_NSTATES; i++)
+		printf(" %5d", table[i].ifq_ref - 1);
+	printf("\n");
+}
diff --git a/contrib/ipfilter/lib/printtunable.c b/contrib/ipfilter/lib/printtunable.c
index 5c26851..dcf9f85 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/contrib/ipfilter/lib/printtunable.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2003 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: printtunable.c,v 1.1.4.1 2006/06/16 17:21:15 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 void printtunable(tup)
diff --git a/contrib/ipfilter/lib/remove_hash.c b/contrib/ipfilter/lib/remove_hash.c
index d1830ac..55dab91 100644
--- a/contrib/ipfilter/lib/remove_hash.c
+++ b/contrib/ipfilter/lib/remove_hash.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: remove_hash.c,v 1.1 2003/04/13 06:40:14 darrenr Exp $
+ * $Id: remove_hash.c,v 1.1.4.1 2006/06/16 17:21:16 darrenr Exp $
  */
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/contrib/ipfilter/lib/remove_hashnode.c
index afa0dbc..d51f8ab 100644
--- a/contrib/ipfilter/lib/remove_hashnode.c
+++ b/contrib/ipfilter/lib/remove_hashnode.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: remove_hashnode.c,v 1.1 2003/04/13 06:40:14 darrenr Exp $
+ * $Id: remove_hashnode.c,v 1.1.4.1 2006/06/16 17:21:16 darrenr Exp $
  */
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/remove_pool.c b/contrib/ipfilter/lib/remove_pool.c
index d14529a..19ab4c6 100644
--- a/contrib/ipfilter/lib/remove_pool.c
+++ b/contrib/ipfilter/lib/remove_pool.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: remove_pool.c,v 1.1 2003/04/13 06:40:14 darrenr Exp $
+ * $Id: remove_pool.c,v 1.1.4.1 2006/06/16 17:21:16 darrenr Exp $
  */
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/contrib/ipfilter/lib/remove_poolnode.c
index 2c7f9d3..ad04b23 100644
--- a/contrib/ipfilter/lib/remove_poolnode.c
+++ b/contrib/ipfilter/lib/remove_poolnode.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: remove_poolnode.c,v 1.3 2003/11/22 10:14:36 darrenr Exp $
+ * $Id: remove_poolnode.c,v 1.3.2.1 2006/06/16 17:21:16 darrenr Exp $
  */
 
 #include <fcntl.h>
diff --git a/contrib/ipfilter/lib/resetlexer.c b/contrib/ipfilter/lib/resetlexer.c
index d16a05e..ab9b82e 100644
--- a/contrib/ipfilter/lib/resetlexer.c
+++ b/contrib/ipfilter/lib/resetlexer.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: resetlexer.c,v 1.1.4.1 2006/06/16 17:21:16 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 long	string_start = -1;
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/contrib/ipfilter/lib/rwlock_emul.c
index 3bccd9a..1f0c3a8 100644
--- a/contrib/ipfilter/lib/rwlock_emul.c
+++ b/contrib/ipfilter/lib/rwlock_emul.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2003 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: rwlock_emul.c,v 1.1.4.1 2006/06/16 17:21:17 darrenr Exp $ 
+ */     
+
 #include "ipf.h"
 
 #define	EMM_MAGIC	0x97dd8b3a
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/contrib/ipfilter/lib/tcp_flags.c
index 9c33da9..67b7dad 100644
--- a/contrib/ipfilter/lib/tcp_flags.c
+++ b/contrib/ipfilter/lib/tcp_flags.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2004 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: tcp_flags.c,v 1.8 2004/02/07 18:15:54 darrenr Exp $
+ * $Id: tcp_flags.c,v 1.8.2.1 2006/06/16 17:21:17 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/tcpflags.c b/contrib/ipfilter/lib/tcpflags.c
index d4d6145..bf2c284 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/contrib/ipfilter/lib/tcpflags.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2001-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: tcpflags.c,v 1.3 2002/11/02 07:18:01 darrenr Exp $
+ * $Id: tcpflags.c,v 1.3.4.1 2006/06/16 17:21:17 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/contrib/ipfilter/lib/tcpoptnames.c
index 39f3dbb..7c03736 100644
--- a/contrib/ipfilter/lib/tcpoptnames.c
+++ b/contrib/ipfilter/lib/tcpoptnames.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2002 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: tcpoptnames.c,v 1.5 2002/01/28 06:50:48 darrenr Exp $
+ * $Id: tcpoptnames.c,v 1.5.4.1 2006/06/16 17:21:17 darrenr Exp $
  */
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/v6ionames.c b/contrib/ipfilter/lib/v6ionames.c
index c89e27c..97c20b0 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/contrib/ipfilter/lib/v6ionames.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2003-2005 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: v6ionames.c,v 1.1.4.2 2005/10/17 18:31:09 darrenr Exp $
+ * $Id: v6ionames.c,v 1.1.4.3 2006/06/16 17:21:18 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/contrib/ipfilter/lib/v6optvalue.c
index fd8e2e2..6123fc2 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/contrib/ipfilter/lib/v6optvalue.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2003 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: v6optvalue.c,v 1.1 2003/04/26 04:55:58 darrenr Exp $
+ * $Id: v6optvalue.c,v 1.1.4.1 2006/06/16 17:21:18 darrenr Exp $
  */
 #include "ipf.h"
 
diff --git a/contrib/ipfilter/lib/var.c b/contrib/ipfilter/lib/var.c
index 37d310b..3d90a23 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/contrib/ipfilter/lib/var.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2002-2004 by Darren Reed.
+ * 
+ * See the IPFILTER.LICENCE file for details on licencing.  
+ *   
+ * $Id: var.c,v 1.4.2.3 2006/06/16 17:21:18 darrenr Exp $ 
+ */     
+
 #include <ctype.h>
 
 #include "ipf.h"
diff --git a/contrib/ipfilter/lib/verbose.c b/contrib/ipfilter/lib/verbose.c
index e386038..4a856b0 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/contrib/ipfilter/lib/verbose.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 1993-2001 by Darren Reed.
+ * Copyright (C) 2000-2001 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: verbose.c,v 1.6 2001/06/09 17:09:25 darrenr Exp $
+ * $Id: verbose.c,v 1.6.4.1 2006/06/16 17:21:18 darrenr Exp $
  */
 
 #if defined(__STDC__)
-- 
cgit v1.1