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

---
 extensions/libct_proto_icmp.c |  2 +-
 extensions/libct_proto_sctp.c | 31 +------------------------------
 extensions/libct_proto_tcp.c  |  2 +-
 extensions/libct_proto_udp.c  |  2 +-
 4 files changed, 4 insertions(+), 33 deletions(-)

(limited to 'extensions')

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[] = {
-- 
cgit v1.2.3