rename to libnetfilter_conntrack

17 files changed, 0 insertions, 2798 deletions

diff --git a/_conntrack/COPYING b/_conntrack/COPYING
deleted file mode 100644
index a43ea21..0000000
--- a/_conntrack/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/_conntrack/Makefile.am b/_conntrack/Makefile.am
deleted file mode 100644
index 4cecdaf..0000000
--- a/_conntrack/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
-
-INCLUDES =$(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
-SUBDIRS	= include src extensions
-LINKOPTS = -lnfnetlink
-
-man_MANS = #nfnetlink_conntrack.3 nfnetlink_conntrack.7
-
-$(OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
diff --git a/_conntrack/autogen.sh b/_conntrack/autogen.sh
deleted file mode 100755
index 4999b58..0000000
--- a/_conntrack/autogen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-run ()
-{
-    echo "running: $*"
-    eval $*
-
-    if test $? != 0 ; then
-	echo "error: while running '$*'"
-	exit 1
-    fi
-}
-
-run aclocal-1.6
-#run autoheader
-run automake-1.6 -a
-run autoconf
diff --git a/_conntrack/configure.in b/_conntrack/configure.in
deleted file mode 100644
index a2b8468..0000000
--- a/_conntrack/configure.in
+++ /dev/null
@@ -1,72 +0,0 @@
-dnl Process this file with autoconf to create configure.
-
-AC_INIT
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.20)
-
-AC_PROG_CC
-AM_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-AC_SUBST(LIBTOOL_DEPS)
-
-case $target in 
-*-*-linux*) ;;
-*) AC_MSG_ERROR([Linux only, dude!]);;
-esac
-
-AC_CHECK_LIB([nfnetlink], [nfnl_listen])
-
-
-
-dnl--------------------------------
-
-AC_DEFUN([NF_KERNEL_SOURCE],[
-    
-  if test "$with_kernel" = ""; then
-    KERNEL="`uname -r`"
-  else
-    KERNEL="$with_kernel"
-  fi
-
-  THIS_PREFIX=""
-  for i in "/lib/modules/$KERNEL/build/include" "$KERNEL" "$KERNEL/include" "/usr/src/linux-$KERNEL" "/usr/src/kernel-$KERNEL" "/usr/src/linux-headers-$KERNEL" "/usr/src/kernel-headers-$KERNEL"
-  do  
-    AC_MSG_CHECKING([Looking for kernel source or headers in $i])
-    if test -r "$i/linux/config.h"
-    then
-      THIS_PREFIX="$i"
-      AC_MSG_RESULT([found])
-      break
-    fi
-    AC_MSG_RESULT([ ])    
-  done
-  if test -r "$THIS_PREFIX/linux/config.h" ; then
-    AC_SUBST(KERNELDIR,[$THIS_PREFIX])
-    AC_MSG_RESULT([found])
-  else
-    AC_MSG_ERROR([not found $THIS_PREFIX])  
-  fi
-
-  # somehow add this as an include path
-])
-
-AC_ARG_WITH(kernel,
-               AC_HELP_STRING([--with-kernel=DIR],
-                              [ Show location of kernel source. Default is to use uname -r and look in /lib/modules/KERNEL/build/include. ]),
-	       NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE())
-
-if test ! -z "$libdir"; then
-	MODULE_DIR="\\\"$libdir/\\\""
-	CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR"
-fi
-
-dnl--------------------------------
-
-
-dnl Output the makefile
-AC_OUTPUT(Makefile src/Makefile include/Makefile utils/Makefile include/libnetfilter_conntrack/Makefile extensions/Makefile)
-
diff --git a/_conntrack/extensions/Makefile.am b/_conntrack/extensions/Makefile.am
deleted file mode 100644
index c06e9f6..0000000
--- a/_conntrack/extensions/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-EXTRA_DIST = $(man_MANS) acinclude.m4
-
-man_MANS =
-
-INCLUDES=-I../include -I${KERNELDIR}
-CFLAGS=-fPIC -Wall
-LIBS=
-
-lib_LTLIBRARIES = libnetfilter_conntrack_tcp.la libnetfilter_conntrack_udp.la libnetfilter_conntrack_icmp.la libnetfilter_conntrack_sctp.la
-
-libnetfilter_conntrack_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c 
-libnetfilter_conntrack_udp_la_SOURCES = libnetfilter_conntrack_udp.c
-libnetfilter_conntrack_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
-libnetfilter_conntrack_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
diff --git a/_conntrack/extensions/libnetfilter_conntrack_icmp.c b/_conntrack/extensions/libnetfilter_conntrack_icmp.c
deleted file mode 100644
index 38ad41a..0000000
--- a/_conntrack/extensions/libnetfilter_conntrack_icmp.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- */
-#include <stdio.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netinet/in.h> /* For htons */
-#include <linux/netfilter/nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-
-void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
-{
-	if (cda[CTA_PROTO_ICMP_TYPE-1])
-		tuple->l4dst.icmp.type =
-			*(u_int8_t *)NFA_DATA(cda[CTA_PROTO_ICMP_TYPE-1]);
-
-	if (cda[CTA_PROTO_ICMP_CODE-1])
-		tuple->l4dst.icmp.code =
-			*(u_int8_t *)NFA_DATA(cda[CTA_PROTO_ICMP_CODE-1]);
-
-	if (cda[CTA_PROTO_ICMP_ID-1])
-		tuple->l4src.icmp.id =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_ICMP_ID-1]);
-}
-
-int print_proto(char *buf, struct nfct_tuple *t)
-{
-	int size = 0;
-	
-	size += sprintf(buf, "type=%d code=%d ", t->l4dst.icmp.type,
-					         t->l4dst.icmp.code);
-	/* ID only makes sense with ECHO */
-	if (t->l4dst.icmp.type == 8)
-		size += sprintf(buf, "id=%d ", t->l4src.icmp.id);
-
-	return size;
-}
-
-static struct nfct_proto icmp = {
-	.name 			= "icmp",
-	.protonum		= IPPROTO_ICMP,
-	.parse_proto		= parse_proto,
-	.print_proto		= print_proto,
-	.version		= LIBNETFILTER_CONNTRACK_VERSION
-};
-
-void __attribute__ ((constructor)) init(void);
-void __attribute__ ((destructor)) fini(void);
-
-void init(void)
-{
-	nfct_register_proto(&icmp);
-}
-
-void fini(void)
-{
-	nfct_unregister_proto(&icmp);
-}
diff --git a/_conntrack/extensions/libnetfilter_conntrack_sctp.c b/_conntrack/extensions/libnetfilter_conntrack_sctp.c
deleted file mode 100644
index a42a6c8..0000000
--- a/_conntrack/extensions/libnetfilter_conntrack_sctp.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- */
-#include <stdio.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netinet/in.h> /* For htons */
-#include <linux/netfilter/nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-
-void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
-{
-	if (cda[CTA_PROTO_SRC_PORT-1])
-		tuple->l4src.sctp.port =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_SRC_PORT-1]);
-	if (cda[CTA_PROTO_DST_PORT-1])
-		tuple->l4dst.sctp.port =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_DST_PORT-1]);
-}
-
-void parse_protoinfo(struct nfattr *cda[], struct nfct_conntrack *ct)
-{
-/*	if (cda[CTA_PROTOINFO_SCTP_STATE-1])
-                ct->protoinfo.sctp.state =
-                        *(u_int8_t *)NFA_DATA(cda[CTA_PROTOINFO_SCTP_STATE-1]);
-*/
-}
-
-int print_protoinfo(char *buf, union nfct_protoinfo *protoinfo)
-{
-/*	fprintf(stdout, "%s ", states[protoinfo->sctp.state]); */
-	return 0;
-}
-
-int print_proto(char *buf, struct nfct_tuple *tuple)
-{
-	return(sprintf(buf, "sport=%u dport=%u ", htons(tuple->l4src.sctp.port),
-						  htons(tuple->l4dst.sctp.port)));
-}
-
-static struct nfct_proto sctp = {
-	.name 			= "sctp",
-	.protonum		= IPPROTO_SCTP,
-	.parse_proto		= parse_proto,
-	.parse_protoinfo	= parse_protoinfo,
-	.print_proto		= print_proto,
-	.print_protoinfo	= print_protoinfo,
-	.version		= LIBNETFILTER_CONNTRACK_VERSION
-};
-
-void __attribute__ ((constructor)) init(void);
-void __attribute__ ((destructor)) fini(void);
-
-void init(void)
-{
-	nfct_register_proto(&sctp);
-}
-
-void fini(void)
-{
-	nfct_unregister_proto(&sctp);
-}
diff --git a/_conntrack/extensions/libnetfilter_conntrack_tcp.c b/_conntrack/extensions/libnetfilter_conntrack_tcp.c
deleted file mode 100644
index 5b53fd1..0000000
--- a/_conntrack/extensions/libnetfilter_conntrack_tcp.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- */
-#include <stdio.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netinet/in.h> /* For htons */
-#include <linux/netfilter/nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-
-static const char *states[] = {
-	"NONE",
-	"SYN_SENT",
-	"SYN_RECV",
-	"ESTABLISHED",
-	"FIN_WAIT",
-	"CLOSE_WAIT",
-	"LAST_ACK",
-	"TIME_WAIT",
-	"CLOSE",
-	"LISTEN"
-};
-
-void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
-{
-	if (cda[CTA_PROTO_SRC_PORT-1])
-		tuple->l4src.tcp.port =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_SRC_PORT-1]);
-	if (cda[CTA_PROTO_DST_PORT-1])
-		tuple->l4dst.tcp.port =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_DST_PORT-1]);
-}
-
-void parse_protoinfo(struct nfattr *cda[], struct nfct_conntrack *ct)
-{
-	struct nfattr *tb[CTA_PROTOINFO_TCP_MAX];
-	
-	nfnl_parse_nested(tb,CTA_PROTOINFO_TCP_MAX, cda[CTA_PROTOINFO_TCP-1]);
-	
-	if (tb[CTA_PROTOINFO_TCP_STATE-1])
-                ct->protoinfo.tcp.state =
-                        *(u_int8_t *)NFA_DATA(tb[CTA_PROTOINFO_TCP_STATE-1]);
-}
-
-int print_protoinfo(char *buf, union nfct_protoinfo *protoinfo)
-{
-	return(sprintf(buf, "%s ", states[protoinfo->tcp.state]));
-}
-
-int print_proto(char *buf, struct nfct_tuple *tuple)
-{
-	return(sprintf(buf, "sport=%u dport=%u ", htons(tuple->l4src.tcp.port),
-					          htons(tuple->l4dst.tcp.port)));
-}
-
-static struct nfct_proto tcp = {
-	.name 			= "tcp",
-	.protonum		= IPPROTO_TCP,
-	.parse_protoinfo	= parse_protoinfo,
-	.parse_proto		= parse_proto,
-	.print_protoinfo	= print_protoinfo,
-	.print_proto		= print_proto,
-	.version		= LIBNETFILTER_CONNTRACK_VERSION
-};
-
-void __attribute__ ((constructor)) init(void);
-void __attribute__ ((destructor)) fini(void);
-
-void init(void)
-{
-	nfct_register_proto(&tcp);
-}
-
-void fini(void)
-{
-	nfct_unregister_proto(&tcp);
-}
diff --git a/_conntrack/extensions/libnetfilter_conntrack_udp.c b/_conntrack/extensions/libnetfilter_conntrack_udp.c
deleted file mode 100644
index de7c9f7..0000000
--- a/_conntrack/extensions/libnetfilter_conntrack_udp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- */
-#include <stdio.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netinet/in.h> /* For htons */
-#include <linux/netfilter/nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-
-void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
-{
-	if (cda[CTA_PROTO_SRC_PORT-1])
-		tuple->l4src.udp.port =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_SRC_PORT-1]);
-	if (cda[CTA_PROTO_DST_PORT-1])
-		tuple->l4dst.udp.port =
-			*(u_int16_t *)NFA_DATA(cda[CTA_PROTO_DST_PORT-1]);
-}
-
-int print_proto(char *buf, struct nfct_tuple *tuple)
-{
-	return (sprintf(buf, "sport=%u dport=%u ", htons(tuple->l4src.udp.port),
-					           htons(tuple->l4dst.udp.port)));
-}
-
-static struct nfct_proto udp = {
-	.name 			= "udp",
-	.protonum		= IPPROTO_UDP,
-	.parse_proto		= parse_proto,
-	.print_proto		= print_proto,
-	.version		= LIBNETFILTER_CONNTRACK_VERSION,
-};
-
-void __attribute__ ((constructor)) init(void);
-void __attribute__ ((destructor)) fini(void);
-
-void init(void)
-{
-	nfct_register_proto(&udp);
-}
-
-void fini(void)
-{
-	nfct_unregister_proto(&udp);
-}
diff --git a/_conntrack/include/Makefile.am b/_conntrack/include/Makefile.am
deleted file mode 100644
index 93416b9..0000000
--- a/_conntrack/include/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIRS = libnetfilter_conntrack
diff --git a/_conntrack/include/libnetfilter_conntrack/Makefile.am b/_conntrack/include/libnetfilter_conntrack/Makefile.am
deleted file mode 100644
index a6f4617..0000000
--- a/_conntrack/include/libnetfilter_conntrack/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pkginclude_HEADERS = libnetfilter_conntrack.h
diff --git a/_conntrack/include/libnetfilter_conntrack/libnfnetlink_conntrack.h b/_conntrack/include/libnetfilter_conntrack/libnfnetlink_conntrack.h
deleted file mode 100644
index 954b3e2..0000000
--- a/_conntrack/include/libnetfilter_conntrack/libnfnetlink_conntrack.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* libctnetlink.h: Header file for the Connection Tracking library.
- *
- * Jay Schulist <jschlst@samba.org>, Copyright (c) 2001.
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
- * (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net>
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- */
-
-#ifndef __LIBCTNETLINK_H
-#define __LIBCTNETLINK_H
-
-#include <netinet/in.h>
-#include <asm/types.h>
-#include <linux/if.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_conntrack.h> 
-
-/* we need this for "enum ip_conntrack_status" */
-#include <linux/netfilter_ipv4/ip_conntrack.h>
-
-#include <libnfnetlink/libnfnetlink.h>
-
-#define CTNL_BUFFSIZE	4096
-
-union ctnl_l4 {
-	/* Add other protocols here. */
-	u_int16_t all;
-	struct {
-		u_int16_t port;
-	} tcp;
-	struct {
-		u_int16_t port;
-	} udp;
-	struct {
-		u_int8_t type, code;
-		u_int16_t id;
-	} icmp;
-	struct {
-		u_int16_t port;
-	} sctp;
-};
-
-struct ctnl_tuple {
-	union {
-		u_int32_t v4;
-		u_int64_t v6;
-	} src;
-
-	union {
-		u_int32_t v4;
-		u_int64_t v6;
-	} dst;
-
-	u_int8_t protonum;
-	union ctnl_l4 l4src;
-	union ctnl_l4 l4dst;
-};
-
-union ctnl_protoinfo {
-	struct {
-		u_int8_t state;
-	} tcp;
-};
-
-struct ctnl_counters {
-	u_int64_t packets;
-	u_int64_t bytes;
-};
-
-struct ctnl_nat {
-	u_int32_t min_ip, max_ip;
-	union ctnl_l4 l4min, l4max;
-};
-
-#define CTNL_DIR_ORIGINAL 0
-#define CTNL_DIR_REPLY 1
-#define CTNL_DIR_MAX CTNL_DIR_REPLY+1
-
-struct ctnl_conntrack {
-	struct ctnl_tuple tuple[CTNL_DIR_MAX];
-	
-	unsigned long 	timeout;
-	unsigned long	mark;
-	unsigned int 	status;
-	unsigned int	use;
-	unsigned int	id;
-
-	union ctnl_protoinfo protoinfo;
-	struct ctnl_counters counters[CTNL_DIR_MAX];
-	struct ctnl_nat nat;
-};
-
-struct ctnl_msg_handler {
-	int type;
-	int (*handler)(struct sockaddr_nl *, struct nlmsghdr *, void *arg);
-};
-
-struct ctnl_handle {
-	struct nfnl_handle nfnlh;
-	struct ctnl_msg_handler *handler[IPCTNL_MSG_MAX];
-};
-
-extern int ctnl_open(struct ctnl_handle *, u_int8_t, unsigned);
-extern int ctnl_close(struct ctnl_handle *);
-extern int ctnl_unregister_handler(struct ctnl_handle *, int);
-extern int ctnl_register_handler(struct ctnl_handle *, 
-				 struct ctnl_msg_handler *);
-extern int ctnl_new_conntrack(struct ctnl_handle *, struct ctnl_conntrack *);
-extern int ctnl_upd_conntrack(struct ctnl_handle *, struct ctnl_conntrack *);
-extern int ctnl_get_conntrack(struct ctnl_handle *, struct ctnl_tuple *, int);
-extern int ctnl_del_conntrack(struct ctnl_handle *, struct ctnl_tuple *, int);
-extern int ctnl_list_conntrack(struct ctnl_handle *, int);
-extern int ctnl_list_conntrack_zero_counters(struct ctnl_handle *, int);
-extern int ctnl_event_conntrack(struct ctnl_handle *, int);
-extern int ctnl_flush_conntrack(struct ctnl_handle *);
-
-extern int ctnl_new_expect(struct ctnl_handle *, struct ctnl_tuple *, 
-			   struct ctnl_tuple *, struct ctnl_tuple *, 
-			   unsigned long);
-extern int ctnl_del_expect(struct ctnl_handle *,struct ctnl_tuple *);
-extern int ctnl_get_expect(struct ctnl_handle *, struct ctnl_tuple *);
-extern int ctnl_list_expect(struct ctnl_handle *, int);
-extern int ctnl_event_expect(struct ctnl_handle *, int);
-extern int ctnl_flush_expect(struct ctnl_handle *);
-
-extern int ctnl_send(struct ctnl_handle *, struct nlmsghdr *);
-extern int ctnl_wilddump_request(struct ctnl_handle *, int , int);
-
-#endif	/* __LIBCTNETLINK_H */
diff --git a/_conntrack/include/linux_list.h b/_conntrack/include/linux_list.h
deleted file mode 100644
index 57b56d7..0000000
--- a/_conntrack/include/linux_list.h
+++ /dev/null
@@ -1,725 +0,0 @@
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-#undef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- *
- * @ptr:	the pointer to the member.
- * @type:	the type of the container struct this is embedded in.
- * @member:	the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({			\
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-
-/*
- * Check at compile time that something is of a particular type.
- * Always evaluates to 1 so you may use it easily in comparisons.
- */
-#define typecheck(type,x) \
-({	type __dummy; \
-	typeof(x) __dummy2; \
-	(void)(&__dummy == &__dummy2); \
-	1; \
-})
-
-#define prefetch(x)		1
-
-/* empty define to make this work in userspace -HW */
-#ifndef smp_wmb
-#define smp_wmb()
-#endif
-
-/*
- * These are non-NULL pointers that will result in page faults
- * under normal circumstances, used to verify that nobody uses
- * non-initialized list entries.
- */
-#define LIST_POISON1  ((void *) 0x00100100)
-#define LIST_POISON2  ((void *) 0x00200200)
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
-	struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-	struct list_head name = LIST_HEAD_INIT(name)
-
-#define INIT_LIST_HEAD(ptr) do { \
-	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-} while (0)
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *new,
-			      struct list_head *prev,
-			      struct list_head *next)
-{
-	next->prev = new;
-	new->next = next;
-	new->prev = prev;
-	prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head, head->next);
-}
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head->prev, head);
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add_rcu(struct list_head * new,
-		struct list_head * prev, struct list_head * next)
-{
-	new->next = next;
-	new->prev = prev;
-	smp_wmb();
-	next->prev = new;
-	prev->next = new;
-}
-
-/**
- * list_add_rcu - add a new entry to rcu-protected list
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as list_add_rcu()
- * or list_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * list_for_each_entry_rcu().
- */
-static inline void list_add_rcu(struct list_head *new, struct list_head *head)
-{
-	__list_add_rcu(new, head, head->next);
-}
-
-/**
- * list_add_tail_rcu - add a new entry to rcu-protected list
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as list_add_tail_rcu()
- * or list_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * list_for_each_entry_rcu().
- */
-static inline void list_add_tail_rcu(struct list_head *new,
-					struct list_head *head)
-{
-	__list_add_rcu(new, head->prev, head);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_del(struct list_head * prev, struct list_head * next)
-{
-	next->prev = prev;
-	prev->next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static inline void list_del(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	entry->next = LIST_POISON1;
-	entry->prev = LIST_POISON2;
-}
-
-/**
- * list_del_rcu - deletes entry from list without re-initialization
- * @entry: the element to delete from the list.
- *
- * Note: list_empty on entry does not return true after this,
- * the entry is in an undefined state. It is useful for RCU based
- * lockfree traversal.
- *
- * In particular, it means that we can not poison the forward
- * pointers that may still be used for walking the list.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as list_del_rcu()
- * or list_add_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * list_for_each_entry_rcu().
- *
- * Note that the caller is not permitted to immediately free
- * the newly deleted entry.  Instead, either synchronize_kernel()
- * or call_rcu() must be used to defer freeing until an RCU
- * grace period has elapsed.
- */
-static inline void list_del_rcu(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	entry->prev = LIST_POISON2;
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static inline void list_del_init(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_move - delete from one list and add as another's head
- * @list: the entry to move
- * @head: the head that will precede our entry
- */
-static inline void list_move(struct list_head *list, struct list_head *head)
-{
-        __list_del(list->prev, list->next);
-        list_add(list, head);
-}
-
-/**
- * list_move_tail - delete from one list and add as another's tail
- * @list: the entry to move
- * @head: the head that will follow our entry
- */
-static inline void list_move_tail(struct list_head *list,
-				  struct list_head *head)
-{
-        __list_del(list->prev, list->next);
-        list_add_tail(list, head);
-}
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static inline int list_empty(const struct list_head *head)
-{
-	return head->next == head;
-}
-
-/**
- * list_empty_careful - tests whether a list is
- * empty _and_ checks that no other CPU might be
- * in the process of still modifying either member
- *
- * NOTE: using list_empty_careful() without synchronization
- * can only be safe if the only activity that can happen
- * to the list entry is list_del_init(). Eg. it cannot be used
- * if another CPU could re-list_add() it.
- *
- * @head: the list to test.
- */
-static inline int list_empty_careful(const struct list_head *head)
-{
-	struct list_head *next = head->next;
-	return (next == head) && (next == head->prev);
-}
-
-static inline void __list_splice(struct list_head *list,
-				 struct list_head *head)
-{
-	struct list_head *first = list->next;
-	struct list_head *last = list->prev;
-	struct list_head *at = head->next;
-
-	first->prev = head;
-	head->next = first;
-
-	last->next = at;
-	at->prev = last;
-}
-
-/**
- * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static inline void list_splice(struct list_head *list, struct list_head *head)
-{
-	if (!list_empty(list))
-		__list_splice(list, head);
-}
-
-/**
- * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * The list at @list is reinitialised
- */
-static inline void list_splice_init(struct list_head *list,
-				    struct list_head *head)
-{
-	if (!list_empty(list)) {
-		__list_splice(list, head);
-		INIT_LIST_HEAD(list);
-	}
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:	the &struct list_head pointer.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
-
-/**
- * list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- */
-#define list_for_each(pos, head) \
-	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
-        	pos = pos->next, prefetch(pos->next))
-
-/**
- * __list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code, no prefetching is done.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
- * list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- */
-#define list_for_each_prev(pos, head) \
-	for (pos = (head)->prev, prefetch(pos->prev); pos != (head); \
-        	pos = pos->prev, prefetch(pos->prev))
-
-/**
- * list_for_each_safe	-	iterate over a list safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop counter.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, n = pos->next)
-
-/**
- * list_for_each_entry	-	iterate over list of given type
- * @pos:	the type * to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry(pos, head, member)				\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		     prefetch(pos->member.next);			\
-	     &pos->member != (head); 					\
-	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
-		     prefetch(pos->member.next))
-
-/**
- * list_for_each_entry_reverse - iterate backwards over list of given type.
- * @pos:	the type * to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
-		     prefetch(pos->member.prev);			\
-	     &pos->member != (head); 					\
-	     pos = list_entry(pos->member.prev, typeof(*pos), member),	\
-		     prefetch(pos->member.prev))
-
-/**
- * list_prepare_entry - prepare a pos entry for use as a start point in
- *			list_for_each_entry_continue
- * @pos:	the type * to use as a start point
- * @head:	the head of the list
- * @member:	the name of the list_struct within the struct.
- */
-#define list_prepare_entry(pos, head, member) \
-	((pos) ? : list_entry(head, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue -	iterate over list of given type
- *			continuing after existing point
- * @pos:	the type * to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_continue(pos, head, member) 		\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member),	\
-		     prefetch(pos->member.next);			\
-	     &pos->member != (head);					\
-	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
-		     prefetch(pos->member.next))
-
-/**
- * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @pos:	the type * to use as a loop counter.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		n = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_rcu	-	iterate over an rcu-protected list
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_rcu(pos, head) \
-	for (pos = (head)->next, prefetch(pos->next); pos != (head); \
-        	pos = pos->next, ({ smp_read_barrier_depends(); 0;}), prefetch(pos->next))
-
-#define __list_for_each_rcu(pos, head) \
-	for (pos = (head)->next; pos != (head); \
-        	pos = pos->next, ({ smp_read_barrier_depends(); 0;}))
-
-/**
- * list_for_each_safe_rcu	-	iterate over an rcu-protected list safe
- *					against removal of list entry
- * @pos:	the &struct list_head to use as a loop counter.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_safe_rcu(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, ({ smp_read_barrier_depends(); 0;}), n = pos->next)
-
-/**
- * list_for_each_entry_rcu	-	iterate over rcu list of given type
- * @pos:	the type * to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_entry_rcu(pos, head, member)			\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		     prefetch(pos->member.next);			\
-	     &pos->member != (head); 					\
-	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
-		     ({ smp_read_barrier_depends(); 0;}),		\
-		     prefetch(pos->member.next))
-
-
-/**
- * list_for_each_continue_rcu	-	iterate over an rcu-protected list
- *			continuing after existing point.
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as list_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define list_for_each_continue_rcu(pos, head) \
-	for ((pos) = (pos)->next, prefetch((pos)->next); (pos) != (head); \
-        	(pos) = (pos)->next, ({ smp_read_barrier_depends(); 0;}), prefetch((pos)->next))
-
-/*
- * Double linked lists with a single pointer list head.
- * Mostly useful for hash tables where the two pointer list head is
- * too wasteful.
- * You lose the ability to access the tail in O(1).
- */
-
-struct hlist_head {
-	struct hlist_node *first;
-};
-
-struct hlist_node {
-	struct hlist_node *next, **pprev;
-};
-
-#define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
-#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-#define INIT_HLIST_NODE(ptr) ((ptr)->next = NULL, (ptr)->pprev = NULL)
-
-static inline int hlist_unhashed(const struct hlist_node *h)
-{
-	return !h->pprev;
-}
-
-static inline int hlist_empty(const struct hlist_head *h)
-{
-	return !h->first;
-}
-
-static inline void __hlist_del(struct hlist_node *n)
-{
-	struct hlist_node *next = n->next;
-	struct hlist_node **pprev = n->pprev;
-	*pprev = next;
-	if (next)
-		next->pprev = pprev;
-}
-
-static inline void hlist_del(struct hlist_node *n)
-{
-	__hlist_del(n);
-	n->next = LIST_POISON1;
-	n->pprev = LIST_POISON2;
-}
-
-/**
- * hlist_del_rcu - deletes entry from hash list without re-initialization
- * @n: the element to delete from the hash list.
- *
- * Note: list_unhashed() on entry does not return true after this,
- * the entry is in an undefined state. It is useful for RCU based
- * lockfree traversal.
- *
- * In particular, it means that we can not poison the forward
- * pointers that may still be used for walking the hash list.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as hlist_add_head_rcu()
- * or hlist_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * hlist_for_each_entry().
- */
-static inline void hlist_del_rcu(struct hlist_node *n)
-{
-	__hlist_del(n);
-	n->pprev = LIST_POISON2;
-}
-
-static inline void hlist_del_init(struct hlist_node *n)
-{
-	if (n->pprev)  {
-		__hlist_del(n);
-		INIT_HLIST_NODE(n);
-	}
-}
-
-#define hlist_del_rcu_init hlist_del_init
-
-static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
-{
-	struct hlist_node *first = h->first;
-	n->next = first;
-	if (first)
-		first->pprev = &n->next;
-	h->first = n;
-	n->pprev = &h->first;
-}
-
-
-/**
- * hlist_add_head_rcu - adds the specified element to the specified hlist,
- * while permitting racing traversals.
- * @n: the element to add to the hash list.
- * @h: the list to add to.
- *
- * The caller must take whatever precautions are necessary
- * (such as holding appropriate locks) to avoid racing
- * with another list-mutation primitive, such as hlist_add_head_rcu()
- * or hlist_del_rcu(), running on this same list.
- * However, it is perfectly legal to run concurrently with
- * the _rcu list-traversal primitives, such as
- * hlist_for_each_entry(), but only if smp_read_barrier_depends()
- * is used to prevent memory-consistency problems on Alpha CPUs.
- * Regardless of the type of CPU, the list-traversal primitive
- * must be guarded by rcu_read_lock().
- *
- * OK, so why don't we have an hlist_for_each_entry_rcu()???
- */
-static inline void hlist_add_head_rcu(struct hlist_node *n,
-					struct hlist_head *h)
-{
-	struct hlist_node *first = h->first;
-	n->next = first;
-	n->pprev = &h->first;
-	smp_wmb();
-	if (first)
-		first->pprev = &n->next;
-	h->first = n;
-}
-
-/* next must be != NULL */
-static inline void hlist_add_before(struct hlist_node *n,
-					struct hlist_node *next)
-{
-	n->pprev = next->pprev;
-	n->next = next;
-	next->pprev = &n->next;
-	*(n->pprev) = n;
-}
-
-static inline void hlist_add_after(struct hlist_node *n,
-					struct hlist_node *next)
-{
-	next->next = n->next;
-	n->next = next;
-	next->pprev = &n->next;
-
-	if(next->next)
-		next->next->pprev  = &next->next;
-}
-
-#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
-
-#define hlist_for_each(pos, head) \
-	for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
-	     pos = pos->next)
-
-#define hlist_for_each_safe(pos, n, head) \
-	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
-	     pos = n)
-
-/**
- * hlist_for_each_entry	- iterate over list of given type
- * @tpos:	the type * to use as a loop counter.
- * @pos:	the &struct hlist_node to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry(tpos, pos, head, member)			 \
-	for (pos = (head)->first;					 \
-	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_continue - iterate over a hlist continuing after existing point
- * @tpos:	the type * to use as a loop counter.
- * @pos:	the &struct hlist_node to use as a loop counter.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_continue(tpos, pos, member)		 \
-	for (pos = (pos)->next;						 \
-	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_from - iterate over a hlist continuing from existing point
- * @tpos:	the type * to use as a loop counter.
- * @pos:	the &struct hlist_node to use as a loop counter.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_from(tpos, pos, member)			 \
-	for (; pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @tpos:	the type * to use as a loop counter.
- * @pos:	the &struct hlist_node to use as a loop counter.
- * @n:		another &struct hlist_node to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
-	for (pos = (head)->first;					 \
-	     pos && ({ n = pos->next; 1; }) && 				 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = n)
-
-/**
- * hlist_for_each_entry_rcu - iterate over rcu list of given type
- * @pos:	the type * to use as a loop counter.
- * @pos:	the &struct hlist_node to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- *
- * This list-traversal primitive may safely run concurrently with
- * the _rcu list-mutation primitives such as hlist_add_rcu()
- * as long as the traversal is guarded by rcu_read_lock().
- */
-#define hlist_for_each_entry_rcu(tpos, pos, head, member)		 \
-	for (pos = (head)->first;					 \
-	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next, ({ smp_read_barrier_depends(); 0; }) )
-
-#endif
diff --git a/_conntrack/src/Makefile.am b/_conntrack/src/Makefile.am
deleted file mode 100644
index 64b7763..0000000
--- a/_conntrack/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#AUTOMAKE_OPTIONS = no-dependencies foreign
-
-#EXTRA_DIST = $(man_MANS) acinclude.m4
-
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
-AM_CFLAGS=-fPIC -Wall
-LIBS=
-
-lib_LTLIBRARIES = libnetfilter_conntrack.la 
-
-libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles
-libnetfilter_conntrack_la_SOURCES = libnetfilter_conntrack.c 
diff --git a/_conntrack/src/libnetfilter_conntrack.c b/_conntrack/src/libnetfilter_conntrack.c
deleted file mode 100644
index 12fb6c6..0000000
--- a/_conntrack/src/libnetfilter_conntrack.c
+++ /dev/null
@@ -1,994 +0,0 @@
-/*
- * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
- *             Harald Welte <laforge@netfilter.org>
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- */
-#include <stdio.h>
-#include <getopt.h>
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include "linux_list.h"
-#include <libnfnetlink/libnfnetlink.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-
-#define NFCT_BUFSIZE 4096
-
-#define NIPQUAD(addr) \
-	((unsigned char *)&addr)[0], \
-	((unsigned char *)&addr)[1], \
-	((unsigned char *)&addr)[2], \
-	((unsigned char *)&addr)[3]
-
-char *lib_dir = LIBNETFILTER_CONNTRACK_DIR;
-struct list_head proto_list;
-char *proto2str[IPPROTO_MAX] = {
-	[IPPROTO_TCP] = "tcp",
-        [IPPROTO_UDP] = "udp",
-        [IPPROTO_ICMP] = "icmp",
-        [IPPROTO_SCTP] = "sctp"
-};
-
-/* handler used for nfnl_listen */
-static int callback_handler(struct sockaddr_nl *nladdr,
-			    struct nlmsghdr *n, void *arg)
-{
-	struct nfct_handle *cth = (struct nfct_handle *) arg;
-	int type = NFNL_MSG_TYPE(n->nlmsg_type);
-	struct nfct_msg_handler *hdlr = cth->handler[type];
-	int ret;
-
-	if (NFNL_SUBSYS_ID(n->nlmsg_type) != NFNL_SUBSYS_CTNETLINK &&
-	    NFNL_SUBSYS_ID(n->nlmsg_type) != NFNL_SUBSYS_CTNETLINK_EXP) {
-		nfnl_dump_packet(n, n->nlmsg_len, "callback_handler");
-		return 0;
-	}
-
-	if (!hdlr)
-		return 0;
-
-	if (!hdlr->handler)
-		return 0;
-
-	ret = hdlr->handler(nladdr, n, arg);
-
-	return ret;
-}
-
-struct nfct_handle *nfct_open(u_int8_t subsys_id, unsigned subscriptions)
-{
-	int err;
-	u_int8_t cb_count;
-	struct nfct_handle *cth;
-
-	switch(subsys_id) {
-		case NFNL_SUBSYS_CTNETLINK:
-			cb_count = IPCTNL_MSG_MAX;
-			break;
-		case NFNL_SUBSYS_CTNETLINK_EXP:
-			cb_count = IPCTNL_MSG_EXP_MAX;
-			break;
-		default:
-			return NULL;
-			break;
-	}
-	cth = (struct nfct_handle *)
-		malloc(sizeof(struct nfct_handle));
-	if (!cth)
-		return NULL;
-	
-	memset(cth, 0, sizeof(*cth));
-
-	err = nfnl_open(&cth->nfnlh, subsys_id, cb_count, subscriptions);
-	if (err < 0)
-		return NULL;
-
-	return cth;
-}
-
-int nfct_close(struct nfct_handle *cth)
-{
-	int err;
-
-	err = nfnl_close(&cth->nfnlh);
-	free(cth);
-
-	return err;
-}
-
-void nfct_set_callback(struct nfct_handle *cth, 
-			       nfct_callback callback)
-{
-	cth->callback = callback;
-}
-
-static int nfct_register_handler(struct nfct_handle *cth, 
-				 	 struct nfct_msg_handler *hndlr)
-{
-	if (hndlr->type >= IPCTNL_MSG_MAX)
-		return -EINVAL;
-
-	cth->handler[hndlr->type] = hndlr;
-	
-	return 0;
-}
-
-static void nfct_build_tuple_ip(struct nfnlhdr *req, int size,
-					struct nfct_tuple *t)
-{
-	struct nfattr *nest;
-
-	nest = nfnl_nest(&req->nlh, size, CTA_TUPLE_IP);
-
-	nfnl_addattr_l(&req->nlh, size, CTA_IP_V4_SRC, &t->src.v4, 
-		       sizeof(u_int32_t));
-
-	nfnl_addattr_l(&req->nlh, size, CTA_IP_V4_DST, &t->dst.v4,
-		       sizeof(u_int32_t));
-
-	nfnl_nest_end(&req->nlh, nest);
-}
-
-static void nfct_build_tuple_proto(struct nfnlhdr *req, int size,
-					   struct nfct_tuple *t)
-{
-	struct nfattr *nest;
-
-	nest = nfnl_nest(&req->nlh, size, CTA_TUPLE_PROTO);
-
-	nfnl_addattr_l(&req->nlh, size, CTA_PROTO_NUM, &t->protonum,
-		       sizeof(u_int16_t));
-
-	switch(t->protonum) {
-	case IPPROTO_TCP:
-	case IPPROTO_UDP:
-	case IPPROTO_SCTP:
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTO_SRC_PORT,
-			       &t->l4src.tcp.port, sizeof(u_int16_t));
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTO_DST_PORT,
-			       &t->l4dst.tcp.port, sizeof(u_int16_t));
-		break;
-	case IPPROTO_ICMP:
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_CODE,
-			       &t->l4dst.icmp.code, sizeof(u_int8_t));
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_TYPE,
-			       &t->l4dst.icmp.type, sizeof(u_int8_t));
-		/* This is an ICMP echo */
-		if (t->l4dst.icmp.type == 8)
-			nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_ID,
-				       &t->l4src.icmp.id, sizeof(u_int16_t));
-		break;
-	}
-	nfnl_nest_end(&req->nlh, nest);
-}
-
-static void nfct_build_tuple(struct nfnlhdr *req, int size, 
-				     struct nfct_tuple *t, int type)
-{
-	struct nfattr *nest;
-
-	nest = nfnl_nest(&req->nlh, size, type);
-
-	nfct_build_tuple_ip(req, size, t);
-	nfct_build_tuple_proto(req, size, t);
-
-	nfnl_nest_end(&req->nlh, nest);
-}
-
-static void nfct_build_protoinfo(struct nfnlhdr *req, int size,
-					 struct nfct_conntrack *ct)
-{
-	struct nfattr *nest;
-
-	nest = nfnl_nest(&req->nlh, size, CTA_PROTOINFO);
-
-	switch (ct->tuple[NFCT_DIR_ORIGINAL].protonum) {
-	case IPPROTO_TCP: {
-		struct nfattr *nest_proto;
-		nest_proto = nfnl_nest(&req->nlh, size, CTA_PROTOINFO_TCP);
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTOINFO_TCP_STATE,
-			       &ct->protoinfo.tcp.state, sizeof(u_int8_t));
-		nfnl_nest_end(&req->nlh, nest_proto);
-		break;
-		}
-	default:
-		break;
-	}
-
-	nfnl_nest_end(&req->nlh, nest);
-}
-
-static void nfct_build_protonat(struct nfnlhdr *req, int size,
-					struct nfct_conntrack *ct)
-{
-	struct nfattr *nest;
-
-	nest = nfnl_nest(&req->nlh, size, CTA_NAT_PROTO);
-
-	switch (ct->tuple[NFCT_DIR_ORIGINAL].protonum) {
-#if 0
-	case IPPROTO_TCP:
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTONAT_TCP_MIN,
-			       &ct->nat.l4min.tcp.port, sizeof(u_int16_t));
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTONAT_TCP_MAX,
-			       &ct->nat.l4max.tcp.port, sizeof(u_int16_t));
-		break;
-	case IPPROTO_UDP:
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTONAT_UDP_MIN,
-			       &ct->nat.l4min.udp.port, sizeof(u_int16_t));
-		nfnl_addattr_l(&req->nlh, size, CTA_PROTONAT_UDP_MAX,
-			       &ct->nat.l4max.udp.port, sizeof(u_int16_t));
-		break;
-#endif
-	}
-	nfnl_nest_end(&req->nlh, nest);
-}
-
-static void nfct_build_nat(struct nfnlhdr *req, int size,
-				   struct nfct_conntrack *ct)
-{
-	struct nfattr *nest;
-
-	nest = nfnl_nest(&req->nlh, size, CTA_NAT);
-
-	nfnl_addattr_l(&req->nlh, size, CTA_NAT_MINIP,
-		       &ct->nat.min_ip, sizeof(u_int32_t));
-	
-	if (ct->nat.min_ip != ct->nat.max_ip)
-		nfnl_addattr_l(&req->nlh, size, CTA_NAT_MAXIP,
-			       &ct->nat.max_ip, sizeof(u_int32_t));
-
-	if (ct->nat.l4min.all != ct->nat.l4max.all)
-		nfct_build_protonat(req, size, ct);
-
-	nfnl_nest_end(&req->nlh, nest);
-}
-
-static void nfct_build_conntrack(struct nfnlhdr *req, int size, 
-					 struct nfct_conntrack *ct)
-{
-	nfct_build_tuple(req, size, &ct->tuple[NFCT_DIR_ORIGINAL], 
-				 CTA_TUPLE_ORIG);
-	nfct_build_tuple(req, size, &ct->tuple[NFCT_DIR_REPLY],
-				 CTA_TUPLE_REPLY);
-	
-	nfnl_addattr_l(&req->nlh, size, CTA_STATUS, &ct->status, 
-		       sizeof(unsigned int));
-	nfnl_addattr_l(&req->nlh, size, CTA_TIMEOUT, &ct->timeout, 
-		       sizeof(unsigned long));
-
-	nfct_build_protoinfo(req, size, ct);
-	if (ct->nat.min_ip != 0)
-		nfct_build_nat(req, size, ct);
-}
-
-void nfct_dump_tuple(struct nfct_tuple *tp)
-{
-	fprintf(stdout, "tuple %p: %u %u.%u.%u.%u:%hu -> %u.%u.%u.%u:%hu\n",
-			tp, tp->protonum,
-			NIPQUAD(tp->src.v4), ntohs(tp->l4src.all),
-			NIPQUAD(tp->dst.v4), ntohs(tp->l4dst.all));
-}
-
-static struct nfct_proto *findproto(char *name)
-{
-	struct list_head *i;
-	struct nfct_proto *cur = NULL, *handler = NULL;
-
-	if (!name) 
-		return handler;
-
-	lib_dir = getenv("LIBNETFILTER_CONNTRACK_DIR");
-	if (!lib_dir)
-		lib_dir = LIBNETFILTER_CONNTRACK_DIR;
-
-	list_for_each(i, &proto_list) {
-		cur = (struct nfct_proto *) i;
-		if (strcmp(cur->name, name) == 0) {
-			handler = cur;
-			break;
-		}
-	}
-
-	if (!handler) {
-		char path[sizeof("libnetfilter_conntrack_.so")
-			 + strlen(name) + strlen(lib_dir)];
-                sprintf(path, "%s/libnetfilter_conntrack_%s.so", lib_dir, name);
-		if (dlopen(path, RTLD_NOW))
-			handler = findproto(name);
-		else
-			fprintf(stderr, "%s\n", dlerror());
-	}
-
-	return handler;
-}
-
-static int print_status(char *buf, unsigned int status)
-{
-	int size = 0;
-	
-	if (status & IPS_ASSURED)
-		size = sprintf(buf, "[ASSURED] ");
-	if (!(status & IPS_SEEN_REPLY))
-		size = sprintf(buf, "[UNREPLIED] ");
-
-	return size;
-}
-
-static void parse_ip(struct nfattr *attr, struct nfct_tuple *tuple)
-{
-	struct nfattr *tb[CTA_IP_MAX];
-
-        nfnl_parse_nested(tb, CTA_IP_MAX, attr);
-	if (tb[CTA_IP_V4_SRC-1])
-		tuple->src.v4 = *(u_int32_t *)NFA_DATA(tb[CTA_IP_V4_SRC-1]);
-
-	if (tb[CTA_IP_V4_DST-1])
-		tuple->dst.v4 = *(u_int32_t *)NFA_DATA(tb[CTA_IP_V4_DST-1]);
-}
-
-static void parse_proto(struct nfattr *attr, struct nfct_tuple *tuple)
-{
-	struct nfattr *tb[CTA_PROTO_MAX];
-	struct nfct_proto *h;
-
-	nfnl_parse_nested(tb, CTA_PROTO_MAX, attr);
-	if (tb[CTA_PROTO_NUM-1])
-		tuple->protonum = *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);
-	
-	h = findproto(proto2str[tuple->protonum]);
-	if (h && h->parse_proto)
-		h->parse_proto(tb, tuple);
-}
-
-static void parse_tuple(struct nfattr *attr, struct nfct_tuple *tuple)
-{
-	struct nfattr *tb[CTA_TUPLE_MAX];
-
-	nfnl_parse_nested(tb, CTA_TUPLE_MAX, attr);
-
-	if (tb[CTA_TUPLE_IP-1])
-		parse_ip(tb[CTA_TUPLE_IP-1], tuple);
-	if (tb[CTA_TUPLE_PROTO-1])
-		parse_proto(tb[CTA_TUPLE_PROTO-1], tuple);
-}
-
-static void parse_protoinfo(struct nfattr *attr, struct nfct_conntrack *ct)
-{
-	struct nfattr *tb[CTA_PROTOINFO_MAX];
-	struct nfct_proto *h;
-
-	nfnl_parse_nested(tb,CTA_PROTOINFO_MAX, attr);
-
-	h = findproto(proto2str[ct->tuple[NFCT_DIR_ORIGINAL].protonum]);
-        if (h && h->parse_protoinfo)
-		h->parse_protoinfo(tb, ct);
-}
-
-static void nfct_parse_counters(struct nfattr *attr,
-					struct nfct_conntrack *ct,
-					enum ctattr_type parent)
-{
-	struct nfattr *tb[CTA_COUNTERS_MAX];
-	int dir = (parent == CTA_COUNTERS_ORIG ? NFCT_DIR_REPLY 
-					       : NFCT_DIR_ORIGINAL);
-
-	nfnl_parse_nested(tb, CTA_COUNTERS_MAX, attr);
-	if (tb[CTA_COUNTERS_PACKETS-1])
-		ct->counters[dir].packets
-			= __be64_to_cpu(*(u_int64_t *)
-					NFA_DATA(tb[CTA_COUNTERS_PACKETS-1]));
-	if (tb[CTA_COUNTERS_BYTES-1])
-		ct->counters[dir].bytes
-			= __be64_to_cpu(*(u_int64_t *)
-					NFA_DATA(tb[CTA_COUNTERS_BYTES-1]));
-	if (tb[CTA_COUNTERS32_PACKETS-1])
-		ct->counters[dir].packets
-			= htonl(*(u_int32_t *)
-				NFA_DATA(tb[CTA_COUNTERS32_PACKETS-1]));
-	if (tb[CTA_COUNTERS32_BYTES-1])
-		ct->counters[dir].bytes
-			= htonl(*(u_int32_t *)
-				NFA_DATA(tb[CTA_COUNTERS32_BYTES-1]));
-}
-
-static int nfct_conntrack_netlink_handler(struct sockaddr_nl *sock, 
-						struct nlmsghdr *nlh, void *arg)
-{
-	struct nfgenmsg *nfmsg;
-	int min_len = sizeof(struct nfgenmsg) + sizeof(struct nlmsghdr);
-	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-	int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
-	struct nfct_conntrack ct;
-	unsigned int flags = 0;
-	struct nfct_handle *cth = arg;
-
-	memset(&ct, 0, sizeof(struct nfct_conntrack));
-
-	nfmsg = NLMSG_DATA(nlh);
-
-	if (nlh->nlmsg_len < min_len)
-		return -EINVAL;
-
-	while (NFA_OK(attr, attrlen)) {
-		switch(NFA_TYPE(attr)) {
-		case CTA_TUPLE_ORIG:
-			parse_tuple(attr, &ct.tuple[NFCT_DIR_ORIGINAL]);
-			break;
-		case CTA_TUPLE_REPLY:
-			parse_tuple(attr, &ct.tuple[NFCT_DIR_REPLY]);
-			break;
-		case CTA_STATUS:
-			ct.status = ntohl(*(u_int32_t *)NFA_DATA(attr));
-			flags |= NFCT_STATUS;
-			break;
-		case CTA_PROTOINFO:
-			parse_protoinfo(attr, &ct);
-			flags |= NFCT_PROTOINFO;
-			break;
-		case CTA_TIMEOUT:
-			ct.timeout = ntohl(*(u_int32_t *)NFA_DATA(attr));
-			flags |= NFCT_TIMEOUT;
-			break;
-		case CTA_MARK:
-			ct.mark = ntohl(*(u_int32_t *)NFA_DATA(attr));
-			flags |= NFCT_MARK;
-			break;
-		case CTA_COUNTERS_ORIG:
-		case CTA_COUNTERS_REPLY:
-			nfct_parse_counters(attr, &ct, 
-						    NFA_TYPE(attr)-1);
-			flags |= NFCT_COUNTERS;
-			break;
-		case CTA_USE:
-			ct.use = ntohl(*(u_int32_t *)NFA_DATA(attr));
-			flags |= NFCT_USE;
-			break;
-		case CTA_ID:
-			ct.id = ntohl(*(u_int32_t *)NFA_DATA(attr));
-			flags |= NFCT_ID;
-			break;
-		default:
-			fprintf(stderr, "Unknown Attribute\n");
-			break;
-		}
-		attr = NFA_NEXT(attr, attrlen);
-	}
-	if (cth->callback)
-		cth->callback((void *) &ct, flags);
-
-	return 0;
-}
-
-void nfct_default_conntrack_display(void *arg, unsigned int flags)
-{
-	struct nfct_conntrack *ct = arg;
-	struct nfct_proto *h = NULL;
-	char buf[512];
-	int size = 0;
-
-	size += sprintf(buf, "%-8s %u ", 
-		proto2str[ct->tuple[NFCT_DIR_ORIGINAL].protonum] == NULL ?
-		"unknown" : proto2str[ct->tuple[NFCT_DIR_ORIGINAL].protonum], 
-		ct->tuple[NFCT_DIR_ORIGINAL].protonum);
-
-	if (flags & NFCT_TIMEOUT)
-		size += sprintf(buf+size, "%lu ", ct->timeout);
-
-        h = findproto(proto2str[ct->tuple[NFCT_DIR_ORIGINAL].protonum]);
-        if ((flags & NFCT_PROTOINFO) && h && h->print_protoinfo)
-                size += h->print_protoinfo(buf+size, &ct->protoinfo);
-
-	size += sprintf(buf+size, "src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-			NIPQUAD(ct->tuple[NFCT_DIR_ORIGINAL].src.v4),
-			NIPQUAD(ct->tuple[NFCT_DIR_ORIGINAL].dst.v4));
-
-	if (h && h->print_proto)
-		size += h->print_proto(buf+size, &ct->tuple[NFCT_DIR_ORIGINAL]);
-
-	if (flags & NFCT_COUNTERS)
-		size += printf(buf+size, "packets=%llu bytes=%llu ",
-			       ct->counters[NFCT_DIR_ORIGINAL].packets,
-			       ct->counters[NFCT_DIR_ORIGINAL].bytes);
-
-	size += sprintf(buf+size, "src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-			NIPQUAD(ct->tuple[NFCT_DIR_REPLY].src.v4),
-			NIPQUAD(ct->tuple[NFCT_DIR_REPLY].dst.v4));
-
-        h = findproto(proto2str[ct->tuple[NFCT_DIR_ORIGINAL].protonum]);
-	if (h && h->print_proto)
-		size += h->print_proto(buf+size, &ct->tuple[NFCT_DIR_REPLY]);
-
-	if (flags & NFCT_COUNTERS)
-		size += sprintf(buf+size, "packets=%llu bytes=%llu ",
-				ct->counters[NFCT_DIR_REPLY].packets,
-				ct->counters[NFCT_DIR_REPLY].bytes);
-	
-	if (flags & NFCT_STATUS)
-		size += print_status(buf+size, ct->status);
-
-	if (flags & NFCT_MARK)
-		size += sprintf(buf+size, "mark=%lu ", ct->mark);
-	if (flags & NFCT_USE)
-		size += sprintf(buf+size, "use=%u ", ct->use);
-	if (flags & NFCT_ID)
-		size += sprintf(buf+size, "id=%u ", ct->id);
-
-	sprintf(buf+size, "\n");
-	fprintf(stdout, buf);
-}
-
-void nfct_default_expect_display(void *arg, unsigned int flags)
-{
-	struct nfct_expect *exp = arg;
-	char buf[256];
-	int size = 0;
-	
-	size += sprintf(buf, "%ld proto=%d ", exp->timeout, exp->tuple.protonum);
-	size += sprintf(buf+size, "src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-					NIPQUAD(exp->tuple.src.v4),
-					NIPQUAD(exp->tuple.dst.v4));
-	size += sprintf(buf+size, "src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-					NIPQUAD(exp->mask.src.v4),
-					NIPQUAD(exp->mask.dst.v4));
-	size += sprintf(buf+size, "id=%u ", exp->id);
-	size += sprintf(buf, "\n");
-	fprintf(stdout, buf);
-}
-
-static char *typemsg2str(type, flags)
-{
-	char *ret = "[UNKNOWN]";
-
-	if (type == IPCTNL_MSG_CT_NEW) {
-		if (flags & NLM_F_CREATE)
-			ret = "[NEW]";
-		else
-			ret = "[UPDATE]";
-	} else if (type == IPCTNL_MSG_CT_DELETE)
-		ret = "[DESTROY]";
-
-	return ret;
-}
-
-static int nfct_event_handler(struct sockaddr_nl *sock, 
-				      struct nlmsghdr *nlh,
-				      void *arg)
-{
-	int type = NFNL_MSG_TYPE(nlh->nlmsg_type);
-	fprintf(stdout, "%9s ", typemsg2str(type, nlh->nlmsg_flags));
-	return nfct_conntrack_netlink_handler(sock, nlh, arg);
-}
-
-static int nfct_expect_netlink_handler(struct sockaddr_nl *sock, 
-				       struct nlmsghdr *nlh, void *arg)
-{
-	struct nfgenmsg *nfmsg;
-	struct nfct_handle *cth = arg;
-	int min_len = sizeof(struct nfgenmsg) + sizeof(struct nlmsghdr);
-	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-	int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
-	struct nfct_expect exp;
-
-	memset(&exp, 0, sizeof(struct nfct_expect));
-
-	nfmsg = NLMSG_DATA(nlh);
-
-	if (nlh->nlmsg_len < min_len)
-		return -EINVAL;
-
-	while (NFA_OK(attr, attrlen)) {
-		switch(NFA_TYPE(attr)) {
-
-			case CTA_EXPECT_TUPLE:
-				parse_tuple(attr, &exp.tuple);
-				break;
-			case CTA_EXPECT_MASK:
-				parse_tuple(attr, &exp.mask);
-				break;
-			case CTA_EXPECT_TIMEOUT:
-				exp.timeout = htonl(*(unsigned long *)
-						NFA_DATA(attr));
-				break;
-			case CTA_EXPECT_ID:
-				exp.id = htonl(*(u_int32_t *)NFA_DATA(attr));	
-				break;
-		}
-		attr = NFA_NEXT(attr, attrlen);
-	}
-	if (cth->callback)
-		cth->callback((void *)&exp, 0);
-
-	return 0;
-}
-
-static
-int __nfct_create_conntrack(struct nfct_handle *cth,
-				    struct nfct_tuple *orig,
-				    struct nfct_tuple *reply,
-				    unsigned long timeout,
-				    union nfct_protoinfo *proto,
-				    unsigned int status,
-				    struct nfct_nat *range)
-{
-	struct nfnlhdr *req;
-	char buf[NFCT_BUFSIZE];
-	struct nfct_conntrack ct;
-	int ret;
-
-	req = (void *) buf;
-
-	memset(buf, 0, sizeof(buf));
-	memset(&ct, 0, sizeof(struct nfct_conntrack));
-
-	ct.tuple[NFCT_DIR_ORIGINAL] = *orig;
-	ct.tuple[NFCT_DIR_REPLY] = *reply;
-	ct.timeout = htonl(timeout);
-	ct.status = htonl(status);
-	ct.protoinfo = *proto;
-	if (range)
-		ct.nat = *range;
-	
-	nfnl_fill_hdr(&cth->nfnlh, &req->nlh, 0, AF_INET, 0, IPCTNL_MSG_CT_NEW,
-		      NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK|NLM_F_EXCL);
-
-	nfct_build_conntrack(req, sizeof(buf), &ct);
-
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0 )
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_create_conntrack(struct nfct_handle *cth,
-				  struct nfct_tuple *orig,
-				  struct nfct_tuple *reply,
-				  unsigned long timeout,
-				  union nfct_protoinfo *proto,
-				  unsigned int status)
-{
-	return(__nfct_create_conntrack(cth, orig, reply, timeout,
-					       proto, status, NULL));
-}
-
-int nfct_create_conntrack_nat(struct nfct_handle *cth,
-				      struct nfct_tuple *orig,
-				      struct nfct_tuple *reply,
-				      unsigned long timeout,
-				      union nfct_protoinfo *proto,
-				      unsigned int status,
-				      struct nfct_nat *nat)
-{
-	return(__nfct_create_conntrack(cth, orig, reply, timeout,
-					       proto, status, nat));
-}
-
-int nfct_update_conntrack(struct nfct_handle *cth,
-				  struct nfct_tuple *orig,
-				  struct nfct_tuple *reply,
-				  unsigned long timeout,
-				  union nfct_protoinfo *proto,
-				  unsigned int status)
-{
-	struct nfnlhdr *req;
-	char buf[NFCT_BUFSIZE];
-	struct nfct_conntrack ct;
-	int ret;
-
-	req = (void *) &buf;
-	memset(&buf, 0, sizeof(buf));
-	memset(&ct, 0, sizeof(struct nfct_conntrack));
-
-	ct.tuple[NFCT_DIR_ORIGINAL] = *orig;
-	ct.tuple[NFCT_DIR_REPLY] = *reply;
-	ct.timeout = htonl(timeout);
-	ct.status = htonl(status);
-	ct.protoinfo = *proto;
-	
-	nfnl_fill_hdr(&cth->nfnlh, &req->nlh, 0, AF_INET, 0, IPCTNL_MSG_CT_NEW,
-		      NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK);	
-
-	nfct_build_conntrack(req, sizeof(buf), &ct);
-
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-	
-	return ret;
-}
-
-int nfct_delete_conntrack(struct nfct_handle *cth,struct nfct_tuple *tuple, int dir)
-{
-	int ret;
-	struct nfnlhdr *req;
-	char buf[NFCT_BUFSIZE];
-	int type = dir ? CTA_TUPLE_REPLY : CTA_TUPLE_ORIG;
-
-	memset(&buf, 0, sizeof(buf));
-	req = (void *) &buf;
-
-	nfnl_fill_hdr(&cth->nfnlh, &req->nlh, 0, 
-		      AF_INET, 0, IPCTNL_MSG_CT_DELETE, 
-		      NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK);
-
-	nfct_build_tuple(req, sizeof(buf), tuple, type);
-
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-/* get_conntrack_handler */
-int nfct_get_conntrack(struct nfct_handle *cth,struct nfct_tuple *tuple, int dir)
-{
-	int ret;
-	struct nfnlhdr *req;
-	struct nfct_msg_handler h = {
-		.type = 0,
-		.handler = nfct_conntrack_netlink_handler
-	};
-	char buf[NFCT_BUFSIZE];
-	
-	memset(&buf, 0, sizeof(buf));
-	req = (void *) &buf;
-
-	nfct_build_tuple(req, sizeof(buf), tuple, dir); 
-
-	nfct_register_handler(cth, &h);
-	nfct_build_tuple(req, sizeof(buf), tuple, dir); 
-
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-static int __nfct_dump_conntrack_table(struct nfct_handle *cth,int zero)
-{
-	int ret, msg;
-	struct nfct_msg_handler h = {
-		.type = IPCTNL_MSG_CT_NEW, /* Hm... really? */
-		.handler = nfct_conntrack_netlink_handler
-	};
-	struct nfnlhdr req;
-	
-	nfct_register_handler(cth, &h);
-
-	if (zero)
-		msg = IPCTNL_MSG_CT_GET_CTRZERO;
-	else
-		msg = IPCTNL_MSG_CT_GET;
-
-	nfnl_fill_hdr(&cth->nfnlh, &req.nlh, 0, AF_INET, 0,
-		      msg, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
-
-	if (nfnl_send(&cth->nfnlh, &req.nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth); 
-
-	return ret;
-}
-
-int nfct_dump_conntrack_table(struct nfct_handle *cth)
-{
-	return(__nfct_dump_conntrack_table(cth, 0));
-}
-
-int nfct_dump_conntrack_table_zero(struct nfct_handle *cth)
-{
-	return(__nfct_dump_conntrack_table(cth, 1));
-}
-
-int nfct_event_conntrack(struct nfct_handle *cth)
-{
-	struct nfct_msg_handler hnew = {
-		.type = IPCTNL_MSG_CT_NEW,
-		.handler = nfct_event_handler
-	};
-	struct nfct_msg_handler hdestroy = {
-		.type = IPCTNL_MSG_CT_DELETE,
-		.handler = nfct_event_handler
-	};
-	int ret;
-
-	nfct_register_handler(cth, &hnew);
-	nfct_register_handler(cth, &hdestroy);
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return 0;
-}
-
-void nfct_register_proto(struct nfct_proto *h)
-{
-	if (strcmp(h->version, LIBNETFILTER_CONNTRACK_VERSION) != 0) {
-		fprintf(stderr, "plugin `%s': version %s (I'm %s)\n",
-			h->name, h->version, LIBNETFILTER_CONNTRACK_VERSION);
-		exit(1);
-	}
-	list_add(&h->head, &proto_list);
-}
-
-void nfct_unregister_proto(struct nfct_proto *h)
-{
-	list_del(&h->head);
-}
-
-int nfct_dump_expect_list(struct nfct_handle *cth)
-{
-	struct nfct_msg_handler h = {
-		.type = IPCTNL_MSG_EXP_NEW,
-		.handler = nfct_expect_netlink_handler
-	};
-	int ret;
-	struct nfnlhdr req;
-
-	nfct_register_handler(cth, &h);
-
-	nfnl_fill_hdr(&cth->nfnlh, &req.nlh, 0, AF_INET, 0,
-		      IPCTNL_MSG_EXP_GET, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
-
-	if (nfnl_send(&cth->nfnlh, &req.nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_flush_conntrack_table(struct nfct_handle *cth)
-{
-	int ret;
-	struct nfnlhdr *req;
-	char buf[sizeof(*req)];
-
-	memset(&buf, 0, sizeof(buf));
-	req = (void *) &buf;
-
-	nfnl_fill_hdr(&cth->nfnlh, (struct nlmsghdr *) &buf,
-			0, AF_INET, 0, IPCTNL_MSG_CT_DELETE,
-			NLM_F_REQUEST|NLM_F_ACK);
-
-	if (nfnl_send(&cth->nfnlh, (struct nlmsghdr *)&buf) < 0 )
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_get_expectation(struct nfct_handle *cth,struct nfct_tuple *tuple)
-{
-	struct nfct_msg_handler h = {
-		.type = IPCTNL_MSG_EXP_NEW,
-		.handler = nfct_expect_netlink_handler
-	};
-	int ret;
-	struct nfnlhdr *req;
-	char buf[NFCT_BUFSIZE];
-
-	memset(&buf, 0, sizeof(buf));
-	req = (void *) &buf;
-
-	nfnl_fill_hdr(&cth->nfnlh, &req->nlh, 0, AF_INET, 0, IPCTNL_MSG_EXP_GET,
-		      NLM_F_REQUEST|NLM_F_ACK);
-
-	nfct_register_handler(cth, &h);
-	nfct_build_tuple(req, sizeof(buf), tuple, CTA_EXPECT_MASTER);
-	
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_create_expectation(struct nfct_handle *cth,struct nfct_tuple *master,
-				    struct nfct_tuple *tuple,
-				    struct nfct_tuple *mask,
-				    unsigned long timeout)
-{
-	int ret;
-	struct nfnlhdr *req;
-	char buf[NFCT_BUFSIZE];
-	req = (void *) &buf;
-
-	memset(&buf, 0, sizeof(buf));
-
-	nfnl_fill_hdr(&cth->nfnlh, &req->nlh, 0, AF_INET, 0, IPCTNL_MSG_EXP_NEW,
-		      NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK);
-
-	nfct_build_tuple(req, sizeof(buf), master, CTA_EXPECT_MASTER);
-	nfct_build_tuple(req, sizeof(buf), tuple, CTA_EXPECT_TUPLE);
-	nfct_build_tuple(req, sizeof(buf), mask, CTA_EXPECT_MASK);
-	
-	if (nfnl_addattr_l(&req->nlh, sizeof(buf), CTA_EXPECT_TIMEOUT, &timeout,
-			   sizeof(timeout)) < 0)
-		return -1;	
-
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0 )
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_delete_expectation(struct nfct_handle *cth,struct nfct_tuple *tuple)
-{
-	int ret;
-	struct nfnlhdr *req;
-	char buf[NFCT_BUFSIZE];
-
-	memset(&buf, 0, sizeof(buf));
-	req = (void *) &buf;
-	
-	nfnl_fill_hdr(&cth->nfnlh, &req->nlh, 0, AF_INET, 
-		      0, IPCTNL_MSG_EXP_DELETE,
-		      NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK);
-
-	nfct_build_tuple(req, sizeof(buf), tuple, CTA_EXPECT_MASTER);
-
-	if (nfnl_send(&cth->nfnlh, &req->nlh) < 0)
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_event_expectation(struct nfct_handle *cth)
-{
-	struct nfct_msg_handler hnew = {
-		.type = IPCTNL_MSG_EXP_NEW,
-		.handler = nfct_expect_netlink_handler
-	};
-	struct nfct_msg_handler hdestroy = {
-		.type = IPCTNL_MSG_EXP_DELETE,
-		.handler = nfct_expect_netlink_handler
-	};
-	int ret;
-	
-	nfct_register_handler(cth, &hnew);
-	nfct_register_handler(cth, &hdestroy);
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
-
-int nfct_flush_expectation_table(struct nfct_handle *cth)
-{
-	int ret;
-	struct nfnlhdr *req;
-	char buf[sizeof(*req)];
-
-	memset(&buf, 0, sizeof(buf));
-	req = (void *) &buf;
-	
-	nfnl_fill_hdr(&cth->nfnlh, (struct nlmsghdr *) &buf,
-		      0, AF_INET, 0, IPCTNL_MSG_EXP_DELETE,
-		      NLM_F_REQUEST|NLM_F_ACK);
-
-	if (nfnl_send(&cth->nfnlh, (struct nlmsghdr *)&buf) < 0 )
-		return -1;
-
-	ret = nfnl_listen(&cth->nfnlh, &callback_handler, cth);
-
-	return ret;
-}
diff --git a/_conntrack/utils/Makefile.am b/_conntrack/utils/Makefile.am
deleted file mode 100644
index df6c556..0000000
--- a/_conntrack/utils/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
-
-bin_PROGRAMS = ctnl_test
-
-ctnl_test_SOURCES = ctnl_test.c
-ctnl_test_LDADD = ../src/libnfnetlink_conntrack.la
-ctnl_test_LDFLAGS = -dynamic
-
diff --git a/_conntrack/utils/ctnl_test.c b/_conntrack/utils/ctnl_test.c
deleted file mode 100644
index 5124d22..0000000
--- a/_conntrack/utils/ctnl_test.c
+++ /dev/null
@@ -1,198 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-       #include <sys/socket.h>
-       #include <netinet/in.h>
-       #include <arpa/inet.h>
-
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-#include <linux/netfilter/nfnetlink.h>
-
-#include <libnfnetlink_conntrack/libnfnetlink_conntrack.h>
-
-#if 0
-static struct ctnl_handle *cth;
-
-#if 0
-char *display_tuple_flat(struct ip_conntrack_tuple *tuple)
-{
-        static char buff[250];
-        char psb[20];
-        int len = 0;
-
-        memset(buff, '\0', sizeof(buff));
-	len += sprintf(buff + len, "%s:", inet_ntoa((struct in_addr){tuple->src.ip}));
-        switch(tuple->dst.protonum) {
-                case (IPPROTO_ICMP):
-                        len += sprintf(buff + len, "Icmp (id %d)",
-                                ntohs(tuple->src.u.icmp.id));
-                        break;
-                case (IPPROTO_TCP):
-                        sprintf(psb, "%d", ntohs(tuple->src.u.tcp.port));
-                        len += sprintf(buff + len, "%s", psb);
-                        break;
-                case (IPPROTO_UDP):
-                        sprintf(psb, "%d", ntohs(tuple->src.u.udp.port));
-                        len += sprintf(buff + len, "%s", psb);
-                        break;
-                default:
-                        len += sprintf(buff + len, "Unknown");
-                        break;
-        }
-
-	len += sprintf(buff + len, "->");
-        len += sprintf(buff + len, "%s:", inet_ntoa((struct in_addr){tuple->dst.ip}));
-        switch(tuple->dst.protonum) {
-                case (IPPROTO_ICMP):
-                        len += sprintf(buff + len, "Icmp (%d, code %d)",
-                                tuple->dst.u.icmp.type,
-                                tuple->dst.u.icmp.code);
-                        break;
-                case (IPPROTO_TCP):
-                        sprintf(psb, "%d", ntohs(tuple->dst.u.tcp.port));
-                        len += sprintf(buff + len, "%s", psb);
-                        break;
-                case (IPPROTO_UDP):
-                        sprintf(psb, "%d", ntohs(tuple->dst.u.udp.port));
-                        len += sprintf(buff + len, "%s", psb);
-                        break;
-                default:
-                        len += sprintf(buff + len, "Unknown");
-                        break;
-        }
-
-        return (buff);
-}
-#else
-char *display_tuple_flat(void *foo)
-{
-	return "not implemented";
-}
-#endif
-
-int ctnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *cta, int len)
-{
-        while(NFA_OK(cta, len)) {
-                if(cta->nfa_type <= max)
-                        tb[cta->nfa_type] = cta;
-                cta = NFA_NEXT(cta,len);
-        }
-        if (len)
-		printf("ctnl_parse_attr: deficit (%d) len (%d).\n",
-			len, cta->nfa_len);
-        return 0;
-}
-
-#if 0
-int dump()
-{
-	struct {
-		struct nlmsghdr nlh;
-		struct nfgenmsg nfmsg;
-	} req;
-	struct sockaddr_nl nladdr;
-
-	memset(&nladdr, 0, sizeof(nladdr));
-	nladdr.nl_family = AF_NETLINK;
-
-	req.nlh.nlmsg_len = sizeof(req);
-	req.nlh.nlmsg_type = (NFNL_SUBSYS_CTNETLINK << 8)|CTNL_MSG_CT_GET;
-	req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_DUMP|NLM_F_REQUEST;
-	req.nlh.nlmsg_pid = 0;
-	req.nlh.nlmsg_seq = 1;
-	req.nfmsg.nfgen_family = AF_INET;
-
-	return (sendto(ctnlfd, &req, sizeof(req), 0,
-			(struct sockaddr *) &nladdr, sizeof(nladdr)));
-
-}
-#endif
-
-int print_msg(struct nfgenmsg *cm, size_t len)
-{
-	struct nfattr *cb[CTA_MAX + 1];
-
-	printf("ctm_family=0x%x\n", cm->nfgen_family);
-
-	ctnl_parse_attr(cb, CTA_MAX, NFM_NFA(cm), len);
-
-	if (cb[CTA_TUPLE_ORIG]) {
-		printf("orig: %s\n", 
-				display_tuple_flat(NFA_DATA(cb[CTA_TUPLE_ORIG])));
-		ctnl_del_conntrack(cth, NFA_DATA(cb[CTA_TUPLE_ORIG]), CTA_TUPLE_ORIG);
-	}
-	if (cb[CTA_TUPLE_REPLY])
-		printf("rply: %s\n", 
-				display_tuple_flat(NFA_DATA(cb[CTA_TUPLE_REPLY])));
-
-
-	return 0;
-}
-
-struct nlmsghdr *ctnl_get_packet(struct nlmsghdr **last_nlhdr, 
-			      char *buf, size_t len)
-{
-	struct nlmsghdr *nlh;
-	size_t remain_len;
-
-	if ((char *)(*last_nlhdr) > (buf + len) ||
-	    (char *)(*last_nlhdr) < buf)
-		*last_nlhdr = NULL;
-
-	if (!*last_nlhdr) {
-		nlh = (struct nlmsghdr *) buf;
-		if (!NLMSG_OK(nlh, len)) {
-			printf("error parsing nlmsg\n");
-			return NULL;
-		}
-	} else {
-		/* we are n-th part of multipart mesasge */
-		if ((*last_nlhdr)->nlmsg_type == NLMSG_DONE ||
-		    !((*last_nlhdr)->nlmsg_flags & NLM_F_MULTI)) {
-			*last_nlhdr = NULL;
-			return NULL;
-		}
-
-		remain_len = (len - ((char *)(*last_nlhdr) - buf));
-		nlh = NLMSG_NEXT(*last_nlhdr, remain_len);
-	}
-
-	*last_nlhdr = nlh;
-	return nlh;
-}
-
-int main(int argc, char **argv)
-{
-	char buf[20480];
-	struct nfgenmsg *last_cm = NULL, *cm;
-	struct nlmsghdr *nlh;
-	int len;
-
-	cth = malloc(sizeof(*cth));
-	if (ctnl_open(cth, NFNL_SUBSYS_CTNETLINK, 0) < 0) {
-		exit(2);
-	}
-
-	ctnl_wilddump_request(cth, AF_INET, IPCTNL_MSG_CT_GET);
-
-	while (len = recv(cth->nfnlh.fd, &buf, sizeof(buf), 0)) {
-		printf("pkt received\n");
-		while (nlh = ctnl_get_packet(&last_cm, (char *)&buf, len)) {
-			printf("  decoding msg type 0x%04x\n", nlh->nlmsg_type);
-			if (NFNL_SUBSYS_ID(nlh->nlmsg_type) == 
-					NFNL_SUBSYS_CTNETLINK) {
-				cm = NLMSG_DATA(nlh);
-				print_msg(cm, nlh->nlmsg_len);
-			}
-		}
-	}
-
-	return 0;
-}
-
-#endif