[netfilter-cvslog] r4360 - in trunk/conntrack: . extensions include
src
pablo at netfilter.org
pablo at netfilter.org
Sun Oct 16 23:46:32 CEST 2005
Author: pablo at netfilter.org
Date: 2005-10-16 23:46:30 +0200 (Sun, 16 Oct 2005)
New Revision: 4360
Added:
trunk/conntrack/include/conntrack.h
Removed:
trunk/conntrack/config.h.in
trunk/conntrack/include/libct_proto.h
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/src/conntrack.c
Log:
See ChangeLog
Modified: trunk/conntrack/ChangeLog
===================================================================
--- trunk/conntrack/ChangeLog 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/ChangeLog 2005-10-16 21:46:30 UTC (rev 4360)
@@ -1,3 +1,9 @@
+2005-10-16
+<pablo at netfilter.org>
+ o Rename libct_proto.h to conntrack.h
+ o Remove config.h.in from svn, it's autogenerated by the autocrap :)
+ o Remove dead functions in the SCTP protocol helper
+
2005-10-14
<pablo at netfilter.org>
o Kill config.h.in, it's generated by the autocrap
Deleted: trunk/conntrack/config.h.in
===================================================================
--- trunk/conntrack/config.h.in 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/config.h.in 2005-10-16 21:46:30 UTC (rev 4360)
@@ -1,65 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `nfnetlink' library (-lnfnetlink). */
-#undef HAVE_LIBNFNETLINK
-
-/* Define to 1 if you have the `nfnetlink_conntrack' library
- (-lnfnetlink_conntrack). */
-#undef HAVE_LIBNFNETLINK_CONNTRACK
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
Modified: trunk/conntrack/extensions/libct_proto_icmp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_icmp.c 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/extensions/libct_proto_icmp.c 2005-10-16 21:46:30 UTC (rev 4360)
@@ -14,7 +14,7 @@
#include <netinet/in.h> /* For htons */
#include <netinet/ip_icmp.h>
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include "libct_proto.h"
+#include "conntrack.h"
static struct option opts[] = {
{"icmp-type", 1, 0, '1'},
Modified: trunk/conntrack/extensions/libct_proto_sctp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_sctp.c 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/extensions/libct_proto_sctp.c 2005-10-16 21:46:30 UTC (rev 4360)
@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <string.h>
#include <netinet/in.h> /* For htons */
-#include "libct_proto.h"
+#include "conntrack.h"
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
static struct option opts[] = {
@@ -136,35 +136,6 @@
return 0;
}
-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]);
-}
-
-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]);
-*/
-}
-
-void print_protoinfo(union nfct_protoinfo *protoinfo)
-{
-/* fprintf(stdout, "%s ", states[protoinfo->sctp.state]); */
-}
-
-void print_proto(struct nfct_tuple *tuple)
-{
- fprintf(stdout, "sport=%u dport=%u ", htons(tuple->l4src.sctp.port),
- htons(tuple->l4dst.sctp.port));
-}
-
static struct ctproto_handler sctp = {
.name = "sctp",
.protonum = IPPROTO_SCTP,
Modified: trunk/conntrack/extensions/libct_proto_tcp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_tcp.c 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/extensions/libct_proto_tcp.c 2005-10-16 21:46:30 UTC (rev 4360)
@@ -14,7 +14,7 @@
#include <netinet/in.h> /* For htons */
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include "libct_proto.h"
+#include "conntrack.h"
static struct option opts[] = {
{"orig-port-src", 1, 0, '1'},
Modified: trunk/conntrack/extensions/libct_proto_udp.c
===================================================================
--- trunk/conntrack/extensions/libct_proto_udp.c 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/extensions/libct_proto_udp.c 2005-10-16 21:46:30 UTC (rev 4360)
@@ -11,7 +11,7 @@
#include <getopt.h>
#include <stdlib.h>
#include <netinet/in.h> /* For htons */
-#include "libct_proto.h"
+#include "conntrack.h"
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
static struct option opts[] = {
Copied: trunk/conntrack/include/conntrack.h (from rev 4359, trunk/conntrack/include/libct_proto.h)
Deleted: trunk/conntrack/include/libct_proto.h
===================================================================
--- trunk/conntrack/include/libct_proto.h 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/include/libct_proto.h 2005-10-16 21:46:30 UTC (rev 4360)
@@ -1,53 +0,0 @@
-#ifndef _LIBCT_PROTO_H
-#define _LIBCT_PROTO_H
-
-#include "linux_list.h"
-#include <getopt.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-
-#define LIBCT_VERSION "0.1.0"
-
-/* FIXME: These should be independent from kernel space */
-#define IPS_ASSURED (1 << 2)
-#define IPS_SEEN_REPLY (1 << 1)
-#define IPS_SRC_NAT_DONE (1 << 7)
-#define IPS_DST_NAT_DONE (1 << 8)
-#define IPS_CONFIRMED (1 << 3)
-
-struct ctproto_handler {
- struct list_head head;
-
- char *name;
- u_int16_t protonum;
- char *version;
-
- enum ctattr_protoinfo protoinfo_attr;
-
- int (*parse_opts)(char c, char *argv[],
- struct nfct_tuple *orig,
- struct nfct_tuple *reply,
- struct nfct_tuple *mask,
- union nfct_protoinfo *proto,
- unsigned int *flags);
-
- int (*final_check)(unsigned int flags,
- struct nfct_tuple *orig,
- struct nfct_tuple *reply);
-
- void (*help)();
-
- struct option *opts;
-
- unsigned int option_offset;
-};
-
-extern void register_proto(struct ctproto_handler *h);
-extern void unregister_proto(struct ctproto_handler *h);
-
-#define NIPQUAD(addr) \
- ((unsigned char *)&addr)[0], \
- ((unsigned char *)&addr)[1], \
- ((unsigned char *)&addr)[2], \
- ((unsigned char *)&addr)[3]
-
-#endif
Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c 2005-10-16 21:13:29 UTC (rev 4359)
+++ trunk/conntrack/src/conntrack.c 2005-10-16 21:46:30 UTC (rev 4360)
@@ -45,7 +45,7 @@
#include <dlfcn.h>
#include <string.h>
#include "linux_list.h"
-#include "libct_proto.h"
+#include "conntrack.h"
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
#define PROGNAME "conntrack"
More information about the netfilter-cvslog
mailing list