diff options
Diffstat (limited to 'package/network/utils/iptables/patches/010-add-set-dscpmark-support.patch')
| -rw-r--r-- | package/network/utils/iptables/patches/010-add-set-dscpmark-support.patch | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/package/network/utils/iptables/patches/010-add-set-dscpmark-support.patch b/package/network/utils/iptables/patches/010-add-set-dscpmark-support.patch index fb6978e6f7..9a5de639aa 100644 --- a/package/network/utils/iptables/patches/010-add-set-dscpmark-support.patch +++ b/package/network/utils/iptables/patches/010-add-set-dscpmark-support.patch @@ -15,8 +15,6 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> include/linux/netfilter/xt_connmark.h | 10 + 2 files changed, 324 insertions(+), 1 deletion(-) -diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c -index 21e10913..c777b110 100644 --- a/extensions/libxt_CONNMARK.c +++ b/extensions/libxt_CONNMARK.c @@ -22,6 +22,7 @@ @@ -47,7 +45,7 @@ index 21e10913..c777b110 100644 }; static const char *const xt_connmark_shift_ops[] = { -@@ -114,6 +118,8 @@ static const struct xt_option_entry connmark_tg_opts[] = { +@@ -114,6 +118,8 @@ static const struct xt_option_entry conn .excl = F_MASK, .flags = XTOPT_PUT, XTOPT_POINTER(s, nfmask)}, {.name = "mask", .id = O_MASK, .type = XTTYPE_UINT32, .excl = F_CTMASK | F_NFMASK}, @@ -56,7 +54,7 @@ index 21e10913..c777b110 100644 XTOPT_TABLEEND, }; #undef s -@@ -148,6 +154,38 @@ static const struct xt_option_entry connmark_tg_opts_v2[] = { +@@ -148,6 +154,38 @@ static const struct xt_option_entry conn }; #undef s @@ -111,7 +109,7 @@ index 21e10913..c777b110 100644 static void connmark_tg_init(struct xt_entry_target *target) { struct xt_connmark_tginfo1 *info = (void *)target->data; -@@ -199,6 +246,16 @@ static void connmark_tg_init_v2(struct xt_entry_target *target) +@@ -199,6 +246,16 @@ static void connmark_tg_init_v2(struct x info->shift_bits = 0; } @@ -128,7 +126,7 @@ index 21e10913..c777b110 100644 static void CONNMARK_parse(struct xt_option_call *cb) { struct xt_connmark_target_info *markinfo = cb->data; -@@ -253,6 +310,23 @@ static void connmark_tg_parse(struct xt_option_call *cb) +@@ -253,6 +310,23 @@ static void connmark_tg_parse(struct xt_ info->ctmark = cb->val.u32; info->ctmask = 0; break; @@ -152,7 +150,7 @@ index 21e10913..c777b110 100644 case O_SAVE_MARK: info->mode = XT_CONNMARK_SAVE; break; -@@ -320,6 +394,78 @@ static void connmark_tg_parse_v2(struct xt_option_call *cb) +@@ -320,6 +394,78 @@ static void connmark_tg_parse_v2(struct } } @@ -231,7 +229,7 @@ index 21e10913..c777b110 100644 static void connmark_tg_check(struct xt_fcheck_call *cb) { if (!(cb->xflags & F_OP_ANY)) -@@ -463,6 +609,65 @@ connmark_tg_print_v2(const void *ip, const struct xt_entry_target *target, +@@ -463,6 +609,65 @@ connmark_tg_print_v2(const void *ip, con } } @@ -297,7 +295,7 @@ index 21e10913..c777b110 100644 static void CONNMARK_save(const void *ip, const struct xt_entry_target *target) { const struct xt_connmark_target_info *markinfo = -@@ -548,6 +753,38 @@ connmark_tg_save_v2(const void *ip, const struct xt_entry_target *target) +@@ -548,6 +753,38 @@ connmark_tg_save_v2(const void *ip, cons } } @@ -336,7 +334,7 @@ index 21e10913..c777b110 100644 static int connmark_tg_xlate(struct xt_xlate *xl, const struct xt_xlate_tg_params *params) { -@@ -639,6 +876,66 @@ static int connmark_tg_xlate_v2(struct xt_xlate *xl, +@@ -639,6 +876,66 @@ static int connmark_tg_xlate_v2(struct x return 1; } @@ -403,7 +401,7 @@ index 21e10913..c777b110 100644 static struct xtables_target connmark_tg_reg[] = { { .family = NFPROTO_UNSPEC, -@@ -687,6 +984,22 @@ static struct xtables_target connmark_tg_reg[] = { +@@ -687,6 +984,22 @@ static struct xtables_target connmark_tg .x6_options = connmark_tg_opts_v2, .xlate = connmark_tg_xlate_v2, }, @@ -426,8 +424,6 @@ index 21e10913..c777b110 100644 }; void _init(void) -diff --git a/include/linux/netfilter/xt_connmark.h b/include/linux/netfilter/xt_connmark.h -index bbf2acc9..1d8e721c 100644 --- a/include/linux/netfilter/xt_connmark.h +++ b/include/linux/netfilter/xt_connmark.h @@ -18,6 +18,11 @@ enum { @@ -454,6 +450,3 @@ index bbf2acc9..1d8e721c 100644 struct xt_connmark_mtinfo1 { __u32 mark, mask; __u8 invert; --- -2.21.0 (Apple Git-122.2) - |