2
===================================================================
5
@@ -11441,6 +11441,7 @@
6
-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
7
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
9
+ -fno-strict-aliasing -Werror\
10
-DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL";
12
if [ -n "$kbuilddir" ]; then
13
Index: b/include/linux/netfilter_ipv4/ipt_ECN.h
14
===================================================================
15
--- a/include/linux/netfilter_ipv4/ipt_ECN.h
16
+++ b/include/linux/netfilter_ipv4/ipt_ECN.h
19
#ifndef _IPT_ECN_TARGET_H
20
#define _IPT_ECN_TARGET_H
21
-#include <linux/netfilter_ipv4/ipt_DSCP.h>
22
+#include <linux/netfilter/xt_DSCP.h>
24
-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK)
25
+#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
27
#define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */
28
#define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */
29
Index: b/include/linux/netfilter_ipv4/ipt_ecn.h
30
===================================================================
31
--- a/include/linux/netfilter_ipv4/ipt_ecn.h
32
+++ b/include/linux/netfilter_ipv4/ipt_ecn.h
37
-#include <linux/netfilter_ipv4/ipt_dscp.h>
38
+#include <linux/netfilter/xt_DSCP.h>
40
-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK)
41
+#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
43
#define IPT_ECN_OP_MATCH_IP 0x01
44
#define IPT_ECN_OP_MATCH_ECE 0x10
45
Index: b/libiptc/libip4tc.c
46
===================================================================
47
--- a/libiptc/libip4tc.c
48
+++ b/libiptc/libip4tc.c
50
#define TC_FREE iptc_free
51
#define TC_COMMIT iptc_commit
52
#define TC_STRERROR iptc_strerror
53
-#define TC_NUM_RULES iptc_num_rules
54
-#define TC_GET_RULE iptc_get_rule
57
#define TC_IPPROTO IPPROTO_IP
58
Index: b/libiptc/libip6tc.c
59
===================================================================
60
--- a/libiptc/libip6tc.c
61
+++ b/libiptc/libip6tc.c
63
#define TC_FREE ip6tc_free
64
#define TC_COMMIT ip6tc_commit
65
#define TC_STRERROR ip6tc_strerror
66
-#define TC_NUM_RULES ip6tc_num_rules
67
-#define TC_GET_RULE ip6tc_get_rule
69
#define TC_AF AF_INET6
70
#define TC_IPPROTO IPPROTO_IPV6
71
Index: b/libiptc/libiptc.c
72
===================================================================
73
--- a/libiptc/libiptc.c
74
+++ b/libiptc/libiptc.c
75
@@ -1563,45 +1563,6 @@
79
-/* How many rules in this chain? */
81
-TC_NUM_RULES(const char *chain, struct xtc_handle *handle)
83
- struct chain_head *c;
84
- iptc_fn = TC_NUM_RULES;
87
- c = iptcc_find_label(chain, handle);
90
- return (unsigned int)-1;
93
- return c->num_rules;
96
-static const STRUCT_ENTRY *
97
-TC_GET_RULE(const char *chain, unsigned int n, struct xtc_handle *handle)
99
- struct chain_head *c;
100
- struct rule_head *r;
102
- iptc_fn = TC_GET_RULE;
106
- c = iptcc_find_label(chain, handle);
112
- r = iptcc_get_rule_num(c, n);
118
/* Returns a pointer to the target name of this position. */
119
static const char *standard_target_map(int verdict)