From ac1e85a1374950750a1e20d2991a9f2a430a92cd Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 3 May 2018 21:40:52 +0200 Subject: extensions: libipt_DNAT: use size of nf_nat_range2 for rev2 DNAT tests fail on nf-next.git, kernel complains about target size mismatch (40 vs 48), this fixes this for me. Fixes: 36976c4b5406 ("extensions: libipt_DNAT: support shifted portmap ranges") Signed-off-by: Florian Westphal --- extensions/libip6t_DNAT.c | 4 ++-- extensions/libipt_DNAT.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/libip6t_DNAT.c b/extensions/libip6t_DNAT.c index 2a7574b0..89c5ceb1 100644 --- a/extensions/libip6t_DNAT.c +++ b/extensions/libip6t_DNAT.c @@ -393,8 +393,8 @@ static struct xtables_target dnat_tg_reg[] = { .version = XTABLES_VERSION, .family = NFPROTO_IPV6, .revision = 2, - .size = XT_ALIGN(sizeof(struct nf_nat_range)), - .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range)), + .size = XT_ALIGN(sizeof(struct nf_nat_range2)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range2)), .help = DNAT_help_v2, .print = DNAT_print_v2, .save = DNAT_save_v2, diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index b89d3ca5..4907a2e8 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -537,8 +537,8 @@ static struct xtables_target dnat_tg_reg[] = { .version = XTABLES_VERSION, .family = NFPROTO_IPV4, .revision = 2, - .size = XT_ALIGN(sizeof(struct nf_nat_range)), - .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range)), + .size = XT_ALIGN(sizeof(struct nf_nat_range2)), + .userspacesize = XT_ALIGN(sizeof(struct nf_nat_range2)), .help = DNAT_help_v2, .print = DNAT_print_v2, .save = DNAT_save_v2, -- cgit v1.2.3