diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2008-08-04 12:47:48 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-08-04 12:47:48 +0200 |
commit | ef18e8147903885708d1c264904129af4fb636d6 (patch) | |
tree | 66859f8b391ba7b4be375d6f54195ad3e4a5e789 | |
parent | d9842a6d4650ebf11248c0681ff136771bc7aa14 (diff) |
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>
-rw-r--r-- | extensions/libxt_TCPOPTSTRIP.c | 1 | ||||
-rw-r--r-- | extensions/libxt_hashlimit.c | 1 | ||||
-rw-r--r-- | extensions/libxt_time.c | 1 | ||||
-rw-r--r-- | extensions/tos_values.c | 1 | ||||
-rw-r--r-- | include/ip6tables.h | 4 | ||||
-rw-r--r-- | include/iptables.h | 5 | ||||
-rw-r--r-- | include/libiptc/libxtc.h | 2 | ||||
-rw-r--r-- | include/xtables.h.in | 11 | ||||
-rw-r--r-- | xtables.c | 1 |
9 files changed, 17 insertions, 10 deletions
diff --git a/extensions/libxt_TCPOPTSTRIP.c b/extensions/libxt_TCPOPTSTRIP.c index bd74e379..a00c82b7 100644 --- a/extensions/libxt_TCPOPTSTRIP.c +++ b/extensions/libxt_TCPOPTSTRIP.c @@ -10,6 +10,7 @@ #include <string.h> #include <stdlib.h> #include <xtables.h> +#include <netinet/tcp.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter/xt_TCPOPTSTRIP.h> #ifndef TCPOPT_MD5SIG diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c index 2f6b3fcd..1f34fb98 100644 --- a/extensions/libxt_hashlimit.c +++ b/extensions/libxt_hashlimit.c @@ -11,6 +11,7 @@ * Error corections by nmalykh@bilim.com (22.01.2005) */ #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/extensions/libxt_time.c b/extensions/libxt_time.c index 97bb0d31..f2bb51fd 100644 --- a/extensions/libxt_time.c +++ b/extensions/libxt_time.c @@ -12,6 +12,7 @@ #include <sys/types.h> #include <getopt.h> #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/extensions/tos_values.c b/extensions/tos_values.c index 4c0b0bcb..0ab784da 100644 --- a/extensions/tos_values.c +++ b/extensions/tos_values.c @@ -1,6 +1,7 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> +#include <linux/ip.h> struct tos_value_mask { uint8_t value, mask; diff --git a/include/ip6tables.h b/include/ip6tables.h index 077fee92..dfbc9b2f 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 ecc7168f..99e8e1e1 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 031afb54..37010188 100644 --- a/include/libiptc/libxtc.h +++ b/include/libiptc/libxtc.h @@ -20,8 +20,6 @@ extern "C" { #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 4ce73e97..51cb67dc 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 { struct xtables_target *next; - xt_chainlabel name; + const char *name; /* Revision of target (0 by default). */ u_int8_t revision; @@ -32,6 +32,7 @@ #include <arpa/inet.h> #include <xtables.h> +#include <libiptc/libxtc.h> #ifndef NO_SHARED_LIBS #include <dlfcn.h> |