tools: Fix xtables API version issues with iptables-test

[framework/connectivity/connman.git] / tools / iptables-test.c

diff --git a/tools/iptables-test.c b/tools/iptables-test.c
index 5a3df95..3bbe43b 100644 (file)
--- a/tools/iptables-test.c
+++ b/tools/iptables-test.c
@@ -868,6 +868,35 @@ static int connman_iptables_delete_rule(struct connman_iptables *table,
        return 0;
 }
 
+static int connman_iptables_change_policy(struct connman_iptables *table,
+                                               char *chain_name, char *policy)
+{
+       GList *chain_head;
+       struct connman_iptables_entry *entry;
+       struct xt_entry_target *target;
+       struct xt_standard_target *t;
+       int verdict;
+
+       verdict = target_to_verdict(policy);
+       if (verdict == 0)
+               return -EINVAL;
+
+       chain_head = find_chain_head(table, chain_name);
+       if (chain_head == NULL)
+               return -EINVAL;
+
+       entry = chain_head->data;
+       if (entry->builtin < 0)
+               return -EINVAL;
+
+       target = ipt_get_target(entry->entry);
+
+       t = (struct xt_standard_target *)target;
+       t->verdict = verdict;
+
+       return 0;
+}
+
 static struct ipt_replace *connman_iptables_blob(struct connman_iptables *table)
 {
        struct ipt_replace *r;
@@ -1214,6 +1243,7 @@ static struct option connman_iptables_opts[] = {
        {.name = "insert",        .has_arg = 1, .val = 'I'},
        {.name = "list",          .has_arg = 2, .val = 'L'},
        {.name = "new-chain",     .has_arg = 1, .val = 'N'},
+       {.name = "policy",        .has_arg = 1, .val = 'P'},
        {.name = "delete-chain",  .has_arg = 1, .val = 'X'},
        {.name = "destination",   .has_arg = 1, .val = 'd'},
        {.name = "in-interface",  .has_arg = 1, .val = 'i'},
@@ -1293,16 +1323,17 @@ static struct xtables_target *prepare_target(struct connman_iptables *table,
                        xt_t->init(xt_t->t);
        }
 
+#if XTABLES_VERSION_CODE > 5
        if (xt_t->x6_options != NULL)
                connman_iptables_globals.opts =
                        xtables_options_xfrm(
-#if XTABLES_VERSION_CODE > 5
                                connman_iptables_globals.orig_opts,
-#endif
+
                                connman_iptables_globals.opts,
                                xt_t->x6_options,
                                &xt_t->option_offset);
        else
+#endif
                connman_iptables_globals.opts =
                        xtables_merge_options(
 #if XTABLES_VERSION_CODE > 5
@@ -1346,16 +1377,16 @@ static struct xtables_match *prepare_matches(struct connman_iptables *table,
        if (xt_m == xt_m->next)
                goto done;
 
+#if XTABLES_VERSION_CODE > 5
        if (xt_m->x6_options != NULL)
                connman_iptables_globals.opts =
                        xtables_options_xfrm(
-#if XTABLES_VERSION_CODE > 5
                                connman_iptables_globals.orig_opts,
-#endif
                                connman_iptables_globals.opts,
                                xt_m->x6_options,
                                &xt_m->option_offset);
        else
+#endif
                connman_iptables_globals.opts =
                        xtables_merge_options(
 #if XTABLES_VERSION_CODE > 5
@@ -1382,7 +1413,7 @@ int main(int argc, char *argv[])
        struct xtables_target *xt_t;
        struct ipt_ip ip;
        char *table_name, *chain, *new_chain, *match_name, *target_name;
-       char *delete_chain, *flush_chain;
+       char *delete_chain, *flush_chain, *policy;
        int c, in_len, out_len;
        gboolean dump, invert, delete, insert, delete_rule;
        struct in_addr src, dst;
@@ -1395,14 +1426,17 @@ int main(int argc, char *argv[])
        insert = FALSE;
        delete_rule = FALSE;
        table_name = chain = new_chain = match_name = target_name = NULL;
-       delete_chain = flush_chain = NULL;
+       delete_chain = flush_chain = policy = NULL;
        memset(&ip, 0, sizeof(struct ipt_ip));
        table = NULL;
        xt_rm = NULL;
        xt_m = NULL;
        xt_t = NULL;
 
-       while ((c = getopt_long(argc, argv, "-A:D:F:I:L::N:X:d:i:j:m:o:s:t:",
+       /* extension's options will generate false-positives errors */
+       opterr = 0;
+
+       while ((c = getopt_long(argc, argv, "-A:D:F:I:L::N:P:X:d:i:j:m:o:s:t:",
                                connman_iptables_globals.opts, NULL)) != -1) {
                switch (c) {
                case 'A':
@@ -1443,6 +1477,15 @@ int main(int argc, char *argv[])
                        new_chain = optarg;
                        break;
 
+               case 'P':
+                       chain = optarg;
+                       if (optind < argc)
+                               policy = argv[optind++];
+                       else
+                               goto out;
+
+                       break;
+
                case 'X':
                        delete = true;
                        delete_chain = optarg;
@@ -1535,6 +1578,7 @@ int main(int argc, char *argv[])
                        return -1;
 
                default:
+#if XTABLES_VERSION_CODE > 5
                        if (xt_t != NULL && (xt_t->x6_parse != NULL ||
                                                xt_t->parse != NULL) &&
                                        (c >= (int) xt_t->option_offset &&
@@ -1565,17 +1609,49 @@ int main(int argc, char *argv[])
 
                                break;
                        }
+#else
+                       if (xt_t == NULL || xt_t->parse == NULL ||
+                               !xt_t->parse(c - xt_t->option_offset,
+                               argv, invert, &xt_t->tflags, NULL, &xt_t->t)) {
+
+                               for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL;
+                                               tmp_xt_rm = tmp_xt_rm->next) {
+                                       xt_m_t = tmp_xt_rm->match;
+
+                                       if (tmp_xt_rm->completed ||
+                                                       xt_m_t->parse == NULL)
+                                               continue;
 
+                                       if (xt_m->parse(c - xt_m->option_offset,
+                                               argv, invert, &xt_m->mflags,
+                                               NULL, &xt_m->m))
+                                               break;
+                               }
+                       }
+#endif
                        break;
                }
+
+               invert = FALSE;
        }
 
+#if XTABLES_VERSION_CODE > 5
        for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL;
                                tmp_xt_rm = tmp_xt_rm->next)
                xtables_option_mfcall(tmp_xt_rm->match);
 
        if (xt_t != NULL)
                xtables_option_tfcall(xt_t);
+#else
+       for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL;
+                               tmp_xt_rm = tmp_xt_rm->next)
+               if (tmp_xt_rm->match->final_check != NULL)
+                       tmp_xt_rm->match->final_check(
+                                       tmp_xt_rm->match->mflags);
+
+       if (xt_t != NULL && xt_t->final_check != NULL)
+               xt_t->final_check(xt_t->tflags);
+#endif
 
        if (table_name == NULL)
                table_name = "filter";
@@ -1621,6 +1697,14 @@ int main(int argc, char *argv[])
        }
 
        if (chain) {
+               if (policy != NULL) {
+                       printf("Changing policy of %s to %s\n", chain, policy);
+
+                       connman_iptables_change_policy(table, chain, policy);
+
+                       goto commit;
+               }
+
                if (delete_rule == TRUE) {
                        printf("Deleting %s to %s (match %s)\n", target_name,
                                        chain, match_name);