libxtables: pass struct xt_entry_{match,target} to x6 parser

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/include/xtables.h.in b/include/xtables.h.in
index 6167f4da3e5ec8b9fe6b4013d035702095d70e7e..afade14b8ec442b5e5853ed73ac44ea136a0c501 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -126,6 +126,10 @@ struct xt_option_call {
                        uint32_t mark, mask;
                };
        } val;
+       union {
+               struct xt_entry_match **match;
+               struct xt_entry_target **target;
+       };
 };
 
 /**

diff --git a/xtoptions.c b/xtoptions.c
index 939e68603e8813a90977f009448b2998ed977a7b..b3acff9e9cb9af8def86ca2bd870fa510d036fa9 100644 (file)
--- a/xtoptions.c
+++ b/xtoptions.c
@@ -384,6 +384,7 @@ void xtables_option_tpcall(unsigned int c, char **argv, bool invert,
        cb.ext_name = t->name;
        cb.data     = t->t->data;
        cb.xflags   = t->tflags;
+       cb.target   = &t->t;
        t->x6_parse(&cb);
        t->tflags = cb.xflags;
 }
@@ -417,6 +418,7 @@ void xtables_option_mpcall(unsigned int c, char **argv, bool invert,
        cb.ext_name = m->name;
        cb.data     = m->m->data;
        cb.xflags   = m->mflags;
+       cb.match    = &m->m;
        m->x6_parse(&cb);
        m->mflags = cb.xflags;
 }