Several tree reorganizations:

- move l3extensions/ and extensions/ to src/deprecated/
- don't create submodules under /usr/lib/libnetfilter_conntrack/ anymore

5 files changed, 0 insertions, 441 deletions

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
deleted file mode 100644
index 5251581..0000000
--- a/extensions/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-include $(top_srcdir)/Make_global.am
-
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-AM_CFLAGS=-fPIC -Wall
-LIBS=
-
-pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la 		\
-		     nfct_proto_icmp.la nfct_proto_sctp.la
-
-nfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c 
-nfct_proto_tcp_la_LDFLAGS = -module -avoid-version -release $(VERSION)
-nfct_proto_tcp_la_LIBADD = ../src/libnetfilter_conntrack.la
-
-nfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c
-nfct_proto_udp_la_LDFLAGS = -module -avoid-version -release $(VERSION)
-nfct_proto_udp_la_LIBADD = ../src/libnetfilter_conntrack.la
-
-nfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
-nfct_proto_icmp_la_LDFLAGS = -module -avoid-version -release $(VERSION)
-nfct_proto_icmp_la_LIBADD = ../src/libnetfilter_conntrack.la
-
-nfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
-nfct_proto_sctp_la_LDFLAGS = -module -avoid-version -release $(VERSION)
-nfct_proto_sctp_la_LIBADD = ../src/libnetfilter_conntrack.la
diff --git a/extensions/libnetfilter_conntrack_icmp.c b/extensions/libnetfilter_conntrack_icmp.c
deleted file mode 100644
index 72a7eb0..0000000
--- a/extensions/libnetfilter_conntrack_icmp.c
+++ /dev/null
@@ -1,90 +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 <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_icmp.h>
-
-static 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]);
-}
-
-static void build_tuple_proto(struct nfnlhdr *req, int size,
-			      struct nfct_tuple *t)
-{
-	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));
-	nfnl_addattr_l(&req->nlh, size, CTA_PROTO_ICMP_ID,
-		       &t->l4src.icmp.id, sizeof(u_int16_t));
-}
-
-static int print_proto(char *buf, struct nfct_tuple *t)
-{
-	/* The ID only makes sense some ICMP messages but we want to
-	 * display the same output that /proc/net/ip_conntrack does */
-	return (sprintf(buf, "type=%d code=%d id=%d ",t->l4dst.icmp.type,
-						      t->l4dst.icmp.code,
-						      ntohs(t->l4src.icmp.id)));
-}
-
-static int compare(struct nfct_conntrack *ct1,
-		   struct nfct_conntrack *ct2,
-		   unsigned int flags)
-{
-	if (flags & ICMP_TYPE)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.type !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.type)
-			return 0;
-	if (flags & ICMP_CODE)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.code !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.icmp.code)
-			return 0;
-	if (flags & ICMP_ID)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4src.icmp.id !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4src.icmp.id)
-			return 0;
-
-	return 1;
-}
-
-static struct nfct_proto icmp = {
-	.name 			= "icmp",
-	.protonum		= IPPROTO_ICMP,
-	.parse_proto		= parse_proto,
-	.build_tuple_proto	= build_tuple_proto,
-	.print_proto		= print_proto,
-	.compare		= compare,
-	.version		= VERSION
-};
-
-static void __attribute__ ((constructor)) init(void);
-
-static void init(void)
-{
-	nfct_register_proto(&icmp);
-}
diff --git a/extensions/libnetfilter_conntrack_sctp.c b/extensions/libnetfilter_conntrack_sctp.c
deleted file mode 100644
index 3785c2e..0000000
--- a/extensions/libnetfilter_conntrack_sctp.c
+++ /dev/null
@@ -1,100 +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 <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_sctp.h>
-
-static 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]);
-}
-
-static 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]);
-*/
-}
-
-static void build_tuple_proto(struct nfnlhdr *req, int size, 
-			      struct nfct_tuple *t)
-{
-	nfnl_addattr_l(&req->nlh, size, CTA_PROTO_SRC_PORT,
-		       &t->l4src.sctp.port, sizeof(u_int16_t));
-	nfnl_addattr_l(&req->nlh, size, CTA_PROTO_DST_PORT,
-		       &t->l4dst.sctp.port, sizeof(u_int16_t));
-}
-
-static int print_protoinfo(char *buf, union nfct_protoinfo *protoinfo)
-{
-/*	fprintf(stdout, "%s ", states[protoinfo->sctp.state]); */
-	return 0;
-}
-
-static 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 int compare(struct nfct_conntrack *ct1,
-		   struct nfct_conntrack *ct2,
-		   unsigned int flags)
-{
-	if (flags & SCTP_ORIG_SPORT)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4src.sctp.port !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4src.sctp.port)
-			return 0;
-	if (flags & SCTP_ORIG_DPORT)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.sctp.port !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.sctp.port)
-			return 0;
-	if (flags & SCTP_REPL_SPORT)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4src.sctp.port !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4src.sctp.port)
-			return 0;
-	if (flags & SCTP_REPL_DPORT)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4dst.sctp.port !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4dst.sctp.port)
-			return 0;
-
-	return 1;
-}
-
-static struct nfct_proto sctp = {
-	.name 			= "sctp",
-	.protonum		= IPPROTO_SCTP,
-	.parse_proto		= parse_proto,
-	.parse_protoinfo	= parse_protoinfo,
-	.build_tuple_proto	= build_tuple_proto,
-	.print_proto		= print_proto,
-	.print_protoinfo	= print_protoinfo,
-	.compare		= compare,
-	.version		= VERSION
-};
-
-static void __attribute__ ((constructor)) init(void);
-
-static void init(void)
-{
-	nfct_register_proto(&sctp);
-}
diff --git a/extensions/libnetfilter_conntrack_tcp.c b/extensions/libnetfilter_conntrack_tcp.c
deleted file mode 100644
index 9efdbb7..0000000
--- a/extensions/libnetfilter_conntrack_tcp.c
+++ /dev/null
@@ -1,142 +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 <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
-
-static const char *states[] = {
-	"NONE",
-	"SYN_SENT",
-	"SYN_RECV",
-	"ESTABLISHED",
-	"FIN_WAIT",
-	"CLOSE_WAIT",
-	"LAST_ACK",
-	"TIME_WAIT",
-	"CLOSE",
-	"LISTEN"
-};
-
-static 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]);
-}
-
-static void parse_protoinfo(struct nfattr *cda[], struct nfct_conntrack *ct)
-{
-	struct nfattr *tb[CTA_PROTOINFO_TCP_MAX];
-
-	/*
-	 * Listen to me carefully: This is easy to trigger with events ;). 
-	 * The conntrack event messages don't always contain all the
-	 * information about a conntrack, just those fields that have changed.
-	 * So you can receive a message about a TCP connection with no bits 
-	 * talking about the private protocol information. 
-	 *
-	 * 						--pablo 05/10/31
-	 */
-	if (!cda[CTA_PROTOINFO_TCP-1])
-		return;
-	
-	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]);
-}
-
-static void build_tuple_proto(struct nfnlhdr *req, int size,
-			      struct nfct_tuple *t)
-{
-	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));
-}
-
-static void build_protoinfo(struct nfnlhdr *req, int size, 
-			    struct nfct_conntrack *ct)
-{
-	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);
-}
-
-static int print_protoinfo(char *buf, union nfct_protoinfo *protoinfo)
-{
-	return(sprintf(buf, "%s ", states[protoinfo->tcp.state]));
-}
-
-static 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 int compare(struct nfct_conntrack *ct1,
-		   struct nfct_conntrack *ct2,
-		   unsigned int flags)
-{
-	if (flags & TCP_ORIG_SPORT)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4src.tcp.port !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4src.tcp.port)
-			return 0;
-	if (flags & TCP_ORIG_DPORT)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.tcp.port !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.tcp.port)
-			return 0;
-	if (flags & TCP_REPL_SPORT)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4src.tcp.port !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4src.tcp.port)
-			return 0;
-	if (flags & TCP_REPL_DPORT)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4dst.tcp.port !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4dst.tcp.port)
-			return 0;
-	if (flags & TCP_STATE)
-		if (ct1->protoinfo.tcp.state != ct2->protoinfo.tcp.state)
-			return 0;
-
-	return 1;
-}
-
-static struct nfct_proto tcp = {
-	.name 			= "tcp",
-	.protonum		= IPPROTO_TCP,
-	.parse_protoinfo	= parse_protoinfo,
-	.parse_proto		= parse_proto,
-	.build_tuple_proto	= build_tuple_proto,
-	.build_protoinfo	= build_protoinfo,
-	.print_protoinfo	= print_protoinfo,
-	.print_proto		= print_proto,
-	.compare		= compare,
-	.version		= VERSION
-};
-
-static void __attribute__ ((constructor)) init(void);
-
-static void init(void)
-{
-	nfct_register_proto(&tcp);
-}
diff --git a/extensions/libnetfilter_conntrack_udp.c b/extensions/libnetfilter_conntrack_udp.c
deleted file mode 100644
index c1d20c3..0000000
--- a/extensions/libnetfilter_conntrack_udp.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 <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_udp.h>
-
-static 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]);
-}
-
-static 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 void build_tuple_proto(struct nfnlhdr *req, int size, 
-			      struct nfct_tuple *t)
-{
-	nfnl_addattr_l(&req->nlh, size, CTA_PROTO_SRC_PORT,
-		       &t->l4src.udp.port, sizeof(u_int16_t));
-	nfnl_addattr_l(&req->nlh, size, CTA_PROTO_DST_PORT,
-		       &t->l4dst.udp.port, sizeof(u_int16_t));
-}
-
-static int compare(struct nfct_conntrack *ct1,
-		   struct nfct_conntrack *ct2,
-		   unsigned int flags)
-{
-	if (flags & UDP_ORIG_SPORT)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4src.udp.port !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4src.udp.port)
-			return 0;
-	if (flags & UDP_ORIG_DPORT)
-		if (ct1->tuple[NFCT_DIR_ORIGINAL].l4dst.udp.port !=
-		    ct2->tuple[NFCT_DIR_ORIGINAL].l4dst.udp.port)
-			return 0;
-	if (flags & UDP_REPL_SPORT)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4src.udp.port !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4src.udp.port)
-			return 0;
-	if (flags & UDP_REPL_DPORT)
-		if (ct1->tuple[NFCT_DIR_REPLY].l4dst.udp.port !=
-		    ct2->tuple[NFCT_DIR_REPLY].l4dst.udp.port)
-			return 0;
-
-	return 1;
-}
-
-static struct nfct_proto udp = {
-	.name 			= "udp",
-	.protonum		= IPPROTO_UDP,
-	.build_tuple_proto	= build_tuple_proto,
-	.parse_proto		= parse_proto,
-	.print_proto		= print_proto,
-	.compare		= compare,
-	.version		= VERSION,
-};
-
-static void __attribute__ ((constructor)) init(void);
-
-static void init(void)
-{
-	nfct_register_proto(&udp);
-}