From 78f2312d70e4cd008d4fd4666f40d953089c4fb6 Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 27 Oct 2011 10:26:35 +0300 Subject: [PATCH] iptables: Add x6_options target handling --- src/iptables.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/iptables.c b/src/iptables.c index e3129f6..5a90be7 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 -- 2.7.4