From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Date: Thu, 27 Oct 2011 07:26:30 +0000 (+0300)
Subject: iptables: Code preparation for option handling
X-Git-Tag: 0.78~104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cde720fb5b3d98e3a9bb10e9ba234e5cb7025e4a;p=platform%2Fupstream%2Fconnman.git

iptables: Code preparation for option handling
---

diff --git a/src/iptables.c b/src/iptables.c
index 68219ee..eef91c1 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -1213,6 +1213,30 @@ err:
 	return NULL;
 }
 
+static struct option iptables_opts[] = {
+	{.name = "append",        .has_arg = 1, .val = 'A'},
+	{.name = "delete",        .has_arg = 1, .val = 'D'},
+	{.name = "flush-chain",   .has_arg = 1, .val = 'F'},
+	{.name = "insert",        .has_arg = 1, .val = 'I'},
+	{.name = "list",          .has_arg = 2, .val = 'L'},
+	{.name = "new-chain",     .has_arg = 1, .val = 'N'},
+	{.name = "delete-chain",  .has_arg = 1, .val = 'X'},
+	{.name = "destination",   .has_arg = 1, .val = 'd'},
+	{.name = "in-interface",  .has_arg = 1, .val = 'i'},
+	{.name = "jump",          .has_arg = 1, .val = 'j'},
+	{.name = "match",         .has_arg = 1, .val = 'm'},
+	{.name = "out-interface", .has_arg = 1, .val = 'o'},
+	{.name = "source",        .has_arg = 1, .val = 's'},
+	{.name = "table",         .has_arg = 1, .val = 't'},
+	{NULL},
+};
+
+struct xtables_globals iptables_globals = {
+	.option_offset = 0,
+	.opts = iptables_opts,
+	.orig_opts = iptables_opts,
+};
+
 static struct xtables_target *prepare_target(struct connman_iptables *table,
 							char *target_name)
 {
@@ -1278,30 +1302,6 @@ static struct xtables_target *prepare_target(struct connman_iptables *table,
 	return xt_t;
 }
 
-static struct option iptables_opts[] = {
-	{.name = "append",        .has_arg = 1, .val = 'A'},
-	{.name = "delete",        .has_arg = 1, .val = 'D'},
-	{.name = "flush-chain",   .has_arg = 1, .val = 'F'},
-	{.name = "insert",        .has_arg = 1, .val = 'I'},
-	{.name = "list",          .has_arg = 2, .val = 'L'},
-	{.name = "new-chain",     .has_arg = 1, .val = 'N'},
-	{.name = "delete-chain",  .has_arg = 1, .val = 'X'},
-	{.name = "destination",   .has_arg = 1, .val = 'd'},
-	{.name = "in-interface",  .has_arg = 1, .val = 'i'},
-	{.name = "jump",          .has_arg = 1, .val = 'j'},
-	{.name = "match",         .has_arg = 1, .val = 'm'},
-	{.name = "out-interface", .has_arg = 1, .val = 'o'},
-	{.name = "source",        .has_arg = 1, .val = 's'},
-	{.name = "table",         .has_arg = 1, .val = 't'},
-	{NULL},
-};
-
-struct xtables_globals iptables_globals = {
-	.option_offset = 0,
-	.opts = iptables_opts,
-	.orig_opts = iptables_opts,
-};
-
 static int iptables_command(int argc, char *argv[])
 {
 	struct connman_iptables *table;