OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/extensions/libxt_conntrack.c 1 --- a/extensions/libxt_conntrack.c
2 +++ b/extensions/libxt_conntrack.c 2 +++ b/extensions/libxt_conntrack.c
3 @@ -1389,6 +1389,7 @@ static int conntrack3_mt6_xlate(struct x 3 @@ -1397,6 +1397,7 @@ static int conntrack3_mt6_xlate(struct x
4 } 4 }
Line 5... Line 5...
5 5
6 static struct xtables_match conntrack_mt_reg[] = { 6 static struct xtables_match conntrack_mt_reg[] = {
7 +#ifndef NO_LEGACY 7 +#ifndef NO_LEGACY
8 { 8 {
9 .version = XTABLES_VERSION, 9 .version = XTABLES_VERSION,
10 .name = "conntrack", 10 .name = "conntrack",
11 @@ -1464,6 +1465,7 @@ static struct xtables_match conntrack_mt 11 @@ -1472,6 +1473,7 @@ static struct xtables_match conntrack_mt
12 .alias = conntrack_print_name_alias, 12 .alias = conntrack_print_name_alias,
13 .x6_options = conntrack2_mt_opts, 13 .x6_options = conntrack2_mt_opts,
14 }, 14 },
15 +#endif 15 +#endif
16 { 16 {
17 .version = XTABLES_VERSION, 17 .version = XTABLES_VERSION,
18 .name = "conntrack", 18 .name = "conntrack",
19 @@ -1496,6 +1498,7 @@ static struct xtables_match conntrack_mt 19 @@ -1504,6 +1506,7 @@ static struct xtables_match conntrack_mt
20 .x6_options = conntrack3_mt_opts, 20 .x6_options = conntrack3_mt_opts,
21 .xlate = conntrack3_mt6_xlate, 21 .xlate = conntrack3_mt6_xlate,
22 }, 22 },
23 +#ifndef NO_LEGACY 23 +#ifndef NO_LEGACY
24 { 24 {
25 .family = NFPROTO_UNSPEC, 25 .family = NFPROTO_UNSPEC,
26 .name = "state", 26 .name = "state",
27 @@ -1526,6 +1529,8 @@ static struct xtables_match conntrack_mt 27 @@ -1534,6 +1537,8 @@ static struct xtables_match conntrack_mt
28 .x6_parse = state_ct23_parse, 28 .x6_parse = state_ct23_parse,
29 .x6_options = state_opts, 29 .x6_options = state_opts,
30 }, 30 },
31 +#endif 31 +#endif
32 +#ifndef NO_LEGACY 32 +#ifndef NO_LEGACY
33 { 33 {
34 .family = NFPROTO_UNSPEC, 34 .family = NFPROTO_UNSPEC,
35 .name = "state", 35 .name = "state",
36 @@ -1555,6 +1560,7 @@ static struct xtables_match conntrack_mt 36 @@ -1563,6 +1568,7 @@ static struct xtables_match conntrack_mt
37 .x6_parse = state_parse, 37 .x6_parse = state_parse,
38 .x6_options = state_opts, 38 .x6_options = state_opts,
39 }, 39 },
40 +#endif 40 +#endif