mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
2e590a6364
Update iptables to 1.8.6 ChangeLog: https://netfilter.org/projects/iptables/files/changes-iptables-1.8.6.txt Refresh patch: 101-remove-check-already.patch Signed-off-by: Curtis Deptuck <curtdept@me.com> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [refresh patches]
96 lines
2.4 KiB
Diff
96 lines
2.4 KiB
Diff
--- a/extensions/libxt_conntrack.c
|
|
+++ b/extensions/libxt_conntrack.c
|
|
@@ -1395,6 +1395,7 @@ static int conntrack3_mt6_xlate(struct x
|
|
}
|
|
|
|
static struct xtables_match conntrack_mt_reg[] = {
|
|
+#ifndef NO_LEGACY
|
|
{
|
|
.version = XTABLES_VERSION,
|
|
.name = "conntrack",
|
|
@@ -1470,6 +1471,7 @@ static struct xtables_match conntrack_mt
|
|
.alias = conntrack_print_name_alias,
|
|
.x6_options = conntrack2_mt_opts,
|
|
},
|
|
+#endif
|
|
{
|
|
.version = XTABLES_VERSION,
|
|
.name = "conntrack",
|
|
@@ -1502,6 +1504,7 @@ static struct xtables_match conntrack_mt
|
|
.x6_options = conntrack3_mt_opts,
|
|
.xlate = conntrack3_mt6_xlate,
|
|
},
|
|
+#ifndef NO_LEGACY
|
|
{
|
|
.family = NFPROTO_UNSPEC,
|
|
.name = "state",
|
|
@@ -1532,6 +1535,8 @@ static struct xtables_match conntrack_mt
|
|
.x6_parse = state_ct23_parse,
|
|
.x6_options = state_opts,
|
|
},
|
|
+#endif
|
|
+#ifndef NO_LEGACY
|
|
{
|
|
.family = NFPROTO_UNSPEC,
|
|
.name = "state",
|
|
@@ -1561,6 +1566,7 @@ static struct xtables_match conntrack_mt
|
|
.x6_parse = state_parse,
|
|
.x6_options = state_opts,
|
|
},
|
|
+#endif
|
|
};
|
|
|
|
void _init(void)
|
|
--- a/extensions/libxt_CT.c
|
|
+++ b/extensions/libxt_CT.c
|
|
@@ -363,6 +363,7 @@ static int xlate_ct1_tg(struct xt_xlate
|
|
}
|
|
|
|
static struct xtables_target ct_target_reg[] = {
|
|
+#ifndef NO_LEGACY
|
|
{
|
|
.family = NFPROTO_UNSPEC,
|
|
.name = "CT",
|
|
@@ -388,6 +389,7 @@ static struct xtables_target ct_target_r
|
|
.x6_parse = ct_parse_v1,
|
|
.x6_options = ct_opts_v1,
|
|
},
|
|
+#endif
|
|
{
|
|
.family = NFPROTO_UNSPEC,
|
|
.name = "CT",
|
|
@@ -403,6 +405,7 @@ static struct xtables_target ct_target_r
|
|
.x6_options = ct_opts_v1,
|
|
.xlate = xlate_ct1_tg,
|
|
},
|
|
+#ifndef NO_LEGACY
|
|
{
|
|
.family = NFPROTO_UNSPEC,
|
|
.name = "NOTRACK",
|
|
@@ -441,6 +444,7 @@ static struct xtables_target ct_target_r
|
|
.revision = 0,
|
|
.version = XTABLES_VERSION,
|
|
},
|
|
+#endif
|
|
};
|
|
|
|
void _init(void)
|
|
--- a/extensions/libxt_multiport.c
|
|
+++ b/extensions/libxt_multiport.c
|
|
@@ -571,6 +571,7 @@ static int multiport_xlate6_v1(struct xt
|
|
}
|
|
|
|
static struct xtables_match multiport_mt_reg[] = {
|
|
+#ifndef NO_LEGACY
|
|
{
|
|
.family = NFPROTO_IPV4,
|
|
.name = "multiport",
|
|
@@ -601,6 +602,7 @@ static struct xtables_match multiport_mt
|
|
.x6_options = multiport_opts,
|
|
.xlate = multiport_xlate6,
|
|
},
|
|
+#endif
|
|
{
|
|
.family = NFPROTO_IPV4,
|
|
.name = "multiport",
|