From e5cb42249f7fd5b730667150c9c19f10d2f215fd Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 25 Jul 2008 13:05:12 +0200
Subject: cleanup: split internal.h into several internal header files

This patch cleanups the internal headers by splitting them into several
logical pieces.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/deprecated/extensions/libnetfilter_conntrack_icmp.c   | 3 ++-
 src/deprecated/extensions/libnetfilter_conntrack_sctp.c   | 3 ++-
 src/deprecated/extensions/libnetfilter_conntrack_tcp.c    | 3 ++-
 src/deprecated/extensions/libnetfilter_conntrack_udp.c    | 3 ++-
 src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c | 3 ++-
 src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/deprecated')

diff --git a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c
index ae8470a..d15d7a1 100644
--- a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c
+++ b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c
@@ -14,9 +14,10 @@
 #include <netinet/in.h> /* For htons */
 #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_icmp.h>
 
+#include "internal/deprecated.h"
+
 static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
 {
 	if (cda[CTA_PROTO_ICMP_TYPE-1])
diff --git a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c
index 6225ca1..1fa63a5 100644
--- a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c
+++ b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c
@@ -14,9 +14,10 @@
 #include <netinet/in.h> /* For htons */
 #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_sctp.h>
 
+#include "internal/deprecated.h"
+
 static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
 {
 	if (cda[CTA_PROTO_SRC_PORT-1])
diff --git a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c
index a7ce2ce..60447fe 100644
--- a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c
+++ b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c
@@ -14,9 +14,10 @@
 #include <netinet/in.h> /* For htons */
 #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
+#include "internal/deprecated.h"
+
 static const char *states[] = {
 	"NONE",
 	"SYN_SENT",
diff --git a/src/deprecated/extensions/libnetfilter_conntrack_udp.c b/src/deprecated/extensions/libnetfilter_conntrack_udp.c
index b20ba04..522c0ae 100644
--- a/src/deprecated/extensions/libnetfilter_conntrack_udp.c
+++ b/src/deprecated/extensions/libnetfilter_conntrack_udp.c
@@ -14,9 +14,10 @@
 #include <netinet/in.h> /* For htons */
 #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_extensions.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_udp.h>
 
+#include "internal/deprecated.h"
+
 static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
 {
 	if (cda[CTA_PROTO_SRC_PORT-1])
diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c
index 8e8c681..fb84a6f 100644
--- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c
+++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c
@@ -11,9 +11,10 @@
 #include <netinet/in.h> /* For htons */
 #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_l3extensions.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h>
 
+#include "internal/deprecated.h"
+
 static void parse_proto(struct nfattr *cda[], struct nfct_tuple *tuple)
 {
 	if (cda[CTA_IP_V4_SRC-1])
diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
index 1b6b909..dc13395 100644
--- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
+++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
@@ -14,9 +14,10 @@
 #include <arpa/inet.h>
 #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_l3extensions.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h>
 
+#include "internal/deprecated.h"
+
 #ifndef HAVE_INET_NTOP_IPV6
 #warning "inet_ntop does not support IPv6"
 #endif
-- 
cgit v1.2.3