diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | config.h.in | 65 | ||||
| -rw-r--r-- | extensions/libct_proto_icmp.c | 2 | ||||
| -rw-r--r-- | extensions/libct_proto_sctp.c | 31 | ||||
| -rw-r--r-- | extensions/libct_proto_tcp.c | 2 | ||||
| -rw-r--r-- | extensions/libct_proto_udp.c | 2 | ||||
| -rw-r--r-- | include/conntrack.h (renamed from include/libct_proto.h) | 0 | ||||
| -rw-r--r-- | src/conntrack.c | 2 |
8 files changed, 11 insertions, 99 deletions
@@ -1,3 +1,9 @@ +2005-10-16 +<pablo@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@netfilter.org> o Kill config.h.in, it's generated by the autocrap diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 9045dbb..0000000 --- a/config.h.in +++ /dev/null @@ -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 diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c index 7142fa7..d7d9d5a 100644 --- a/extensions/libct_proto_icmp.c +++ b/extensions/libct_proto_icmp.c @@ -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'}, diff --git a/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c index bc91966..5e96dc1 100644 --- a/extensions/libct_proto_sctp.c +++ b/extensions/libct_proto_sctp.c @@ -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 @@ int final_check(unsigned int flags, 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, diff --git a/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c index 3b06aa2..97646ab 100644 --- a/extensions/libct_proto_tcp.c +++ b/extensions/libct_proto_tcp.c @@ -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'}, diff --git a/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c index 8e77f0c..0da7bb5 100644 --- a/extensions/libct_proto_udp.c +++ b/extensions/libct_proto_udp.c @@ -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[] = { diff --git a/include/libct_proto.h b/include/conntrack.h index db434d6..db434d6 100644 --- a/include/libct_proto.h +++ b/include/conntrack.h diff --git a/src/conntrack.c b/src/conntrack.c index 8132dcb..6946d66 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -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" |