From: Tomasz Bursztyka Date: Thu, 27 Oct 2011 07:24:45 +0000 (+0300) Subject: tools: Code preparation for iptable-test option handling X-Git-Tag: 0.78~119 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e6ef28ed043cce4dfc268f9d40f06815d636021;p=platform%2Fupstream%2Fconnman.git tools: Code preparation for iptable-test option handling --- diff --git a/tools/iptables-test.c b/tools/iptables-test.c index 133c4f9..a29a1a0 100644 --- a/tools/iptables-test.c +++ b/tools/iptables-test.c @@ -1203,6 +1203,30 @@ err: return NULL; } +static struct option connman_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 connman_iptables_globals = { + .option_offset = 0, + .opts = connman_iptables_opts, + .orig_opts = connman_iptables_opts, +}; + static struct xtables_target *prepare_target(struct connman_iptables *table, char *target_name) { @@ -1268,30 +1292,6 @@ static struct xtables_target *prepare_target(struct connman_iptables *table, return xt_t; } -static struct option connman_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 connman_iptables_globals = { - .option_offset = 0, - .opts = connman_iptables_opts, - .orig_opts = connman_iptables_opts, -}; - int main(int argc, char *argv[]) { struct connman_iptables *table;