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 <fw@strlen.de>

diff --git a/extensions/libip6t_DNAT.c b/extensions/libip6t_DNAT.c
index 2a7574b0244407436c9282df74768af32e5ef8ca..89c5ceb1532503a22a40991143a1b4bfdb413d95 100644 (file)
--- 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 b89d3ca5f0d4c3adf87e0736eab0c98806afec6a..4907a2e83d066b092fac203b943e02908ebe61c4 100644 (file)
--- 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,