[netfilter-cvslog] r4467 - in trunk/libnetfilter_conntrack: . extensions src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-05 15:18:46 +0100 (Sat, 05 Nov 2005)
New Revision: 4467

Modified:
   trunk/libnetfilter_conntrack/configure.in
   trunk/libnetfilter_conntrack/extensions/Makefile.am
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
- move plugins to their own subdirectory
- rename plugins to something that indicates their purpose (protocol)


Modified: trunk/libnetfilter_conntrack/configure.in
===================================================================
--- trunk/libnetfilter_conntrack/configure.in	2005-11-05 13:59:33 UTC (rev 4466)
+++ trunk/libnetfilter_conntrack/configure.in	2005-11-05 14:18:46 UTC (rev 4467)
@@ -60,7 +60,7 @@
 	       NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE())
 
 if test ! -z "$libdir"; then
-	MODULE_DIR="\\\"$libdir/\\\""
+	MODULE_DIR="\\\"$libdir/libnetfilter_conntrack/\\\""
 	CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR"
 fi
 

Modified: trunk/libnetfilter_conntrack/extensions/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-05 13:59:33 UTC (rev 4466)
+++ trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-05 14:18:46 UTC (rev 4467)
@@ -8,9 +8,14 @@
 CFLAGS=-fPIC -Wall
 LIBS=
 
-lib_LTLIBRARIES = libnetfilter_conntrack_tcp.la libnetfilter_conntrack_udp.la libnetfilter_conntrack_icmp.la libnetfilter_conntrack_sctp.la
+pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la 		\
+		     nfct_proto_icmp.la nfct_proto_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
+nfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c 
+nfct_proto_tcp_la_LDFLAGS = -module
+nfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c
+nfct_proto_udp_la_LDFLAGS = -module
+nfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
+nfct_proto_icmp_la_LDFLAGS = -module
+nfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
+nfct_proto_sctp_la_LDFLAGS = -module

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-11-05 13:59:33 UTC (rev 4466)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-11-05 14:18:46 UTC (rev 4467)
@@ -297,9 +297,9 @@
 	}
 
 	if (!handler) {
-		char path[sizeof("libnetfilter_conntrack_.so")
+		char path[sizeof("nfct_proto_.so")
 			 + strlen(name) + strlen(lib_dir)];
-                sprintf(path, "%s/libnetfilter_conntrack_%s.so", lib_dir, name);
+                sprintf(path, "%s/nfct_proto_%s.so", lib_dir, name);
 		if (dlopen(path, RTLD_NOW))
 			handler = findproto(name);
 		else