projects
/
framework
/
connectivity
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b5ac96
)
tools: Add x6_options target handling to iptables_test
author
Tomasz Bursztyka
<tomasz.bursztyka@linux.intel.com>
Thu, 27 Oct 2011 07:24:50 +0000
(10:24 +0300)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Fri, 28 Oct 2011 19:26:12 +0000
(21:26 +0200)
tools/iptables-test.c
patch
|
blob
|
history
diff --git
a/tools/iptables-test.c
b/tools/iptables-test.c
index
eb7a164
..
40ae013
100644
(file)
--- 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