From 505c3fb154e1fd4b04305d688363b0280b4d58f1 Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 27 Oct 2011 10:24:50 +0300 Subject: tools: Add x6_options target handling to iptables_test --- tools/iptables-test.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3