[netfilter-cvslog] r4387 - in trunk/conntrack: . extensions include src

pablo at netfilter.org pablo at netfilter.org
Thu Oct 27 03:23:37 CEST 2005


Author: pablo at netfilter.org
Date: 2005-10-27 03:23:35 +0200 (Thu, 27 Oct 2005)
New Revision: 4387

Modified:
   trunk/conntrack/ChangeLog
   trunk/conntrack/extensions/libct_proto_icmp.c
   trunk/conntrack/extensions/libct_proto_sctp.c
   trunk/conntrack/extensions/libct_proto_tcp.c
   trunk/conntrack/extensions/libct_proto_udp.c
   trunk/conntrack/include/conntrack.h
   trunk/conntrack/src/conntrack.c
Log:
See ChangeLog



Modified: trunk/conntrack/ChangeLog
===================================================================
--- trunk/conntrack/ChangeLog	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/ChangeLog	2005-10-27 01:23:35 UTC (rev 4387)
@@ -1,3 +1,10 @@
+2005-10-27
+<pablo at eurodev.net>
+	o Use conntrack VERSION instead of the old LIBCT_VERSION
+	o proto_list and lib_dir are now static
+	o kill dead code: function dump_tuple
+	o Bumped version to 0.92
+
 2005-10-25
 <eleblond at inl.fr>
 	o Add missing autogen.sh file

Modified: trunk/conntrack/extensions/libct_proto_icmp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_icmp.c	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/extensions/libct_proto_icmp.c	2005-10-27 01:23:35 UTC (rev 4387)
@@ -105,7 +105,7 @@
 	.final_check	= final_check,
 	.help		= help,
 	.opts		= opts,
-	.version	= LIBCT_VERSION,
+	.version	= VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

Modified: trunk/conntrack/extensions/libct_proto_sctp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_sctp.c	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/extensions/libct_proto_sctp.c	2005-10-27 01:23:35 UTC (rev 4387)
@@ -143,7 +143,7 @@
 	.final_check		= final_check,
 	.help			= help,
 	.opts			= opts,
-	.version		= LIBCT_VERSION,
+	.version		= VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

Modified: trunk/conntrack/extensions/libct_proto_tcp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_tcp.c	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/extensions/libct_proto_tcp.c	2005-10-27 01:23:35 UTC (rev 4387)
@@ -166,7 +166,7 @@
 	.final_check		= final_check,
 	.help			= help,
 	.opts			= opts,
-	.version		= LIBCT_VERSION,
+	.version		= VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

Modified: trunk/conntrack/extensions/libct_proto_udp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_udp.c	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/extensions/libct_proto_udp.c	2005-10-27 01:23:35 UTC (rev 4387)
@@ -131,7 +131,7 @@
 	.final_check		= final_check,
 	.help			= help,
 	.opts			= opts,
-	.version		= LIBCT_VERSION,
+	.version		= VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

Modified: trunk/conntrack/include/conntrack.h
===================================================================
--- trunk/conntrack/include/conntrack.h	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/include/conntrack.h	2005-10-27 01:23:35 UTC (rev 4387)
@@ -1,11 +1,12 @@
-#ifndef _LIBCT_PROTO_H
-#define _LIBCT_PROTO_H
+#ifndef _CONNTRACK_H
+#define _CONNTRACK_H
 
 #include "linux_list.h"
 #include <getopt.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-#define LIBCT_VERSION	"0.1.0"
+#define PROGNAME "conntrack"
+#define VERSION "0.92"
 
 /* FIXME: These should be independent from kernel space */
 #define IPS_ASSURED (1 << 2)

Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-10-26 11:39:58 UTC (rev 4386)
+++ trunk/conntrack/src/conntrack.c	2005-10-27 01:23:35 UTC (rev 4387)
@@ -48,9 +48,6 @@
 #include "conntrack.h"
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-#define PROGNAME "conntrack"
-#define VERSION "0.90"
-
 #ifndef PROC_SYS_MODPROBE
 #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
 #endif
@@ -238,15 +235,15 @@
 /*EXP_EVENT*/ {'x','x','x','x','x','x','x','x','x','x','x','x','x','x','x','x'},
 };
 
-char *lib_dir = CONNTRACK_LIB_DIR;
+static char *lib_dir = CONNTRACK_LIB_DIR;
 
-LIST_HEAD(proto_list);
+static LIST_HEAD(proto_list);
 
 void register_proto(struct ctproto_handler *h)
 {
-	if (strcmp(h->version, LIBCT_VERSION) != 0) {
+	if (strcmp(h->version, VERSION) != 0) {
 		fprintf(stderr, "plugin `%s': version %s (I'm %s)\n",
-			h->name, h->version, LIBCT_VERSION);
+			h->name, h->version, VERSION);
 		exit(1);
 	}
 	list_add(&h->head, &proto_list);
@@ -443,14 +440,6 @@
 	return strerror(err);
 }
 
-static void 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));
-}
-
 #define PARSE_STATUS 0
 #define PARSE_EVENT 1
 #define PARSE_MAX 2




More information about the netfilter-cvslog mailing list