summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>2011-10-27 07:24:50 (GMT)
committerSamuel Ortiz <sameo@linux.intel.com>2011-10-28 19:26:12 (GMT)
commit505c3fb154e1fd4b04305d688363b0280b4d58f1 (patch)
treed9176fd13194e63118ebff72960c7b9e85b6d9be /tools
parent8b5ac9630c20508f6fc64af451ac585871a44358 (diff)
downloadconnman-505c3fb154e1fd4b04305d688363b0280b4d58f1.zip
connman-505c3fb154e1fd4b04305d688363b0280b4d58f1.tar.gz
connman-505c3fb154e1fd4b04305d688363b0280b4d58f1.tar.bz2
tools: Add x6_options target handling to iptables_test
Diffstat (limited to 'tools')
-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 eb7a164..40ae013 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