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

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-03-25 15:37:51 +0100 (Tue, 25 Mar 2008)
New Revision: 7419

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/extensions/Makefile.am
   trunk/conntrack-tools/include/conntrack.h
   trunk/conntrack-tools/src/Makefile.am
   trunk/conntrack-tools/src/conntrack.c
Log:
Krzysztof Oledzki <ole at ans.pl>:
o add ICMPv6 (-p icmpv6) support
o add possibility to distinguish between invalid (unknown) and empty proto


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2008-03-25 14:36:14 UTC (rev 7418)
+++ trunk/conntrack-tools/ChangeLog	2008-03-25 14:37:51 UTC (rev 7419)
@@ -6,6 +6,8 @@
 
 Krzysztof Oledzki <ole at ans.pl>:
 o fix minor compilation warning
+o add ICMPv6 (-p icmpv6) support
+o add possibility to distinguish between invalid (unknown) and empty proto
 
 version 0.9.6 (2008/03/08)
 ------------------------------
@@ -161,7 +163,7 @@
 o lots of cleanups
 
 = conntrack =
-o fix segfault with conntrack --output (Krzysztof Oledzky)
+o fix segfault with conntrack --output (Krzysztof Oledzki)
 o use NFCT_SOPT_SETUP_* facilities: nfct_setobjopt
 o remove bogus option to get a conntrack in test.sh example file
 o add aliases --sport and --dport to make it more iptables-like

Modified: trunk/conntrack-tools/extensions/Makefile.am
===================================================================
--- trunk/conntrack-tools/extensions/Makefile.am	2008-03-25 14:36:14 UTC (rev 7418)
+++ trunk/conntrack-tools/extensions/Makefile.am	2008-03-25 14:37:51 UTC (rev 7419)
@@ -1,8 +1,9 @@
 include $(top_srcdir)/Make_global.am
 
 noinst_LTLIBRARIES = libct_proto_tcp.la libct_proto_udp.la \
-		     libct_proto_icmp.la
+		     libct_proto_icmp.la libct_proto_icmpv6.la
 
 libct_proto_tcp_la_SOURCES = libct_proto_tcp.c
 libct_proto_udp_la_SOURCES = libct_proto_udp.c
 libct_proto_icmp_la_SOURCES = libct_proto_icmp.c
+libct_proto_icmpv6_la_SOURCES = libct_proto_icmpv6.c

Modified: trunk/conntrack-tools/include/conntrack.h
===================================================================
--- trunk/conntrack-tools/include/conntrack.h	2008-03-25 14:36:14 UTC (rev 7418)
+++ trunk/conntrack-tools/include/conntrack.h	2008-03-25 14:37:51 UTC (rev 7419)
@@ -188,5 +188,6 @@
 extern void register_tcp(void);
 extern void register_udp(void);
 extern void register_icmp(void);
+extern void register_icmpv6(void);
 
 #endif

Modified: trunk/conntrack-tools/src/Makefile.am
===================================================================
--- trunk/conntrack-tools/src/Makefile.am	2008-03-25 14:36:14 UTC (rev 7418)
+++ trunk/conntrack-tools/src/Makefile.am	2008-03-25 14:37:51 UTC (rev 7419)
@@ -7,7 +7,7 @@
 sbin_PROGRAMS = conntrack conntrackd
 
 conntrack_SOURCES = conntrack.c
-conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_icmp.la
+conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la
 conntrack_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@
 
 conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c rbtree.c \

Modified: trunk/conntrack-tools/src/conntrack.c
===================================================================
--- trunk/conntrack-tools/src/conntrack.c	2008-03-25 14:36:14 UTC (rev 7418)
+++ trunk/conntrack-tools/src/conntrack.c	2008-03-25 14:37:51 UTC (rev 7419)
@@ -684,6 +684,7 @@
 	register_tcp();
 	register_udp();
 	register_icmp();
+	register_icmpv6();
 
 	while ((c = getopt_long(argc, argv, "L::I::U::D::G::E::F::hVs:d:r:q:"
 					    "p:t:u:e:a:z[:]:{:}:m:i::f:o:n::"
@@ -819,10 +820,13 @@
 			nfct_set_attr_u8(obj, ATTR_REPL_L3PROTO, l3protonum);
 			break;
 		case 'p':
+			if (!optarg || !*optarg)
+				exit_error(PARAMETER_PROBLEM, "proto needed\n");
+
 			options |= CT_OPT_PROTO;
 			h = findproto(optarg);
 			if (!h)
-				exit_error(PARAMETER_PROBLEM, "proto needed\n");
+				exit_error(PARAMETER_PROBLEM, "unknown proto\n");
 
 			nfct_set_attr_u8(obj, ATTR_ORIG_L4PROTO, h->protonum);
 			nfct_set_attr_u8(obj, ATTR_REPL_L4PROTO, h->protonum);