From bc7c1f1a4a6a5e003f66df2bab082fa521e9bb5e Mon Sep 17 00:00:00 2001
From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter
Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org"
</C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=pablo/emailAddress=pablo@netfilter.org>
Date: Sun, 16 Oct 2005 21:46:30 +0000
Subject: See ChangeLog
---
include/conntrack.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
include/libct_proto.h | 53 ---------------------------------------------------
2 files changed, 53 insertions(+), 53 deletions(-)
create mode 100644 include/conntrack.h
delete mode 100644 include/libct_proto.h
(limited to 'include')
diff --git a/include/conntrack.h b/include/conntrack.h
new file mode 100644
index 0000000..db434d6
--- /dev/null
+++ b/include/conntrack.h
@@ -0,0 +1,53 @@
+#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
diff --git a/include/libct_proto.h b/include/libct_proto.h
deleted file mode 100644
index db434d6..0000000
--- a/include/libct_proto.h
+++ /dev/null
@@ -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
--
cgit v1.2.3