summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/iptables-test.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/iptables-test.c b/tools/iptables-test.c
index eb7a164e..40ae0135 100644
--- a/tools/iptables-test.c
+++ b/tools/iptables-test.c
@@ -1289,8 +1289,18 @@ static struct xtables_target *prepare_target(struct connman_iptables *table,
xt_t->init(xt_t->t);
}
- connman_iptables_globals.opts =
- xtables_merge_options(
+ if (xt_t->x6_options != NULL)
+ connman_iptables_globals.opts =
+ xtables_options_xfrm(
+#if XTABLES_VERSION_CODE > 5
+ connman_iptables_globals.orig_opts,
+#endif
+ connman_iptables_globals.opts,
+ xt_t->x6_options,
+ &xt_t->option_offset);
+ else
+ connman_iptables_globals.opts =
+ xtables_merge_options(
#if XTABLES_VERSION_CODE > 5
connman_iptables_globals.orig_opts,
#endif