diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2011-10-27 10:24:50 +0300 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-28 21:26:12 +0200 |
| commit | 505c3fb154e1fd4b04305d688363b0280b4d58f1 (patch) | |
| tree | d9176fd13194e63118ebff72960c7b9e85b6d9be /tools | |
| parent | 8b5ac9630c20508f6fc64af451ac585871a44358 (diff) | |
| download | connman-505c3fb154e1fd4b04305d688363b0280b4d58f1.tar.gz connman-505c3fb154e1fd4b04305d688363b0280b4d58f1.tar.bz2 connman-505c3fb154e1fd4b04305d688363b0280b4d58f1.zip | |
tools: Add x6_options target handling to iptables_test
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/iptables-test.c | 14 |
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 |