iptables: Fix and refactor iterate_entries()
[platform/upstream/connman.git] / src / iptables.c
index 142d277..9e56d0b 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
 
 #include "connman.h"
 
+void flush_table(const char *name);
+
+/*
+ * Some comments on how the iptables API works (some of them from the
+ * source code from iptables and the kernel):
+ *
+ * - valid_hooks: bit indicates valid IDs for hook_entry
+ * - hook_entry[ID] offset to the chain start
+ * - overflows should be end of entry chains, and uncodintional policy nodes.
+ * - policy entry: last entry in a chain
+ * - user chain: end of last builtin + policy entry
+ * - final entry must be error node
+ * - Underflows must be unconditional and use the STANDARD target with
+ *   ACCEPT/DROP
+ * - IPT_SO_GET_INFO and IPT_SO_GET_ENTRIES are used to read a table
+ * - IPT_SO_GET_INFO: struct ipt_getinfo (note the lack of table content)
+ * - IPT_SO_GET_ENTRIES: struct ipt_get_entries (contains only parts of the
+ *   table header/meta info. The table is appended after the header. The entries
+ *   are of the type struct ipt_entry.
+ * - After the ipt_entry the matches are appended. After the matches
+ *   the target is appended.
+ * - ipt_entry->target_offset =  Size of ipt_entry + matches
+ * - ipt_entry->next_offset =  Size of ipt_entry + matches + target
+ * - IPT_SO_SET_REPLACE is used to write a table (contains the complete
+ * - hook_entry and overflow mark the begining and the end of a chain, e.g
+ *     entry hook: pre/in/fwd/out/post -1/0/352/504/-1
+ *     underflow:  pre/in/fwd/out/post -1/200/352/904/-1
+ *   means that INPUT starts at offset 0 and ends at 200 (the start offset to
+ *   the last element). FORWARD has one entry starting/ending at 352. The entry
+ *   has a size of 152. 352 + 152 = 504 which is the start of the OUTPUT chain
+ *   which then ends at 904. PREROUTING and POSTROUTING are invalid hooks in
+ *   the filter table.
+ * - 'iptables -t filter -A INPUT -m mark --mark 999 -j LOG'
+ *   writing that table looks like this:
+ *
+ *   filter valid_hooks 0x0000000e  num_entries 5  size 856
+ *   entry hook: pre/in/fwd/out/post -1/0/376/528/-1
+ *   underflow:  pre/in/fwd/out/post -1/224/376/528/-1
+ *   entry 0x699d30  offset 0  size 224
+ *     RULE  match 0x699da0  target 0x699dd0
+ *             match  mark match 0x3e7
+ *             target  LOG flags 0 level 4
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x699e10  offset 224  size 152
+ *     RULE  match 0x699e80  target 0x699e80
+ *             target ACCEPT
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x699ea8  offset 376  size 152
+ *     RULE  match 0x699f18  target 0x699f18
+ *             target ACCEPT
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x699f40  offset 528  size 152
+ *     RULE  match 0x699fb0  target 0x699fb0
+ *             target ACCEPT
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x699fd8  offset 680  size 176
+ *     USER CHAIN (ERROR)  match 0x69a048  target 0x69a048
+ *
+ *   Reading the filter table looks like this:
+ *
+ *   filter valid_hooks 0x0000000e  num_entries 5  size 856
+ *   entry hook: pre/in/fwd/out/post -1/0/376/528/-1
+ *   underflow:  pre/in/fwd/out/post -1/224/376/528/-1
+ *   entry 0x25fec28  offset 0  size 224
+ *     CHAIN (INPUT)  match 0x25fec98  target 0x25fecc8
+ *             match  mark match 0x3e7
+ *             target  LOG flags 0 level 4
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x25fed08  offset 224  size 152
+ *     RULE  match 0x25fed78  target 0x25fed78
+ *             target ACCEPT
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x25feda0  offset 376  size 152
+ *     CHAIN (FORWARD)  match 0x25fee10  target 0x25fee10
+ *             target ACCEPT
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x25fee38  offset 528  size 152
+ *     CHAIN (OUTPUT)  match 0x25feea8  target 0x25feea8
+ *             target ACCEPT
+ *             src 0.0.0.0/0.0.0.0
+ *             dst 0.0.0.0/0.0.0.0
+ *   entry 0x25feed0  offset 680  size 176
+ *     End of CHAIN
+ */
 
 static const char *hooknames[] = {
        [NF_IP_PRE_ROUTING]     = "PREROUTING",
@@ -50,33 +141,7 @@ static const char *hooknames[] = {
 #define LABEL_QUEUE   "QUEUE"
 #define LABEL_RETURN  "RETURN"
 
-/* fn returns 0 to continue iteration */
-#define _XT_ENTRY_ITERATE_CONTINUE(type, entries, size, n, fn, args...) \
-({                                                             \
-       unsigned int __i;                                       \
-       int __n;                                                \
-       int __ret = 0;                                          \
-       type *__entry;                                          \
-                                                               \
-       for (__i = 0, __n = 0; __i < (size);                    \
-            __i += __entry->next_offset, __n++) {              \
-               __entry = (void *)(entries) + __i;              \
-               if (__n < n)                                    \
-                       continue;                               \
-                                                               \
-               __ret = fn(__entry,  ## args);                  \
-               if (__ret != 0)                                 \
-                       break;                                  \
-       }                                                       \
-       __ret;                                                  \
-})
-
-/* fn returns 0 to continue iteration */
-#define _XT_ENTRY_ITERATE(type, entries, size, fn, args...) \
-       _XT_ENTRY_ITERATE_CONTINUE(type, entries, size, 0, fn, args)
-
-#define ENTRY_ITERATE(entries, size, fn, args...) \
-       _XT_ENTRY_ITERATE(struct ipt_entry, entries, size, fn, ## args)
+#define XT_OPTION_OFFSET_SCALE 256
 
 #define MIN_ALIGN (__alignof__(struct ipt_entry))
 
@@ -111,35 +176,89 @@ struct connman_iptables {
 };
 
 static GHashTable *table_hash = NULL;
+static gboolean debug_enabled = FALSE;
+
+typedef int (*iterate_entries_cb_t)(struct ipt_entry *entry, int builtin,
+                                       unsigned int hook,size_t size,
+                                       unsigned int offset, void *user_data);
 
-static struct ipt_entry *get_entry(struct connman_iptables *table,
-                                       unsigned int offset)
+static unsigned int next_hook_entry_index(unsigned int *valid_hooks)
 {
-       return (struct ipt_entry *)((char *)table->blob_entries->entrytable +
-                                                                       offset);
+       unsigned int h;
+
+       if (*valid_hooks == 0)
+               return NF_INET_NUMHOOKS;
+
+       h = __builtin_ffs(*valid_hooks) - 1;
+       *valid_hooks ^= (1 << h);
+
+       return h;
 }
 
-static int is_hook_entry(struct connman_iptables *table,
-                               struct ipt_entry *entry)
+static int iterate_entries(struct ipt_entry *entries,
+                               unsigned int valid_hooks,
+                               unsigned int *hook_entry,
+                               unsigned int *underflow,
+                               size_t size, iterate_entries_cb_t cb,
+                               void *user_data)
 {
-       unsigned int i;
+       unsigned int offset, h, hook;
+       int builtin, err;
+       struct ipt_entry *entry;
+
+       h = next_hook_entry_index(&valid_hooks);
+       hook = h;
+
+       for (offset = 0, entry = entries; offset < size;
+                       offset += entry->next_offset) {
+               builtin = -1;
+               entry = (void *)entries + offset;
+
+               /*
+                * Updating builtin, hook and h is very tricky.
+                * The rules are:
+                * - builtin is only set to the current hook number
+                *   if the current entry is the hook entry (aka chain
+                *   head). And only for builtin chains, never for
+                *   the user chains.
+                * - hook is the current hook number. If we
+                *   look at user chains it needs to be NF_INET_NETNUMHOOKS.
+                * - h is the next hook entry. Thous we need to be carefully
+                *   not to access the table when h is NF_INET_NETNUMHOOKS.
+                */
+               if (h < NF_INET_NUMHOOKS && hook_entry[h] == offset) {
+                       builtin = h;
+                       hook = h;
+               }
 
-       for (i = 0; i < NF_INET_NUMHOOKS; i++) {
-               if ((table->info->valid_hooks & (1 << i))
-               && get_entry(table, table->info->hook_entry[i]) == entry)
-                       return i;
+               if (h == NF_INET_NUMHOOKS)
+                       hook = h;
+
+               if (h < NF_INET_NUMHOOKS && underflow[h] <= offset) {
+                       h = next_hook_entry_index(&valid_hooks);
+               }
+
+               err = cb(entry, builtin, hook, size, offset, user_data);
+               if (err < 0)
+                       return err;
        }
 
-       return -1;
+       return 0;
 }
 
-static unsigned long entry_to_offset(struct connman_iptables *table,
-                                       struct ipt_entry *entry)
+static int print_entry(struct ipt_entry *entry, int builtin, unsigned int hook,
+                                       size_t size, unsigned int offset,
+                                       void *user_data)
 {
-       return (void *)entry - (void *)table->blob_entries->entrytable;
+       iterate_entries_cb_t cb = user_data;
+
+       DBG("entry %p  hook %d  offset %d  size %d", entry, hook,
+                       offset, entry->next_offset);
+
+       return cb(entry, builtin, hook, size, offset, NULL);
 }
 
-static int target_to_verdict(char *target_name)
+static int target_to_verdict(const char *target_name)
 {
        if (!strcmp(target_name, LABEL_ACCEPT))
                return -NF_ACCEPT - 1;
@@ -156,7 +275,7 @@ static int target_to_verdict(char *target_name)
        return 0;
 }
 
-static gboolean is_builtin_target(char *target_name)
+static gboolean is_builtin_target(const char *target_name)
 {
        if (!strcmp(target_name, LABEL_ACCEPT) ||
                !strcmp(target_name, LABEL_DROP) ||
@@ -194,6 +313,21 @@ static gboolean is_jump(struct connman_iptables_entry *e)
        return false;
 }
 
+static gboolean is_fallthrough(struct connman_iptables_entry *e)
+{
+       struct xt_entry_target *target;
+
+       target = ipt_get_target(e->entry);
+       if (!g_strcmp0(target->u.user.name, IPT_STANDARD_TARGET)) {
+               struct xt_standard_target *t;
+
+               t = (struct xt_standard_target *)target;
+               if (t->verdict == 0)
+                       return true;
+       }
+       return false;
+}
+
 static gboolean is_chain(struct connman_iptables *table,
                                struct connman_iptables_entry *e)
 {
@@ -212,7 +346,7 @@ static gboolean is_chain(struct connman_iptables *table,
 }
 
 static GList *find_chain_head(struct connman_iptables *table,
-                               char *chain_name)
+                               const char *chain_name)
 {
        GList *list;
        struct connman_iptables_entry *head;
@@ -240,7 +374,7 @@ static GList *find_chain_head(struct connman_iptables *table,
 }
 
 static GList *find_chain_tail(struct connman_iptables *table,
-                               char *chain_name)
+                               const char *chain_name)
 {
        struct connman_iptables_entry *tail;
        GList *chain_head, *list;
@@ -312,6 +446,16 @@ static void update_targets_reference(struct connman_iptables *table,
                                t->verdict += offset;
                }
        }
+
+       if (is_fallthrough(modified_entry)) {
+               t = (struct xt_standard_target *) ipt_get_target(modified_entry->entry);
+
+               t->verdict = entry_before->offset +
+                       modified_entry->entry->target_offset +
+                       ALIGN(sizeof(struct xt_standard_target));
+               t->target.u.target_size =
+                       ALIGN(sizeof(struct xt_standard_target));
+       }
 }
 
 static int iptables_add_entry(struct connman_iptables *table,
@@ -362,15 +506,16 @@ static int remove_table_entry(struct connman_iptables *table,
        table->size -= entry->entry->next_offset;
        removed = entry->entry->next_offset;
 
-       g_free(entry->entry);
-
        table->entries = g_list_remove(table->entries, entry);
 
+       g_free(entry->entry);
+       g_free(entry);
+
        return removed;
 }
 
 static int iptables_flush_chain(struct connman_iptables *table,
-                                               char *name)
+                                               const char *name)
 {
        GList *chain_head, *chain_tail, *list, *next;
        struct connman_iptables_entry *entry;
@@ -431,7 +576,7 @@ static int iptables_flush_chain(struct connman_iptables *table,
 }
 
 static int iptables_add_chain(struct connman_iptables *table,
-                                       char *name)
+                               const char *name)
 {
        GList *last;
        struct ipt_entry *entry_head;
@@ -501,7 +646,8 @@ err_head:
        return -ENOMEM;
 }
 
-static int iptables_delete_chain(struct connman_iptables *table, char *name)
+static int iptables_delete_chain(struct connman_iptables *table,
+                                       const char *name)
 {
        struct connman_iptables_entry *entry;
        GList *chain_head, *chain_tail;
@@ -534,18 +680,17 @@ static int iptables_delete_chain(struct connman_iptables *table, char *name)
        return 0;
 }
 
-static struct ipt_entry *
-new_rule(struct ipt_ip *ip, char *target_name,
-               struct xtables_target *xt_t,
-               char *match_name, struct xtables_match *xt_m)
+static struct ipt_entry *new_rule(struct ipt_ip *ip,
+               const char *target_name, struct xtables_target *xt_t,
+               struct xtables_rule_match *xt_rm)
 {
+       struct xtables_rule_match *tmp_xt_rm;
        struct ipt_entry *new_entry;
        size_t match_size, target_size;
 
-       if (xt_m)
-               match_size = xt_m->m->u.match_size;
-       else
-               match_size = 0;
+       match_size = 0;
+       for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL; tmp_xt_rm = tmp_xt_rm->next)
+               match_size += tmp_xt_rm->match->m->u.match_size;
 
        if (xt_t)
                target_size = ALIGN(xt_t->t->u.target_size);
@@ -562,11 +707,13 @@ new_rule(struct ipt_ip *ip, char *target_name,
        new_entry->target_offset = sizeof(struct ipt_entry) + match_size;
        new_entry->next_offset = sizeof(struct ipt_entry) + target_size +
                                                                match_size;
-       if (xt_m) {
-               struct xt_entry_match *entry_match;
 
-               entry_match = (struct xt_entry_match *)new_entry->elems;
-               memcpy(entry_match, xt_m->m, match_size);
+       match_size = 0;
+       for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL;
+                               tmp_xt_rm = tmp_xt_rm->next) {
+               memcpy(new_entry->elems + match_size, tmp_xt_rm->match->m,
+                                       tmp_xt_rm->match->m->u.match_size);
+               match_size += tmp_xt_rm->match->m->u.match_size;
        }
 
        if (xt_t) {
@@ -610,10 +757,10 @@ static void update_hooks(struct connman_iptables *table, GList *chain_head,
 }
 
 static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
-                               struct ipt_ip *ip, char *chain_name,
-                               char *target_name, struct xtables_target *xt_t,
-                               char *match_name, struct xtables_match *xt_m,
-                               int *builtin)
+                               struct ipt_ip *ip, const char *chain_name,
+                               const char *target_name,
+                               struct xtables_target *xt_t,
+                               int *builtin, struct xtables_rule_match *xt_rm)
 {
        GList *chain_tail, *chain_head;
        struct ipt_entry *new_entry;
@@ -627,7 +774,7 @@ static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
        if (chain_tail == NULL)
                return NULL;
 
-       new_entry = new_rule(ip, target_name, xt_t, match_name, xt_m);
+       new_entry = new_rule(ip, target_name, xt_t, xt_rm);
        if (new_entry == NULL)
                return NULL;
 
@@ -649,37 +796,11 @@ static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
        return new_entry;
 }
 
-static int iptables_append_rule(struct connman_iptables *table,
-                               struct ipt_ip *ip, char *chain_name,
-                               char *target_name, struct xtables_target *xt_t,
-                               char *match_name, struct xtables_match *xt_m)
-{
-       GList *chain_tail;
-       struct ipt_entry *new_entry;
-       int builtin = -1, ret;
-
-       DBG("");
-
-       chain_tail = find_chain_tail(table, chain_name);
-       if (chain_tail == NULL)
-               return -EINVAL;
-
-       new_entry = prepare_rule_inclusion(table, ip, chain_name,
-                       target_name, xt_t, match_name, xt_m, &builtin);
-       if (new_entry == NULL)
-               return -EINVAL;
-
-       ret = iptables_add_entry(table, new_entry, chain_tail->prev, builtin);
-       if (ret < 0)
-               g_free(new_entry);
-
-       return ret;
-}
-
 static int iptables_insert_rule(struct connman_iptables *table,
-                               struct ipt_ip *ip, char *chain_name,
-                               char *target_name, struct xtables_target *xt_t,
-                               char *match_name, struct xtables_match *xt_m)
+                               struct ipt_ip *ip, const char *chain_name,
+                               const char *target_name,
+                               struct xtables_target *xt_t,
+                               struct xtables_rule_match *xt_rm)
 {
        struct ipt_entry *new_entry;
        int builtin = -1, ret;
@@ -690,11 +811,14 @@ static int iptables_insert_rule(struct connman_iptables *table,
                return -EINVAL;
 
        new_entry = prepare_rule_inclusion(table, ip, chain_name,
-                       target_name, xt_t, match_name, xt_m, &builtin);
+                                       target_name, xt_t, &builtin, xt_rm);
        if (new_entry == NULL)
                return -EINVAL;
 
-       ret = iptables_add_entry(table, new_entry, chain_head->next, builtin);
+       if (builtin == -1)
+               chain_head = chain_head->next;
+
+       ret = iptables_add_entry(table, new_entry, chain_head, builtin);
        if (ret < 0)
                g_free(new_entry);
 
@@ -719,10 +843,16 @@ static gboolean is_same_ipt_entry(struct ipt_entry *i_e1,
 static gboolean is_same_target(struct xt_entry_target *xt_e_t1,
                                        struct xt_entry_target *xt_e_t2)
 {
+       unsigned int i;
+
        if (xt_e_t1 == NULL || xt_e_t2 == NULL)
                return FALSE;
 
-       if (strcmp(xt_e_t1->u.user.name, IPT_STANDARD_TARGET) == 0) {
+       if (strcmp(xt_e_t1->u.user.name, "") == 0 &&
+                       strcmp(xt_e_t2->u.user.name, "") == 0) {
+               /* fallthrough */
+               return TRUE;
+       } else if (strcmp(xt_e_t1->u.user.name, IPT_STANDARD_TARGET) == 0) {
                struct xt_standard_target *xt_s_t1;
                struct xt_standard_target *xt_s_t2;
 
@@ -737,6 +867,12 @@ static gboolean is_same_target(struct xt_entry_target *xt_e_t1,
 
                if (strcmp(xt_e_t1->u.user.name, xt_e_t2->u.user.name) != 0)
                        return FALSE;
+
+               for (i = 0; i < xt_e_t1->u.target_size -
+                               sizeof(struct xt_standard_target); i++) {
+                       if ((xt_e_t1->data[i] ^ xt_e_t2->data[i]) != 0)
+                               return FALSE;
+               }
        }
 
        return TRUE;
@@ -745,6 +881,8 @@ static gboolean is_same_target(struct xt_entry_target *xt_e_t1,
 static gboolean is_same_match(struct xt_entry_match *xt_e_m1,
                                struct xt_entry_match *xt_e_m2)
 {
+       unsigned int i;
+
        if (xt_e_m1 == NULL || xt_e_m2 == NULL)
                return FALSE;
 
@@ -757,37 +895,43 @@ static gboolean is_same_match(struct xt_entry_match *xt_e_m1,
        if (strcmp(xt_e_m1->u.user.name, xt_e_m2->u.user.name) != 0)
                return FALSE;
 
+       for (i = 0; i < xt_e_m1->u.match_size - sizeof(struct xt_entry_match);
+                       i++) {
+               if ((xt_e_m1->data[i] ^ xt_e_m2->data[i]) != 0)
+                       return FALSE;
+       }
+
        return TRUE;
 }
 
-static int iptables_delete_rule(struct connman_iptables *table,
-                               struct ipt_ip *ip, char *chain_name,
-                               char *target_name, struct xtables_target *xt_t,
-                               char *match_name, struct xtables_match *xt_m)
+static GList *find_existing_rule(struct connman_iptables *table,
+                               struct ipt_ip *ip, const char *chain_name,
+                               const char *target_name,
+                               struct xtables_target *xt_t,
+                               struct xtables_match *xt_m,
+                               struct xtables_rule_match *xt_rm)
 {
        GList *chain_tail, *chain_head, *list;
        struct xt_entry_target *xt_e_t = NULL;
        struct xt_entry_match *xt_e_m = NULL;
        struct connman_iptables_entry *entry;
        struct ipt_entry *entry_test;
-       int builtin, removed;
-
-       removed = 0;
+       int builtin;
 
        chain_head = find_chain_head(table, chain_name);
        if (chain_head == NULL)
-               return -EINVAL;
+               return NULL;
 
        chain_tail = find_chain_tail(table, chain_name);
        if (chain_tail == NULL)
-               return -EINVAL;
+               return NULL;
 
        if (!xt_t && !xt_m)
-               return -EINVAL;
+               return NULL;
 
-       entry_test = new_rule(ip, target_name, xt_t, match_name, xt_m);
+       entry_test = new_rule(ip, target_name, xt_t, xt_rm);
        if (entry_test == NULL)
-               return -EINVAL;
+               return NULL;
 
        if (xt_t != NULL)
                xt_e_t = ipt_get_target(entry_test);
@@ -802,7 +946,7 @@ static int iptables_delete_rule(struct connman_iptables *table,
        else
                list = chain_head->next;
 
-       for (entry = NULL; list != chain_tail->prev; list = list->next) {
+       for (; list != chain_tail->prev; list = list->next) {
                struct connman_iptables_entry *tmp;
                struct ipt_entry *tmp_e;
 
@@ -830,14 +974,49 @@ static int iptables_delete_rule(struct connman_iptables *table,
                                continue;
                }
 
-               entry = tmp;
                break;
        }
 
-       if (entry == NULL) {
-               g_free(entry_test);
+       g_free(entry_test);
+
+       if (list != chain_tail->prev)
+               return list;
+
+       return NULL;
+}
+
+static int iptables_delete_rule(struct connman_iptables *table,
+                               struct ipt_ip *ip, const char *chain_name,
+                               const char *target_name,
+                               struct xtables_target *xt_t,
+                               struct xtables_match *xt_m,
+                               struct xtables_rule_match *xt_rm)
+{
+       struct connman_iptables_entry *entry;
+       GList *chain_head, *chain_tail, *list;
+       int builtin, removed;
+
+       removed = 0;
+
+       chain_head = find_chain_head(table, chain_name);
+       if (chain_head == NULL)
+               return -EINVAL;
+
+       chain_tail = find_chain_tail(table, chain_name);
+       if (chain_tail == NULL)
+               return -EINVAL;
+
+       list = find_existing_rule(table, ip, chain_name, target_name,
+                                                       xt_t, xt_m, xt_rm);
+       if (list == NULL)
+               return -EINVAL;
+
+       entry = chain_head->data;
+       builtin = entry->builtin;
+
+       entry = list->data;
+       if (entry == NULL)
                return -EINVAL;
-       }
 
        /* We have deleted a rule,
         * all references should be bumped accordingly */
@@ -872,8 +1051,36 @@ static int iptables_delete_rule(struct connman_iptables *table,
        return 0;
 }
 
-static struct ipt_replace *
-iptables_blob(struct connman_iptables *table)
+static int iptables_change_policy(struct connman_iptables *table,
+                               const char *chain_name, const 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 *iptables_blob(struct connman_iptables *table)
 {
        struct ipt_replace *r;
        GList *list;
@@ -921,24 +1128,23 @@ static void dump_ip(struct ipt_entry *entry)
        char ip_mask[INET6_ADDRSTRLEN];
 
        if (strlen(ip->iniface))
-               connman_info("\tin %s", ip->iniface);
+               DBG("\tin %s", ip->iniface);
 
        if (strlen(ip->outiface))
-               connman_info("\tout %s", ip->outiface);
+               DBG("\tout %s", ip->outiface);
 
        if (inet_ntop(AF_INET, &ip->src, ip_string, INET6_ADDRSTRLEN) != NULL &&
                        inet_ntop(AF_INET, &ip->smsk,
                                        ip_mask, INET6_ADDRSTRLEN) != NULL)
-               connman_info("\tsrc %s/%s", ip_string, ip_mask);
+               DBG("\tsrc %s/%s", ip_string, ip_mask);
 
        if (inet_ntop(AF_INET, &ip->dst, ip_string, INET6_ADDRSTRLEN) != NULL &&
                        inet_ntop(AF_INET, &ip->dmsk,
                                        ip_mask, INET6_ADDRSTRLEN) != NULL)
-               connman_info("\tdst %s/%s", ip_string, ip_mask);
+               DBG("\tdst %s/%s", ip_string, ip_mask);
 }
 
-static void dump_target(struct connman_iptables *table,
-                               struct ipt_entry *entry)
+static void dump_target(struct ipt_entry *entry)
 
 {
        struct xtables_target *xt_t;
@@ -953,29 +1159,27 @@ static void dump_target(struct connman_iptables *table,
 
                switch (t->verdict) {
                case XT_RETURN:
-                       connman_info("\ttarget RETURN");
+                       DBG("\ttarget RETURN");
                        break;
 
                case -NF_ACCEPT - 1:
-                       connman_info("\ttarget ACCEPT");
+                       DBG("\ttarget ACCEPT");
                        break;
 
                case -NF_DROP - 1:
-                       connman_info("\ttarget DROP");
+                       DBG("\ttarget DROP");
                        break;
 
                case -NF_QUEUE - 1:
-                       connman_info("\ttarget QUEUE");
+                       DBG("\ttarget QUEUE");
                        break;
 
                case -NF_STOP - 1:
-                       connman_info("\ttarget STOP");
+                       DBG("\ttarget STOP");
                        break;
 
                default:
-                       connman_info("\tJUMP @%p (0x%x)",
-                               (char*)table->blob_entries->entrytable +
-                               t->verdict, t->verdict);
+                       DBG("\tJUMP %u", t->verdict);
                        break;
                }
 
@@ -987,18 +1191,18 @@ static void dump_target(struct connman_iptables *table,
        } else {
                xt_t = xtables_find_target(target->u.user.name, XTF_TRY_LOAD);
                if (xt_t == NULL) {
-                       connman_info("\ttarget %s", target->u.user.name);
+                       DBG("\ttarget %s", target->u.user.name);
                        return;
                }
 
                if(xt_t->print != NULL) {
-                       connman_info("\ttarget ");
+                       DBG("\ttarget ");
                        xt_t->print(NULL, target, 1);
                }
        }
 }
 
-static void dump_match(struct connman_iptables *table, struct ipt_entry *entry)
+static void dump_match(struct ipt_entry *entry)
 {
        struct xtables_match *xt_m;
        struct xt_entry_match *match;
@@ -1016,71 +1220,103 @@ static void dump_match(struct connman_iptables *table, struct ipt_entry *entry)
                goto out;
 
        if(xt_m->print != NULL) {
-               connman_info("\tmatch ");
+               DBG("\tmatch ");
                xt_m->print(NULL, match, 1);
 
                return;
        }
 
 out:
-       connman_info("\tmatch %s", match->u.user.name);
+       DBG("\tmatch %s", match->u.user.name);
 
 }
 
-static int dump_entry(struct ipt_entry *entry,
-                               struct connman_iptables *table)
+static int dump_entry(struct ipt_entry *entry, int builtin,
+                       unsigned int hook, size_t size, unsigned int offset,
+                       void *user_data)
 {
        struct xt_entry_target *target;
-       unsigned int offset;
-       int builtin;
 
-       offset = (char *)entry - (char *)table->blob_entries->entrytable;
        target = ipt_get_target(entry);
-       builtin = is_hook_entry(table, entry);
 
-       if (entry_to_offset(table, entry) + entry->next_offset ==
-                                       table->blob_entries->size) {
-               connman_info("End of CHAIN 0x%x", offset);
+       if (offset + entry->next_offset == size) {
+               DBG("\tEnd of CHAIN");
                return 0;
        }
 
        if (!strcmp(target->u.user.name, IPT_ERROR_TARGET)) {
-               connman_info("USER CHAIN (%s) %p  match %p  target %p  size %d",
-                       target->data, entry, entry->elems,
-                       (char *)entry + entry->target_offset,
-                               entry->next_offset);
+               DBG("\tUSER CHAIN (%s) match %p  target %p",
+                       target->data, entry->elems,
+                       (char *)entry + entry->target_offset);
 
                return 0;
        } else if (builtin >= 0) {
-               connman_info("CHAIN (%s) %p  match %p  target %p  size %d",
-                       hooknames[builtin], entry, entry->elems,
-                       (char *)entry + entry->target_offset,
-                               entry->next_offset);
+               DBG("\tCHAIN (%s) match %p  target %p",
+                       hooknames[builtin], entry->elems,
+                       (char *)entry + entry->target_offset);
        } else {
-               connman_info("RULE %p  match %p  target %p  size %d", entry,
+               DBG("\tRULE  match %p  target %p",
                        entry->elems,
-                       (char *)entry + entry->target_offset,
-                               entry->next_offset);
+                       (char *)entry + entry->target_offset);
        }
 
-       dump_match(table, entry);
-       dump_target(table, entry);
+       dump_match(entry);
+       dump_target(entry);
        dump_ip(entry);
 
        return 0;
 }
 
-static void iptables_dump(struct connman_iptables *table)
+static void dump_table(struct connman_iptables *table)
 {
-       connman_info("%s valid_hooks=0x%08x, num_entries=%u, size=%u",
+       DBG("%s valid_hooks=0x%08x, num_entries=%u, size=%u",
                        table->info->name,
                        table->info->valid_hooks, table->info->num_entries,
                                table->info->size);
 
-       ENTRY_ITERATE(table->blob_entries->entrytable,
+       DBG("entry hook: pre/in/fwd/out/post %d/%d/%d/%d/%d",
+               table->info->hook_entry[NF_IP_PRE_ROUTING],
+               table->info->hook_entry[NF_IP_LOCAL_IN],
+               table->info->hook_entry[NF_IP_FORWARD],
+               table->info->hook_entry[NF_IP_LOCAL_OUT],
+               table->info->hook_entry[NF_IP_POST_ROUTING]);
+       DBG("underflow:  pre/in/fwd/out/post %d/%d/%d/%d/%d",
+               table->info->underflow[NF_IP_PRE_ROUTING],
+               table->info->underflow[NF_IP_LOCAL_IN],
+               table->info->underflow[NF_IP_FORWARD],
+               table->info->underflow[NF_IP_LOCAL_OUT],
+               table->info->underflow[NF_IP_POST_ROUTING]);
+
+       iterate_entries(table->blob_entries->entrytable,
+                       table->info->valid_hooks,
+                       table->info->hook_entry,
+                       table->info->underflow,
                        table->blob_entries->size,
-                       dump_entry, table);
+                       print_entry, dump_entry);
+}
 
+static void dump_ipt_replace(struct ipt_replace *repl)
+{
+       DBG("%s valid_hooks 0x%08x  num_entries %u  size %u",
+                       repl->name, repl->valid_hooks, repl->num_entries,
+                       repl->size);
+
+       DBG("entry hook: pre/in/fwd/out/post %d/%d/%d/%d/%d",
+               repl->hook_entry[NF_IP_PRE_ROUTING],
+               repl->hook_entry[NF_IP_LOCAL_IN],
+               repl->hook_entry[NF_IP_FORWARD],
+               repl->hook_entry[NF_IP_LOCAL_OUT],
+               repl->hook_entry[NF_IP_POST_ROUTING]);
+       DBG("underflow:  pre/in/fwd/out/post %d/%d/%d/%d/%d",
+               repl->underflow[NF_IP_PRE_ROUTING],
+               repl->underflow[NF_IP_LOCAL_IN],
+               repl->underflow[NF_IP_FORWARD],
+               repl->underflow[NF_IP_LOCAL_OUT],
+               repl->underflow[NF_IP_POST_ROUTING]);
+
+       iterate_entries(repl->entries, repl->valid_hooks,
+                       repl->hook_entry, repl->underflow,
+                       repl->size, print_entry, dump_entry);
 }
 
 static int iptables_get_entries(struct connman_iptables *table)
@@ -1100,10 +1336,11 @@ static int iptables_replace(struct connman_iptables *table,
                         sizeof(*r) + r->size);
 }
 
-static int add_entry(struct ipt_entry *entry, struct connman_iptables *table)
+static int add_entry(struct ipt_entry *entry, int builtin, unsigned int hook,
+                       size_t size, unsigned offset, void *user_data)
 {
+       struct connman_iptables *table = user_data;
        struct ipt_entry *new_entry;
-       int builtin;
 
        new_entry = g_try_malloc0(entry->next_offset);
        if (new_entry == NULL)
@@ -1111,8 +1348,6 @@ static int add_entry(struct ipt_entry *entry, struct connman_iptables *table)
 
        memcpy(new_entry, entry, entry->next_offset);
 
-       builtin = is_hook_entry(table, entry);
-
        return iptables_add_entry(table, new_entry, NULL, builtin);
 }
 
@@ -1121,7 +1356,11 @@ static void table_cleanup(struct connman_iptables *table)
        GList *list;
        struct connman_iptables_entry *entry;
 
-       close(table->ipt_sock);
+       if (table == NULL)
+               return;
+
+       if (table->ipt_sock >= 0)
+               close(table->ipt_sock);
 
        for (list = table->entries; list; list = list->next) {
                entry = list->data;
@@ -1136,26 +1375,28 @@ static void table_cleanup(struct connman_iptables *table)
        g_free(table);
 }
 
-static struct connman_iptables *iptables_init(char *table_name)
+static struct connman_iptables *iptables_init(const char *table_name)
 {
        struct connman_iptables *table = NULL;
        char *module = NULL;
        socklen_t s;
 
+       if (table_name == NULL)
+               table_name = "filter";
+
        DBG("%s", table_name);
 
        if (xtables_insmod("ip_tables", NULL, TRUE) != 0)
-               goto err;
+               DBG("ip_tables module loading gives error but trying anyway");
 
        module = g_strconcat("iptable_", table_name, NULL);
        if (module == NULL)
-               goto err;
+               return NULL;
 
        if (xtables_insmod(module, NULL, TRUE) != 0)
-               goto err;
+               DBG("%s module loading gives error but trying anyway", module);
 
        g_free(module);
-       module = NULL;
 
        table = g_hash_table_lookup(table_hash, table_name);
        if (table != NULL)
@@ -1169,15 +1410,18 @@ static struct connman_iptables *iptables_init(char *table_name)
        if (table->info == NULL)
                goto err;
 
-       table->ipt_sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+       table->ipt_sock = socket(AF_INET, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_RAW);
        if (table->ipt_sock < 0)
                goto err;
 
        s = sizeof(*table->info);
        strcpy(table->info->name, table_name);
        if (getsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_GET_INFO,
-                                               table->info, &s) < 0)
+                                               table->info, &s) < 0) {
+               connman_error("iptables support missing error %d (%s)", errno,
+                       strerror(errno));
                goto err;
+       }
 
        table->blob_entries = g_try_malloc0(sizeof(struct ipt_get_entries) +
                                                table->info->size);
@@ -1199,24 +1443,52 @@ static struct connman_iptables *iptables_init(char *table_name)
        memcpy(table->hook_entry, table->info->hook_entry,
                                sizeof(table->info->hook_entry));
 
-       ENTRY_ITERATE(table->blob_entries->entrytable,
-                       table->blob_entries->size,
-                               add_entry, table);
+       iterate_entries(table->blob_entries->entrytable,
+                       table->info->valid_hooks, table->info->hook_entry,
+                       table->info->underflow, table->blob_entries->size,
+                       add_entry, table);
 
        g_hash_table_insert(table_hash, g_strdup(table_name), table);
 
+       if (debug_enabled == TRUE)
+               dump_table(table);
+
        return table;
 
 err:
-       g_free(module);
-
        table_cleanup(table);
 
        return NULL;
 }
 
+static struct option iptables_opts[] = {
+       {.name = "append",        .has_arg = 1, .val = 'A'},
+       {.name = "compare",       .has_arg = 1, .val = 'C'},
+       {.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 = "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'},
+       {.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)
+                                                       const char *target_name)
 {
        struct xtables_target *xt_t = NULL;
        gboolean is_builtin, is_user_defined;
@@ -1277,219 +1549,475 @@ 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)
+               iptables_globals.opts =
+                       xtables_options_xfrm(
+                               iptables_globals.orig_opts,
+                               iptables_globals.opts,
+                               xt_t->x6_options,
+                               &xt_t->option_offset);
+       else
+#endif
+               iptables_globals.opts =
+                       xtables_merge_options(
+#if XTABLES_VERSION_CODE > 5
+                               iptables_globals.orig_opts,
+#endif
+                               iptables_globals.opts,
+                               xt_t->extra_opts,
+                               &xt_t->option_offset);
+
+       if (iptables_globals.opts == NULL) {
+               g_free(xt_t->t);
+               xt_t = NULL;
+       }
+
        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},
-};
+static struct xtables_match *prepare_matches(struct connman_iptables *table,
+                                       struct xtables_rule_match **xt_rm,
+                                       const char *match_name)
+{
+       struct xtables_match *xt_m;
+       size_t match_size;
 
-struct xtables_globals iptables_globals = {
-       .option_offset = 0,
-       .opts = iptables_opts,
-       .orig_opts = iptables_opts,
-};
+       if (match_name == NULL)
+               return NULL;
+
+       xt_m = xtables_find_match(match_name, XTF_LOAD_MUST_SUCCEED, xt_rm);
+       match_size = ALIGN(sizeof(struct ipt_entry_match)) + xt_m->size;
+
+       xt_m->m = g_try_malloc0(match_size);
+       if (xt_m->m == NULL)
+               return NULL;
+
+       xt_m->m->u.match_size = match_size;
+       strcpy(xt_m->m->u.user.name, xt_m->name);
+       xt_m->m->u.user.revision = xt_m->revision;
+
+       if (xt_m->init != NULL)
+               xt_m->init(xt_m->m);
+
+       if (xt_m == xt_m->next)
+               goto done;
+
+#if XTABLES_VERSION_CODE > 5
+       if (xt_m->x6_options != NULL)
+               iptables_globals.opts =
+                       xtables_options_xfrm(
+                               iptables_globals.orig_opts,
+                               iptables_globals.opts,
+                               xt_m->x6_options,
+                               &xt_m->option_offset);
+       else
+#endif
+                       iptables_globals.opts =
+                       xtables_merge_options(
+#if XTABLES_VERSION_CODE > 5
+                               iptables_globals.orig_opts,
+#endif
+                               iptables_globals.opts,
+                               xt_m->extra_opts,
+                               &xt_m->option_offset);
+
+       if (iptables_globals.opts == NULL) {
+               g_free(xt_m->m);
+               xt_m = NULL;
+       }
 
-static int iptables_command(int argc, char *argv[])
+done:
+       return xt_m;
+}
+
+static int parse_ip_and_mask(const char *str, struct in_addr *ip, struct in_addr *mask)
 {
-       struct connman_iptables *table;
-       struct xtables_match *xt_m;
+       char **tokens;
+       uint32_t prefixlength;
+       uint32_t tmp;
+       int err;
+
+       tokens = g_strsplit(str, "/", 2);
+       if (tokens == NULL)
+               return -1;
+
+       if (!inet_pton(AF_INET, tokens[0], ip)) {
+               err = -1;
+               goto out;
+       }
+
+       if (tokens[1] != NULL) {
+               prefixlength = strtol(tokens[1], NULL, 10);
+               if (prefixlength > 31) {
+                       err = -1;
+                       goto out;
+               }
+
+               tmp = ~(0xffffffff >> prefixlength);
+       } else {
+               tmp = 0xffffffff;
+       }
+
+       mask->s_addr = htonl(tmp);
+       ip->s_addr = ip->s_addr & mask->s_addr;
+       err = 0;
+out:
+       g_strfreev(tokens);
+
+       return err;
+}
+
+static struct connman_iptables *pre_load_table(const char *table_name,
+                                       struct connman_iptables *table)
+{
+       if (table != NULL)
+               return table;
+
+       return iptables_init(table_name);
+}
+
+struct parse_context {
+       int argc;
+       char **argv;
+       struct ipt_ip *ip;
        struct xtables_target *xt_t;
-       struct ipt_ip ip;
-       char *table_name, *chain, *new_chain, *match_name, *target_name;
-       char *flush_chain, *delete_chain;
-       int c, ret, in_len, out_len;
-       size_t size;
-       gboolean dump, invert, insert, delete;
-       struct in_addr src, dst;
-
-       if (argc == 0)
-               return -EINVAL;
+       struct xtables_match *xt_m;
+       struct xtables_rule_match *xt_rm;
+};
 
-       dump = FALSE;
-       invert = FALSE;
-       insert = FALSE;
-       delete = FALSE;
-       table_name = chain = new_chain = match_name = target_name = NULL;
-       flush_chain = delete_chain = NULL;
-       memset(&ip, 0, sizeof(struct ipt_ip));
-       table = NULL;
-       xt_m = NULL;
-       xt_t = NULL;
-       ret = 0;
+static int prepare_getopt_args(const char *str, struct parse_context *ctx)
+{
+       char **tokens;
+       int i;
 
-       optind = 0;
+       tokens = g_strsplit_set(str, " ", -1);
 
-       while ((c = getopt_long(argc, argv, "-A:F:I:L::N:X:d:j:i:m:o:s:t:",
-                                       iptables_globals.opts, NULL)) != -1) {
-               switch (c) {
-               case 'A':
-                       /* It is either -A, -D or -I at once */
-                       if (chain)
-                               goto out;
+       i = g_strv_length(tokens);
 
-                       chain = optarg;
-                       break;
+       /* Add space for the argv[0] value */
+       ctx->argc = i + 1;
 
-               case 'D':
-                       /* It is either -A, -D or -I at once */
-                       if (chain)
-                               goto out;
+       /* Don't forget the last NULL entry */
+       ctx->argv = g_try_malloc0((ctx->argc + 1) * sizeof(char *));
+       if (ctx->argv == NULL) {
+               g_strfreev(tokens);
+               return -ENOMEM;
+       }
 
-                       chain = optarg;
-                       delete = TRUE;
-                       break;
+       /*
+        * getopt_long() jumps over the first token; we need to add some
+        * random argv[0] entry.
+        */
+       ctx->argv[0] = g_strdup("argh");
+       for (i = 1; i < ctx->argc; i++)
+               ctx->argv[i] = tokens[i - 1];
 
-               case 'F':
-                       flush_chain = optarg;
-                       break;
+       g_free(tokens);
 
-               case 'I':
-                       /* It is either -A, -D or -I at once */
-                       if (chain)
-                               goto out;
+       return 0;
+}
 
-                       chain = optarg;
-                       insert = TRUE;
-                       break;
+#if XTABLES_VERSION_CODE > 5
 
-               case 'L':
-                       dump = TRUE;
-                       break;
+static int parse_xt_modules(int c, connman_bool_t invert,
+                               struct parse_context *ctx)
+{
+       struct xtables_match *m;
+       struct xtables_rule_match *rm;
 
-               case 'N':
-                       new_chain = optarg;
-                       break;
+       DBG("xtables version code > 5");
 
-               case 'X':
-                       delete_chain = optarg;
-                       break;
+       for (rm = ctx->xt_rm; rm != NULL; rm = rm->next) {
+               if (rm->completed != 0)
+                       continue;
 
-               case 'd':
-                       if (!inet_pton(AF_INET, optarg, &dst))
-                               break;
+               m = rm->match;
+
+               if (m->x6_parse == NULL && m->parse == NULL)
+                       continue;
 
-                       ip.dst = dst;
-                       inet_pton(AF_INET, "255.255.255.255", &ip.dmsk);
+               if (c < (int) m->option_offset ||
+                               c >= (int) m->option_offset
+                                       + XT_OPTION_OFFSET_SCALE)
+                       continue;
 
-                       if (invert)
-                               ip.invflags |= IPT_INV_DSTIP;
+               xtables_option_mpcall(c, ctx->argv, invert, m, NULL);
+       }
 
-                       break;
+       if (ctx->xt_t == NULL)
+               return 0;
 
-               case 'i':
-                       in_len = strlen(optarg);
+       if (ctx->xt_t->x6_parse == NULL && ctx->xt_t->parse == NULL)
+               return 0;
 
-                       if (in_len + 1 > IFNAMSIZ)
-                               break;
+       if (c < (int) ctx->xt_t->option_offset ||
+                       c >= (int) ctx->xt_t->option_offset
+                                       + XT_OPTION_OFFSET_SCALE)
+               return 0;
 
-                       strcpy(ip.iniface, optarg);
-                       memset(ip.iniface_mask, 0xff, in_len + 1);
+       xtables_option_tpcall(c, ctx->argv, invert, ctx->xt_t, NULL);
 
-                       if (invert)
-                               ip.invflags |= IPT_INV_VIA_IN;
+       return 0;
+}
 
-                       break;
+static int final_check_xt_modules(struct parse_context *ctx)
+{
+       struct xtables_rule_match *rm;
 
-               case 'j':
-                       target_name = optarg;
-                       break;
+       DBG("xtables version code > 5");
 
-               case 'm':
-                       match_name = optarg;
+       for (rm = ctx->xt_rm; rm != NULL; rm = rm->next)
+               xtables_option_mfcall(rm->match);
+
+       if (ctx->xt_t != NULL)
+               xtables_option_tfcall(ctx->xt_t);
+
+       return 0;
+}
+
+#else
+
+static int parse_xt_modules(int c, connman_bool_t invert,
+                               struct parse_context *ctx)
+{
+       struct xtables_match *m;
+       struct xtables_rule_match *rm;
+       int err;
+
+       DBG("xtables version code <= 5");
+
+       for (rm = ctx->xt_rm; rm != NULL; rm = rm->next) {
+               if (rm->completed == 1)
+                       continue;
+
+               m = rm->match;
+
+               if (m->parse == NULL)
+                       continue;
+
+               err = m->parse(c - m->option_offset,
+                               argv, invert, &m->mflags,
+                               NULL, &m->m);
+               if (err > 0)
+                       return -err;
+       }
+
+       if (ctx->xt_t == NULL)
+               return 0;
+
+       if (ctx->xt_t->parse == NULL)
+               return 0;
+
+       err = ctx->xt_m->parse(c - ctx->xt_m->option_offset,
+                               ctx->argv, invert, &ctx->xt_m->mflags,
+                               NULL, &ctx->xt_m->m);
+       return -err;
+}
+
+static int final_check_xt_modules(struct parse_context *ctx)
+{
+       struct xtables_rule_match *rm;
+
+       DBG("xtables version code <= 5");
+
+       for (rm = ctx->xt_rm; rm != NULL; rm = rm->next)
+               if (rm->match->final_check != NULL)
+                       rm->match->final_check(rm->match->mflags);
+
+       if (ctx->xt_t != NULL && ctx->xt_t->final_check != NULL)
+               ctx->xt_t->final_check(ctx->xt_t->tflags);
+
+       return 0;
+}
 
-                       xt_m = xtables_find_match(optarg, XTF_LOAD_MUST_SUCCEED, NULL);
-                       size = ALIGN(sizeof(struct ipt_entry_match)) +
-                                                               xt_m->size;
-                       xt_m->m = g_try_malloc0(size);
-                       if (xt_m == NULL)
-                               goto out;
-                       xt_m->m->u.match_size = size;
-                       strcpy(xt_m->m->u.user.name, xt_m->name);
-                       xt_m->m->u.user.revision = xt_m->revision;
-                       if (xt_m->init != NULL)
-                               xt_m->init(xt_m->m);
-                       if (xt_m != xt_m->next) {
-                               iptables_globals.opts =
-                               xtables_merge_options(
-#if XTABLES_VERSION_CODE > 5
-                                               iptables_globals.orig_opts,
 #endif
-                                               iptables_globals.opts,
-                                               xt_m->extra_opts,
-                                               &xt_m->option_offset);
-                               if (iptables_globals.opts == NULL)
-                                       goto out;
-                       }
+
+static int parse_rule_spec(struct connman_iptables *table,
+                               struct parse_context *ctx)
+{
+       /*
+        * How the parser works:
+        *
+        *  - If getopt finds 's', 'd', 'i', 'o'.
+        *    just extract the information.
+        *  - if '!' is found, set the invert flag to true and
+        *    removes the '!' from the optarg string and jumps
+        *    back to getopt to reparse the current optarg string.
+        *    After reparsing the invert flag is reseted to false.
+        *  - If 'm' or 'j' is found then call either
+        *    prepare_matches() or prepare_target(). Those function
+        *    will modify (extend) the longopts for getopt_long.
+        *    That means getopt will change its matching context according
+        *    the loaded target.
+        *
+        *    Here an example with iptables-test
+        *
+        *    argv[0] = ./tools/iptables-test
+        *    argv[1] = -t
+        *    argv[2] = filter
+        *    argv[3] = -A
+        *    argv[4] = INPUT
+        *    argv[5] = -m
+        *    argv[6] = mark
+        *    argv[7] = --mark
+        *    argv[8] = 999
+        *    argv[9] = -j
+        *    argv[10] = LOG
+        *
+        *    getopt found 'm' then the optarg is "mark" and optind 7
+        *    The longopts array containts before hitting the `case 'm'`
+        *
+        *    val A has_arg 1 name append
+        *    val C has_arg 1 name compare
+        *    val D has_arg 1 name delete
+        *    val F has_arg 1 name flush-chain
+        *    val I has_arg 1 name insert
+        *    val L has_arg 2 name list
+        *    val N has_arg 1 name new-chain
+        *    val P has_arg 1 name policy
+        *    val X has_arg 1 name delete-chain
+        *    val d has_arg 1 name destination
+        *    val i has_arg 1 name in-interface
+        *    val j has_arg 1 name jump
+        *    val m has_arg 1 name match
+        *    val o has_arg 1 name out-interface
+        *    val s has_arg 1 name source
+        *    val t has_arg 1 name table
+        *
+        *    After executing the `case 'm'` block longopts is
+        *
+        *    val A has_arg 1 name append
+        *    val C has_arg 1 name compare
+        *    val D has_arg 1 name delete
+        *    val F has_arg 1 name flush-chain
+        *    val I has_arg 1 name insert
+        *    val L has_arg 2 name list
+        *    val N has_arg 1 name new-chain
+        *    val P has_arg 1 name policy
+        *    val X has_arg 1 name delete-chain
+        *    val d has_arg 1 name destination
+        *    val i has_arg 1 name in-interface
+        *    val j has_arg 1 name jump
+        *    val m has_arg 1 name match
+        *    val o has_arg 1 name out-interface
+        *    val s has_arg 1 name source
+        *    val t has_arg 1 name table
+        *    val   has_arg 1 name mark
+        *
+        *    So the 'mark' matcher has added the 'mark' options
+        *    and getopt will then return c '256' optarg "999" optind 9
+        *    And we will hit the 'default' statement which then
+        *    will call the matchers parser (xt_m->parser() or
+        *    xtables_option_mpcall() depending on which version
+        *    of libxtables is found.
+        */
+       connman_bool_t invert = FALSE;
+       int len, c, err;
+
+       DBG("");
+
+       ctx->ip = g_try_new0(struct ipt_ip, 1);
+       if (ctx->ip == NULL)
+               return -ENOMEM;
+
+       /*
+        * Tell getopt_long not to generate error messages for unknown
+        * options and also reset optind back to 0.
+        */
+       opterr = 0;
+       optind = 0;
+
+       while ((c = getopt_long(ctx->argc, ctx->argv,
+                                       "-:d:i:o:s:m:j:",
+                                       iptables_globals.opts, NULL)) != -1) {
+               switch (c) {
+               case 's':
+                       /* Source specification */
+                       if (!parse_ip_and_mask(optarg,
+                                               &ctx->ip->src,
+                                               &ctx->ip->smsk))
+                               break;
+
+                       if (invert)
+                               ctx->ip->invflags |= IPT_INV_SRCIP;
 
                        break;
+               case 'd':
+                       /* Destination specification */
+                       if (!parse_ip_and_mask(optarg,
+                                               &ctx->ip->dst,
+                                               &ctx->ip->dmsk))
+                               break;
 
-               case 'o':
-                       out_len = strlen(optarg);
+                       if (invert)
+                               ctx->ip->invflags |= IPT_INV_DSTIP;
+                       break;
+               case 'i':
+                       /* In interface specification */
+                       len = strlen(optarg);
 
-                       if (out_len + 1 > IFNAMSIZ)
+                       if (len + 1 > IFNAMSIZ)
                                break;
 
-                       strcpy(ip.outiface, optarg);
-                       memset(ip.outiface_mask, 0xff, out_len + 1);
+                       strcpy(ctx->ip->iniface, optarg);
+                       memset(ctx->ip->iniface_mask, 0xff, len + 1);
 
                        if (invert)
-                               ip.invflags |= IPT_INV_VIA_OUT;
+                               ctx->ip->invflags |= IPT_INV_VIA_IN;
 
                        break;
+               case 'o':
+                       /* Out interface specification */
+                       len = strlen(optarg);
 
-               case 's':
-                       if (!inet_pton(AF_INET, optarg, &src))
+                       if (len + 1 > IFNAMSIZ)
                                break;
 
-                       ip.src = src;
-                       inet_pton(AF_INET, "255.255.255.255", &ip.smsk);
+                       strcpy(ctx->ip->outiface, optarg);
+                       memset(ctx->ip->outiface_mask, 0xff, len + 1);
 
                        if (invert)
-                               ip.invflags |= IPT_INV_SRCIP;
+                               ctx->ip->invflags |= IPT_INV_VIA_OUT;
 
                        break;
+               case 'm':
+                       /* Matches */
+                       ctx->xt_m = prepare_matches(table, &ctx->xt_rm, optarg);
+                       if (ctx->xt_m == NULL) {
+                               err = -EINVAL;
+                               goto out;
+                       }
 
-               case 't':
-                       table_name = optarg;
                        break;
+               case 'j':
+                       /* Target */
+                       ctx->xt_t = prepare_target(table, optarg);
+                       if (ctx->xt_t == NULL) {
+                               err = -EINVAL;
+                               goto out;
+                       }
 
+                       break;
                case 1:
                        if (optarg[0] == '!' && optarg[1] == '\0') {
                                invert = TRUE;
+
+                               /* Remove the '!' from the optarg */
                                optarg[0] = '\0';
+
+                               /*
+                                * And recall getopt_long without reseting
+                                * invert.
+                                */
                                continue;
                        }
 
-                       connman_error("Invalid option");
-
-                       ret = -EINVAL;
-                       goto out;
-
+                       break;
                default:
-                       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)) {
-                               if (xt_m == NULL || xt_m->parse == NULL)
-                                       break;
-
-                               xt_m->parse(c - xt_m->option_offset, argv,
-                                       invert, &xt_m->mflags, NULL, &xt_m->m);
-                       }
+                       err = parse_xt_modules(c, invert, ctx);
+                       if (err == 1)
+                               continue;
 
                        break;
                }
@@ -1497,151 +2025,213 @@ static int iptables_command(int argc, char *argv[])
                invert = FALSE;
        }
 
-       if (table_name == NULL)
-               table_name = "filter";
+       err = final_check_xt_modules(ctx);
 
-       table = iptables_init(table_name);
-       if (table == NULL) {
-               ret = -EINVAL;
-               goto out;
-       }
+out:
+       return err;
+}
 
-       if (delete_chain != NULL) {
-               printf("Delete chain %s\n", delete_chain);
+static void reset_xtables(void)
+{
+       struct xtables_match *xt_m;
+       struct xtables_target *xt_t;
 
-               iptables_delete_chain(table, delete_chain);
+       /*
+        * As side effect parsing a rule sets some global flags
+        * which will be evaluated/verified. Let's reset them
+        * to ensure we can parse more than one rule.
+        *
+        * Clear all flags because the flags are only valid
+        * for one rule.
+        */
+       for (xt_m = xtables_matches; xt_m != NULL; xt_m = xt_m->next)
+               xt_m->mflags = 0;
 
-               goto out;
+       for (xt_t = xtables_targets; xt_t != NULL; xt_t = xt_t->next) {
+               xt_t->tflags = 0;
+               xt_t->used = 0;
        }
 
-       if (dump) {
-               iptables_dump(table);
-
-               ret = 0;
-               goto out;
+       /*
+        * We need also to free the memory implicitly allocated
+        * during parsing (see xtables_options_xfrm()).
+        * Note xt_params is actually iptables_globals.
+        */
+       if (xt_params->opts != xt_params->orig_opts) {
+               g_free(xt_params->opts);
+               xt_params->opts = xt_params->orig_opts;
        }
+       xt_params->option_offset = 0;
+}
 
-       if (flush_chain) {
-               DBG("Flush chain %s", flush_chain);
-
-               iptables_flush_chain(table, flush_chain);
+static void cleanup_parse_context(struct parse_context *ctx)
+{
+       struct xtables_rule_match *rm, *tmp;
 
-               goto out;
+       g_strfreev(ctx->argv);
+       g_free(ctx->ip);
+       if (ctx->xt_t != NULL) {
+               g_free(ctx->xt_t->t);
+               ctx->xt_t->t = NULL;
        }
-
-       if (chain && new_chain) {
-               ret = -EINVAL;
-               goto out;
+       if (ctx->xt_m != NULL) {
+               g_free(ctx->xt_m->m);
+               ctx->xt_m->m = NULL;
        }
-
-       if (new_chain) {
-               DBG("New chain %s", new_chain);
-
-               ret = iptables_add_chain(table, new_chain);
-               goto out;
+       for (tmp = NULL, rm = ctx->xt_rm; rm != NULL; rm = rm->next) {
+               if (tmp != NULL)
+                       g_free(tmp);
+               tmp = rm;
        }
+       g_free(tmp);
 
-       if (chain) {
-               xt_t = prepare_target(table, target_name);
-               if (xt_t == NULL)
-                       goto out;
+       g_free(ctx);
+}
 
-               iptables_globals.opts =
-                       xtables_merge_options(
-#if XTABLES_VERSION_CODE > 5
-                                       iptables_globals.orig_opts,
-#endif
-                                       iptables_globals.opts,
-                                       xt_t->extra_opts,
-                                       &xt_t->option_offset);
-               if (iptables_globals.opts == NULL)
-                       goto out;
+int __connman_iptables_new_chain(const char *table_name,
+                                       const char *chain)
+{
+       struct connman_iptables *table;
 
-               if (delete == TRUE) {
-                       DBG("Deleting %s to %s (match %s)\n",
-                                       target_name, chain, match_name);
+       DBG("-t %s -N %s", table_name, chain);
 
-                       ret = iptables_delete_rule(table, &ip, chain,
-                                       target_name, xt_t, match_name, xt_m);
+       table = pre_load_table(table_name, NULL);
+       if (table == NULL)
+               return -EINVAL;
 
-                       goto out;
-               }
+       return iptables_add_chain(table, chain);
+}
 
-               if (insert == TRUE) {
-                       DBG("Inserting %s to %s (match %s)",
-                                       target_name, chain, match_name);
+int __connman_iptables_delete_chain(const char *table_name,
+                                       const char *chain)
+{
+       struct connman_iptables *table;
 
-                       ret = iptables_insert_rule(table, &ip, chain,
-                                       target_name, xt_t, match_name, xt_m);
+       DBG("-t %s -X %s", table_name, chain);
 
-                       goto out;
-               } else {
-                       DBG("Adding %s to %s (match %s)",
-                                       target_name, chain, match_name);
+       table = pre_load_table(table_name, NULL);
+       if (table == NULL)
+               return -EINVAL;
 
-                       ret = iptables_append_rule(table, &ip, chain,
-                                       target_name, xt_t, match_name, xt_m);
+       return iptables_delete_chain(table, chain);
+}
 
-                       goto out;
-               }
-       }
+int __connman_iptables_flush_chain(const char *table_name,
+                                       const char *chain)
+{
+       struct connman_iptables *table;
 
-out:
-       if (xt_t)
-               g_free(xt_t->t);
+       DBG("-t %s -F %s", table_name, chain);
 
-       if (xt_m)
-               g_free(xt_m->m);
+       table = pre_load_table(table_name, NULL);
+       if (table == NULL)
+               return -EINVAL;
 
-       return ret;
+       return iptables_flush_chain(table, chain);
 }
 
-int __connman_iptables_command(const char *format, ...)
+int __connman_iptables_change_policy(const char *table_name,
+                                       const char *chain,
+                                       const char *policy)
 {
-       char **argv, **arguments, *command;
-       int argc, i, ret;
-       va_list args;
+       struct connman_iptables *table;
 
-       if (format == NULL)
-               return -EINVAL;
+       DBG("-t %s -F %s", table_name, chain);
 
-       va_start(args, format);
+       table = pre_load_table(table_name, NULL);
+       if (table == NULL)
+               return -EINVAL;
 
-       command = g_strdup_vprintf(format, args);
+       return iptables_change_policy(table, chain, policy);
+}
 
-       va_end(args);
+int __connman_iptables_append(const char *table_name,
+                               const char *chain,
+                               const char *rule_spec)
+{
+       struct connman_iptables *table;
+       struct parse_context *ctx;
+       const char *target_name;
+       int err;
 
-       if (command == NULL)
+       ctx = g_try_new0(struct parse_context, 1);
+       if (ctx == NULL)
                return -ENOMEM;
 
-       arguments = g_strsplit_set(command, " ", -1);
+       DBG("-t %s -A %s %s", table_name, chain, rule_spec);
 
-       for (argc = 0; arguments[argc]; argc++);
-       ++argc;
+       err = prepare_getopt_args(rule_spec, ctx);
+       if (err < 0)
+               goto out;
+
+       table = pre_load_table(table_name, NULL);
+       if (table == NULL) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       err = parse_rule_spec(table, ctx);
+       if (err < 0)
+               goto out;
+
+       if (ctx->xt_t == NULL)
+               target_name = NULL;
+       else
+               target_name = ctx->xt_t->name;
+
+       err = iptables_insert_rule(table, ctx->ip, chain,
+                               target_name, ctx->xt_t, ctx->xt_rm);
+out:
+       cleanup_parse_context(ctx);
+       reset_xtables();
+
+       return err;
+}
 
-       DBG("command %s argc %d", command, argc);
+int __connman_iptables_delete(const char *table_name,
+                               const char *chain,
+                               const char *rule_spec)
+{
+       struct connman_iptables *table;
+       struct parse_context *ctx;
+       const char *target_name;
+       int err;
 
-       argv = g_try_malloc0(argc * sizeof(char *));
-       if (argv == NULL) {
-               g_free(command);
-               g_strfreev(arguments);
+       ctx = g_try_new0(struct parse_context, 1);
+       if (ctx == NULL)
                return -ENOMEM;
+
+       DBG("-t %s -D %s %s", table_name, chain, rule_spec);
+
+       err = prepare_getopt_args(rule_spec, ctx);
+       if (err < 0)
+               goto out;
+
+       table = pre_load_table(table_name, NULL);
+       if (table == NULL) {
+               err = -EINVAL;
+               goto out;
        }
 
-       argv[0] = "iptables";
-       for (i = 1; i < argc; i++)
-               argv[i] = arguments[i - 1];
+       err = parse_rule_spec(table, ctx);
+       if (err < 0)
+               goto out;
 
-       ret = iptables_command(argc, argv);
+       if (ctx->xt_t == NULL)
+               target_name = NULL;
+       else
+               target_name = ctx->xt_t->name;
 
-       g_free(command);
-       g_strfreev(arguments);
-       g_free(argv);
+       err = iptables_delete_rule(table, ctx->ip, chain,
+                               target_name, ctx->xt_t, ctx->xt_m,
+                               ctx->xt_rm);
+out:
+       cleanup_parse_context(ctx);
+       reset_xtables();
 
-       return ret;
+       return err;
 }
 
-
 int __connman_iptables_commit(const char *table_name)
 {
        struct connman_iptables *table;
@@ -1656,6 +2246,9 @@ int __connman_iptables_commit(const char *table_name)
 
        repl = iptables_blob(table);
 
+       if (debug_enabled == TRUE)
+               dump_ipt_replace(repl);
+
        err = iptables_replace(table, repl);
 
        g_free(repl->counters);
@@ -1676,17 +2269,71 @@ static void remove_table(gpointer user_data)
        table_cleanup(table);
 }
 
+static int flush_table_cb(struct ipt_entry *entry, int builtin,
+                               unsigned int hook, size_t size,
+                               unsigned int offset, void *user_data)
+{
+       GSList **chains = user_data;
+       struct xt_entry_target *target;
+       char *name;
+
+       if (offset + entry->next_offset == size)
+               return 0;
+
+       target = ipt_get_target(entry);
+
+       if (!strcmp(target->u.user.name, IPT_ERROR_TARGET))
+               name = g_strdup((const char*)target->data);
+       else if (builtin >= 0)
+                 name = g_strdup(hooknames[builtin]);
+       else
+               return 0;
+
+       *chains = g_slist_prepend(*chains, name);
+
+       return 0;
+}
+
+void flush_table(const char *name)
+{
+       GSList *chains = NULL, *list;
+       struct connman_iptables *table;
+
+       table = pre_load_table(name, NULL);
+       if (table == NULL)
+               return;
+
+       iterate_entries(table->blob_entries->entrytable,
+                       table->info->valid_hooks,
+                       table->info->hook_entry,
+                       table->info->underflow,
+                       table->blob_entries->size,
+                       flush_table_cb, &chains);
+
+       for (list = chains; list != NULL; list = list->next) {
+               char *chain = list->data;
+
+               DBG("chain %s", chain);
+               iptables_flush_chain(table, chain);
+       }
+
+       __connman_iptables_commit(name);
+       g_slist_free_full(chains, g_free);
+}
+
 int __connman_iptables_init(void)
 {
        DBG("");
 
+       if (getenv("CONNMAN_IPTABLES_DEBUG"))
+               debug_enabled = TRUE;
+
        table_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
                                                g_free, remove_table);
 
        xtables_init_all(&iptables_globals, NFPROTO_IPV4);
 
        return 0;
-
 }
 
 void __connman_iptables_cleanup(void)
@@ -1694,6 +2341,4 @@ void __connman_iptables_cleanup(void)
        DBG("");
 
        g_hash_table_destroy(table_hash);
-
-       xtables_free_opts(1);
 }