src: remove dependency on libiptc headers
xtables.h does not need really need libxtc.h, and we can drop it from
the install as it is internal-only.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
diff --git a/include/ip6tables.h b/include/ip6tables.h
index 077fee9..dfbc9b2 100644
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -1,9 +1,9 @@
#ifndef _IP6TABLES_USER_H
#define _IP6TABLES_USER_H
+#include <netinet/ip.h>
#include <xtables.h>
-
-#include "libiptc/libip6tc.h"
+#include <libiptc/libip6tc.h>
#ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
#define IP6T_SO_GET_REVISION_MATCH 68
diff --git a/include/iptables.h b/include/iptables.h
index ecc7168..99e8e1e 100644
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -1,8 +1,9 @@
#ifndef _IPTABLES_USER_H
#define _IPTABLES_USER_H
-#include "xtables.h"
-#include "libiptc/libiptc.h"
+#include <netinet/ip.h>
+#include <xtables.h>
+#include <libiptc/libiptc.h>
#ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
#define IPT_SO_GET_REVISION_MATCH (IPT_BASE_CTL + 2)
diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h
index 031afb5..3701018 100644
--- a/include/libiptc/libxtc.h
+++ b/include/libiptc/libxtc.h
@@ -20,8 +20,6 @@
#define XT_ALIGN(s) (((s) + ((XT_MIN_ALIGN)-1)) & ~((XT_MIN_ALIGN)-1))
#endif
-typedef char xt_chainlabel[32];
-
#define XTC_LABEL_ACCEPT "ACCEPT"
#define XTC_LABEL_DROP "DROP"
#define XTC_LABEL_QUEUE "QUEUE"
diff --git a/include/xtables.h.in b/include/xtables.h.in
index 4ce73e9..51cb67d 100644
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -1,11 +1,12 @@
#ifndef _XTABLES_H
#define _XTABLES_H
+#include <sys/socket.h> /* PF_* */
#include <sys/types.h>
+#include <stdbool.h>
+#include <net/if.h>
#include <linux/types.h>
#include <linux/netfilter/x_tables.h>
-#include <libiptc/libxtc.h>
-#include <stdbool.h>
#ifndef IPPROTO_SCTP
#define IPPROTO_SCTP 132
@@ -22,12 +23,14 @@
#define XTABLES_API_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z)
+struct in_addr;
+
/* Include file for additions: new matches and targets. */
struct xtables_match
{
struct xtables_match *next;
- xt_chainlabel name;
+ const char *name;
/* Revision of match (0 by default). */
u_int8_t revision;
@@ -83,7 +86,7 @@
{
struct xtables_target *next;
- xt_chainlabel name;
+ const char *name;
/* Revision of target (0 by default). */
u_int8_t revision;