diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2011-10-27 10:26:35 +0300 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-28 21:34:28 +0200 |
| commit | 78f2312d70e4cd008d4fd4666f40d953089c4fb6 (patch) | |
| tree | 10072d1ca9a68b231523e1c31ed92fe043a72c7b /src/iptables.c | |
| parent | e1a4156c5edeae0f75cd53e87a0482f785def9cb (diff) | |
| download | connman-78f2312d70e4cd008d4fd4666f40d953089c4fb6.tar.gz connman-78f2312d70e4cd008d4fd4666f40d953089c4fb6.tar.bz2 connman-78f2312d70e4cd008d4fd4666f40d953089c4fb6.zip | |
iptables: Add x6_options target handling
Diffstat (limited to 'src/iptables.c')
| -rw-r--r-- | src/iptables.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/iptables.c b/src/iptables.c index e3129f66..5a90be79 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1299,8 +1299,18 @@ static struct xtables_target *prepare_target(struct connman_iptables *table, xt_t->init(xt_t->t); } - iptables_globals.opts = - xtables_merge_options( + if (xt_t->x6_options != NULL) + iptables_globals.opts = + xtables_options_xfrm( +#if XTABLES_VERSION_CODE > 5 + iptables_globals.orig_opts, +#endif + iptables_globals.opts, + xt_t->x6_options, + &xt_t->option_offset); + else + iptables_globals.opts = + xtables_merge_options( #if XTABLES_VERSION_CODE > 5 iptables_globals.orig_opts, #endif |