[netfilter-cvslog] r4482 - in trunk/libnetfilter_conntrack: .
extensions include/libnetfilter_conntrack src
pablo at netfilter.org
pablo at netfilter.org
Sun Nov 6 04:22:04 CET 2005
Author: pablo at netfilter.org
Date: 2005-11-06 04:22:01 +0100 (Sun, 06 Nov 2005)
New Revision: 4482
Modified:
trunk/libnetfilter_conntrack/configure.in
trunk/libnetfilter_conntrack/extensions/Makefile.am
trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c
trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_sctp.c
trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_tcp.c
trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_udp.c
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
o move nfct_handler to libnetfilter_conntrack.c, better for encapsulation
o fixed ICMP ID handling
o fix -> libtool: link: libtool library `nfct_proto_*.la' must begin with `lib'
o remove wrong flag at extensions/Makefile.am
o bumped version to 0.0.26
o fixed versioning :(
Modified: trunk/libnetfilter_conntrack/configure.in
===================================================================
--- trunk/libnetfilter_conntrack/configure.in 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/configure.in 2005-11-06 03:22:01 UTC (rev 4482)
@@ -4,7 +4,7 @@
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.20)
+AM_INIT_AUTOMAKE(libnetfilter_conntrack, 0.0.26)
AC_PROG_CC
AM_PROG_LIBTOOL
Modified: trunk/libnetfilter_conntrack/extensions/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/extensions/Makefile.am 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/extensions/Makefile.am 2005-11-06 03:22:01 UTC (rev 4482)
@@ -8,14 +8,14 @@
CFLAGS=-fPIC -Wall
LIBS=
-pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la \
- nfct_proto_icmp.la nfct_proto_sctp.la
+pkglib_LTLIBRARIES = libnfct_proto_tcp.la libnfct_proto_udp.la \
+ libnfct_proto_icmp.la libnfct_proto_sctp.la
-nfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c
-nfct_proto_tcp_la_LDFLAGS = -module -lnetfilter_conntrack
-nfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c
-nfct_proto_udp_la_LDFLAGS = -module -lnetfilter_conntrack
-nfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
-nfct_proto_icmp_la_LDFLAGS = -module -lnetfilter_conntrack
-nfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
-nfct_proto_sctp_la_LDFLAGS = -module -lnetfilter_conntrack
+libnfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c
+libnfct_proto_tcp_la_LDFLAGS = -module
+libnfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c
+libnfct_proto_udp_la_LDFLAGS = -module
+libnfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
+libnfct_proto_icmp_la_LDFLAGS = -module
+libnfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
+libnfct_proto_sctp_la_LDFLAGS = -module
Modified: trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c
===================================================================
--- trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_icmp.c 2005-11-06 03:22:01 UTC (rev 4482)
@@ -38,15 +38,13 @@
&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));
+ 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 for type=8 (ECHO) but we want to
+ /* 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,
@@ -59,7 +57,7 @@
.parse_proto = parse_proto,
.build_tuple_proto = build_tuple_proto,
.print_proto = print_proto,
- .version = LIBNETFILTER_CONNTRACK_VERSION
+ .version = VERSION
};
static void __attribute__ ((constructor)) init(void);
Modified: trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_sctp.c
===================================================================
--- trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_sctp.c 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_sctp.c 2005-11-06 03:22:01 UTC (rev 4482)
@@ -63,7 +63,7 @@
.build_tuple_proto = build_tuple_proto,
.print_proto = print_proto,
.print_protoinfo = print_protoinfo,
- .version = LIBNETFILTER_CONNTRACK_VERSION
+ .version = VERSION
};
static void __attribute__ ((constructor)) init(void);
Modified: trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_tcp.c
===================================================================
--- trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_tcp.c 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_tcp.c 2005-11-06 03:22:01 UTC (rev 4482)
@@ -102,7 +102,7 @@
.build_protoinfo = build_protoinfo,
.print_protoinfo = print_protoinfo,
.print_proto = print_proto,
- .version = LIBNETFILTER_CONNTRACK_VERSION
+ .version = VERSION
};
static void __attribute__ ((constructor)) init(void);
Modified: trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_udp.c
===================================================================
--- trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_udp.c 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/extensions/libnetfilter_conntrack_udp.c 2005-11-06 03:22:01 UTC (rev 4482)
@@ -47,7 +47,7 @@
.build_tuple_proto = build_tuple_proto,
.parse_proto = parse_proto,
.print_proto = print_proto,
- .version = LIBNETFILTER_CONNTRACK_VERSION,
+ .version = VERSION,
};
static void __attribute__ ((constructor)) init(void);
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2005-11-06 03:22:01 UTC (rev 4482)
@@ -13,8 +13,6 @@
#include <linux/netfilter/nfnetlink_conntrack.h>
#include <libnfnetlink/libnfnetlink.h>
-#define LIBNETFILTER_CONNTRACK_VERSION "0.2.5"
-
enum {
CONNTRACK = NFNL_SUBSYS_CTNETLINK,
EXPECT = NFNL_SUBSYS_CTNETLINK_EXP
@@ -198,8 +196,6 @@
struct nfct_handle;
typedef int (*nfct_callback)(void *arg, unsigned int flags, int, void *data);
-typedef int (*nfct_handler)(struct nfct_handle *cth, struct nlmsghdr *nlh,
- void *arg);
/*
* [Allocate|free] a conntrack
Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c 2005-11-06 03:09:43 UTC (rev 4481)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c 2005-11-06 03:22:01 UTC (rev 4482)
@@ -22,6 +22,9 @@
#define NFCT_BUFSIZE 4096
+typedef int (*nfct_handler)(struct nfct_handle *cth, struct nlmsghdr *nlh,
+ void *arg);
+
/* Harald says: "better for encapsulation" ;) */
struct nfct_handle {
struct nfnl_handle nfnlh;
@@ -927,9 +930,9 @@
void nfct_register_proto(struct nfct_proto *h)
{
- if (strcmp(h->version, LIBNETFILTER_CONNTRACK_VERSION) != 0) {
+ if (strcmp(h->version, VERSION) != 0) {
fprintf(stderr, "plugin `%s': version %s (I'm %s)\n",
- h->name, h->version, LIBNETFILTER_CONNTRACK_VERSION);
+ h->name, h->version, VERSION);
exit(1);
}
list_add(&h->head, &proto_list);
More information about the netfilter-cvslog
mailing list