iptables: Add x6_options target handling
authorTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Thu, 27 Oct 2011 07:26:35 +0000 (10:26 +0300)
committerSamuel Ortiz <sameo@linux.intel.com>
Fri, 28 Oct 2011 19:34:28 +0000 (21:34 +0200)
src/iptables.c

index e3129f6..5a90be7 100644 (file)
@@ -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