From a1586cea00b32b401c76f17aab4121967051d883 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 14 Apr 2009 10:36:07 +0200
Subject: snprintf: remove duplicated protocol string definitions

This patch merges duplicated protocol string definitions in the
snprintf infrastructure. I have also fixed the size of the string
array. This patch is a cleanup.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 include/internal/extern.h   | 7 +++++++
 include/internal/internal.h | 3 +++
 2 files changed, 10 insertions(+)

(limited to 'include')

diff --git a/include/internal/extern.h b/include/internal/extern.h
index d0b079f..e1bbc13 100644
--- a/include/internal/extern.h
+++ b/include/internal/extern.h
@@ -13,4 +13,11 @@ extern get_exp_attr	get_exp_attr_array[];
 
 extern uint32_t attr_grp_bitmask[ATTR_GRP_MAX][__NFCT_BITSET];
 
+/* for the snprintf infrastructure */
+extern const char 	*l3proto2str[AF_MAX];
+extern const char	*proto2str[IPPROTO_MAX];
+extern const char	*states[TCP_CONNTRACK_MAX];
+extern const char	*sctp_states[SCTP_CONNTRACK_MAX];
+extern const char	*dccp_states[DCCP_CONNTRACK_MAX];
+
 #endif
diff --git a/include/internal/internal.h b/include/internal/internal.h
index a72e071..c335afd 100644
--- a/include/internal/internal.h
+++ b/include/internal/internal.h
@@ -23,6 +23,9 @@
 
 #include <libnfnetlink/libnfnetlink.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack_sctp.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack_dccp.h>
 
 #include "internal/object.h"
 #include "internal/prototypes.h"
-- 
cgit v1.2.3