*
* Connection Manager
*
- * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 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 <sys/errno.h>
#include <sys/socket.h>
#include <xtables.h>
+#include <inttypes.h>
#include <linux/netfilter_ipv4/ip_tables.h>
#include "connman.h"
-
+#include "src/shared/util.h"
/*
* Some comments on how the iptables API works (some of them from the
struct connman_iptables_entry {
int offset;
int builtin;
+ int counter_idx;
struct ipt_entry *entry;
};
struct connman_iptables {
+ char *name;
int ipt_sock;
struct ipt_getinfo *info;
};
static GHashTable *table_hash = NULL;
-static gboolean debug_enabled = FALSE;
+static bool debug_enabled = false;
typedef int (*iterate_entries_cb_t)(struct ipt_entry *entry, int builtin,
- unsigned int hook,size_t size,
+ unsigned int hook, size_t size,
unsigned int offset, void *user_data);
+static unsigned int next_hook_entry_index(unsigned int *valid_hooks)
+{
+ 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 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, h;
+ unsigned int offset, h, hook;
int builtin, err;
struct ipt_entry *entry;
- if (valid_hooks != 0)
- h = __builtin_ffs(valid_hooks) - 1;
- else
- h = NF_INET_NUMHOOKS;
+ h = next_hook_entry_index(&valid_hooks);
+ hook = h;
- for (i = 0, entry = entries; i < size;
- i += entry->next_offset) {
+ for (offset = 0, entry = entries; offset < size;
+ offset += entry->next_offset) {
builtin = -1;
- entry = (void *)entries + i;
+ entry = (void *)entries + offset;
/*
- * Find next valid hook which offset is higher
- * or equal with the current 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) {
- if (hook_entry[h] < i) {
- valid_hooks ^= (1 << h);
-
- if (valid_hooks != 0)
- h = __builtin_ffs(valid_hooks) - 1;
- else
- h = NF_INET_NUMHOOKS;
- }
-
- if (hook_entry[h] == i)
- builtin = h;
+ if (h < NF_INET_NUMHOOKS && hook_entry[h] == offset) {
+ builtin = h;
+ hook = h;
}
- err = cb(entry, builtin, h, size, i, user_data);
+ 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 0;
{
iterate_entries_cb_t cb = user_data;
- DBG("entry %p hook %d offset %d size %d", entry, hook,
- offset, entry->next_offset);
+ DBG("entry %p hook %u offset %u size %u packets %"PRIu64" bytes %"PRIu64,
+ entry, hook, offset, (unsigned int) entry->next_offset,
+ (uint64_t) entry->counters.pcnt, (uint64_t) entry->counters.bcnt);
return cb(entry, builtin, hook, size, offset, NULL);
}
static int target_to_verdict(const char *target_name)
{
- if (!strcmp(target_name, LABEL_ACCEPT))
+ if (!g_strcmp0(target_name, LABEL_ACCEPT))
return -NF_ACCEPT - 1;
- if (!strcmp(target_name, LABEL_DROP))
+ if (!g_strcmp0(target_name, LABEL_DROP))
return -NF_DROP - 1;
- if (!strcmp(target_name, LABEL_QUEUE))
+ if (!g_strcmp0(target_name, LABEL_QUEUE))
return -NF_QUEUE - 1;
- if (!strcmp(target_name, LABEL_RETURN))
+ if (!g_strcmp0(target_name, LABEL_RETURN))
return XT_RETURN;
return 0;
}
-static gboolean is_builtin_target(const char *target_name)
+static bool is_builtin_target(const char *target_name)
{
- if (!strcmp(target_name, LABEL_ACCEPT) ||
- !strcmp(target_name, LABEL_DROP) ||
- !strcmp(target_name, LABEL_QUEUE) ||
- !strcmp(target_name, LABEL_RETURN))
- return TRUE;
+ if (!g_strcmp0(target_name, LABEL_ACCEPT) ||
+ !g_strcmp0(target_name, LABEL_DROP) ||
+ !g_strcmp0(target_name, LABEL_QUEUE) ||
+ !g_strcmp0(target_name, LABEL_RETURN))
+ return true;
- return FALSE;
+ return false;
}
-static gboolean is_jump(struct connman_iptables_entry *e)
+static bool is_jump(struct connman_iptables_entry *e)
{
struct xt_entry_target *target;
target = ipt_get_target(e->entry);
- if (!strcmp(target->u.user.name, IPT_STANDARD_TARGET)) {
+ if (!g_strcmp0(target->u.user.name, IPT_STANDARD_TARGET)) {
struct xt_standard_target *t;
t = (struct xt_standard_target *)target;
return false;
}
-static gboolean is_chain(struct connman_iptables *table,
+static bool 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 bool is_chain(struct connman_iptables *table,
struct connman_iptables_entry *e)
{
struct ipt_entry *entry;
entry = e->entry;
if (e->builtin >= 0)
- return TRUE;
+ return true;
target = ipt_get_target(entry);
- if (!strcmp(target->u.user.name, IPT_ERROR_TARGET))
- return TRUE;
+ if (!g_strcmp0(target->u.user.name, IPT_ERROR_TARGET))
+ return true;
- return FALSE;
+ return false;
}
static GList *find_chain_head(struct connman_iptables *table,
/* Buit-in chain */
builtin = head->builtin;
- if (builtin >= 0 && !strcmp(hooknames[builtin], chain_name))
+ if (builtin >= 0 && !g_strcmp0(hooknames[builtin], chain_name))
break;
/* User defined chain */
target = ipt_get_target(entry);
- if (!strcmp(target->u.user.name, IPT_ERROR_TARGET) &&
- !strcmp((char *)target->data, chain_name))
+ if (!g_strcmp0(target->u.user.name, IPT_ERROR_TARGET) &&
+ !g_strcmp0((char *)target->data, chain_name))
break;
}
GList *chain_head, *list;
chain_head = find_chain_head(table, chain_name);
- if (chain_head == NULL)
+ if (!chain_head)
return NULL;
/* Then we look for the next chain */
static void update_targets_reference(struct connman_iptables *table,
struct connman_iptables_entry *entry_before,
struct connman_iptables_entry *modified_entry,
- gboolean is_removing)
+ bool is_removing)
{
struct connman_iptables_entry *tmp;
struct xt_standard_target *t;
t = (struct xt_standard_target *)ipt_get_target(tmp->entry);
- if (is_removing == TRUE) {
+ if (is_removing) {
if (t->verdict >= entry_before->offset)
t->verdict -= offset;
} else {
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,
struct ipt_entry *entry, GList *before,
- int builtin)
+ int builtin, int counter_idx)
{
struct connman_iptables_entry *e, *entry_before;
- if (table == NULL)
+ if (!table)
return -1;
e = g_try_malloc0(sizeof(struct connman_iptables_entry));
- if (e == NULL)
+ if (!e)
return -1;
e->entry = entry;
e->builtin = builtin;
+ e->counter_idx = counter_idx;
table->entries = g_list_insert_before(table->entries, before, e);
table->num_entries++;
table->size += entry->next_offset;
- if (before == NULL) {
+ if (!before) {
e->offset = table->size - entry->next_offset;
return 0;
* We've just appended/insterted a new entry. All references
* should be bumped accordingly.
*/
- update_targets_reference(table, entry_before, e, FALSE);
+ update_targets_reference(table, entry_before, e, false);
update_offsets(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 void delete_update_hooks(struct connman_iptables *table,
+ int builtin, GList *chain_head,
+ int removed)
+{
+ struct connman_iptables_entry *e;
+ GList *list;
+
+ e = chain_head->data;
+ e->builtin = builtin;
+
+ table->underflow[builtin] -= removed;
+
+ for (list = chain_head->next; list; list = list->next) {
+ e = list->data;
+
+ if (e->builtin < 0)
+ continue;
+
+ table->hook_entry[e->builtin] -= removed;
+ table->underflow[e->builtin] -= removed;
+ }
+}
+
static int iptables_flush_chain(struct connman_iptables *table,
const char *name)
{
struct connman_iptables_entry *entry;
int builtin, removed = 0;
+ DBG("table %s chain %s", table->name, name);
+
chain_head = find_chain_head(table, name);
- if (chain_head == NULL)
+ if (!chain_head)
return -EINVAL;
chain_tail = find_chain_tail(table, name);
- if (chain_tail == NULL)
+ if (!chain_tail)
return -EINVAL;
entry = chain_head->data;
list = next;
}
- if (builtin >= 0) {
- struct connman_iptables_entry *e;
-
- entry = list->data;
-
- entry->builtin = builtin;
-
- table->underflow[builtin] -= removed;
-
- for (list = chain_tail; list; list = list->next) {
- e = list->data;
-
- builtin = e->builtin;
- if (builtin < 0)
- continue;
-
- table->hook_entry[builtin] -= removed;
- table->underflow[builtin] -= removed;
- }
- }
+ if (builtin >= 0)
+ delete_update_hooks(table, builtin, chain_tail->prev, removed);
update_offsets(table);
struct ipt_standard_target *standard;
u_int16_t entry_head_size, entry_return_size;
+ DBG("table %s chain %s", table->name, name);
+
last = g_list_last(table->entries);
/*
*/
/* head entry */
- entry_head_size = sizeof(struct ipt_entry) +
- sizeof(struct error_target);
+ entry_head_size = ALIGN(sizeof(struct ipt_entry)) +
+ ALIGN(sizeof(struct error_target));
entry_head = g_try_malloc0(entry_head_size);
- if (entry_head == NULL)
+ if (!entry_head)
goto err_head;
- memset(entry_head, 0, entry_head_size);
-
- entry_head->target_offset = sizeof(struct ipt_entry);
+ entry_head->target_offset = ALIGN(sizeof(struct ipt_entry));
entry_head->next_offset = entry_head_size;
error = (struct error_target *) entry_head->elems;
- strcpy(error->t.u.user.name, IPT_ERROR_TARGET);
+ g_stpcpy(error->t.u.user.name, IPT_ERROR_TARGET);
error->t.u.user.target_size = ALIGN(sizeof(struct error_target));
- strcpy(error->error, name);
+ g_stpcpy(error->error, name);
- if (iptables_add_entry(table, entry_head, last, -1) < 0)
+ if (iptables_add_entry(table, entry_head, last, -1, -1) < 0)
goto err_head;
/* tail entry */
- entry_return_size = sizeof(struct ipt_entry) +
- sizeof(struct ipt_standard_target);
+ entry_return_size = ALIGN(sizeof(struct ipt_entry))+
+ ALIGN(sizeof(struct ipt_standard_target));
entry_return = g_try_malloc0(entry_return_size);
- if (entry_return == NULL)
+ if (!entry_return)
goto err;
- memset(entry_return, 0, entry_return_size);
-
- entry_return->target_offset = sizeof(struct ipt_entry);
+ entry_return->target_offset = ALIGN(sizeof(struct ipt_entry));
entry_return->next_offset = entry_return_size;
standard = (struct ipt_standard_target *) entry_return->elems;
ALIGN(sizeof(struct ipt_standard_target));
standard->verdict = XT_RETURN;
- if (iptables_add_entry(table, entry_return, last, -1) < 0)
+ if (iptables_add_entry(table, entry_return, last, -1, -1) < 0)
goto err;
return 0;
struct connman_iptables_entry *entry;
GList *chain_head, *chain_tail;
+ DBG("table %s chain %s", table->name, name);
+
chain_head = find_chain_head(table, name);
- if (chain_head == NULL)
+ if (!chain_head)
return -EINVAL;
entry = chain_head->data;
return -EINVAL;
chain_tail = find_chain_tail(table, name);
- if (chain_tail == NULL)
+ if (!chain_tail)
return -EINVAL;
/* Chain must be flushed */
size_t match_size, target_size;
match_size = 0;
- for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL; tmp_xt_rm = tmp_xt_rm->next)
+ for (tmp_xt_rm = xt_rm; tmp_xt_rm; 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);
+ target_size = xt_t->t->u.target_size;
else
target_size = ALIGN(sizeof(struct xt_standard_target));
- new_entry = g_try_malloc0(sizeof(struct ipt_entry) + target_size +
- match_size);
- if (new_entry == NULL)
+ new_entry = g_try_malloc0(ALIGN(sizeof(struct ipt_entry)) +
+ target_size + match_size);
+ if (!new_entry)
return NULL;
memcpy(&new_entry->ip, ip, sizeof(struct ipt_ip));
- new_entry->target_offset = sizeof(struct ipt_entry) + match_size;
- new_entry->next_offset = sizeof(struct ipt_entry) + target_size +
- match_size;
+ new_entry->target_offset = ALIGN(sizeof(struct ipt_entry)) +
+ match_size;
+ new_entry->next_offset = ALIGN(sizeof(struct ipt_entry)) +
+ target_size + match_size;
match_size = 0;
- for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL;
+ for (tmp_xt_rm = xt_rm; tmp_xt_rm;
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);
struct connman_iptables_entry *head, *e;
int builtin;
- if (chain_head == NULL)
+ if (!chain_head)
return;
head = chain_head->data;
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)
+ int *builtin, struct xtables_rule_match *xt_rm,
+ bool insert)
{
GList *chain_tail, *chain_head;
struct ipt_entry *new_entry;
struct connman_iptables_entry *head;
chain_head = find_chain_head(table, chain_name);
- if (chain_head == NULL)
+ if (!chain_head)
return NULL;
chain_tail = find_chain_tail(table, chain_name);
- if (chain_tail == NULL)
+ if (!chain_tail)
return NULL;
new_entry = new_rule(ip, target_name, xt_t, xt_rm);
- if (new_entry == NULL)
+ if (!new_entry)
return NULL;
update_hooks(table, chain_head, new_entry);
head = chain_head->data;
if (head->builtin < 0)
*builtin = -1;
- else if (chain_head == chain_tail->prev) {
+ else if (insert || chain_head == chain_tail->prev) {
*builtin = head->builtin;
head->builtin = -1;
}
return new_entry;
}
+static int iptables_append_rule(struct connman_iptables *table,
+ 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;
+ GList *chain_tail;
+
+ DBG("table %s chain %s", table->name, chain_name);
+
+ chain_tail = find_chain_tail(table, chain_name);
+ if (!chain_tail)
+ return -EINVAL;
+
+ new_entry = prepare_rule_inclusion(table, ip, chain_name,
+ target_name, xt_t, &builtin, xt_rm, false);
+ if (!new_entry)
+ return -EINVAL;
+
+ ret = iptables_add_entry(table, new_entry, chain_tail->prev, builtin, -1);
+ if (ret < 0)
+ g_free(new_entry);
+
+ return ret;
+}
+
static int iptables_insert_rule(struct connman_iptables *table,
struct ipt_ip *ip, const char *chain_name,
const char *target_name,
int builtin = -1, ret;
GList *chain_head;
+ DBG("table %s chain %s", table->name, chain_name);
+
chain_head = find_chain_head(table, chain_name);
- if (chain_head == NULL)
+ if (!chain_head)
return -EINVAL;
new_entry = prepare_rule_inclusion(table, ip, chain_name,
- target_name, xt_t, &builtin, xt_rm);
- if (new_entry == NULL)
+ target_name, xt_t, &builtin, xt_rm, true);
+ if (!new_entry)
return -EINVAL;
if (builtin == -1)
chain_head = chain_head->next;
- ret = iptables_add_entry(table, new_entry, chain_head, builtin);
+ ret = iptables_add_entry(table, new_entry, chain_head, builtin, -1);
if (ret < 0)
g_free(new_entry);
return ret;
}
-static gboolean is_same_ipt_entry(struct ipt_entry *i_e1,
+static bool is_same_ipt_entry(struct ipt_entry *i_e1,
struct ipt_entry *i_e2)
{
if (memcmp(&i_e1->ip, &i_e2->ip, sizeof(struct ipt_ip)) != 0)
- return FALSE;
+ return false;
if (i_e1->target_offset != i_e2->target_offset)
- return FALSE;
+ return false;
if (i_e1->next_offset != i_e2->next_offset)
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
-static gboolean is_same_target(struct xt_entry_target *xt_e_t1,
+static bool is_same_target(struct xt_entry_target *xt_e_t1,
struct xt_entry_target *xt_e_t2)
{
- if (xt_e_t1 == NULL || xt_e_t2 == NULL)
- return FALSE;
+ unsigned int i;
- if (strcmp(xt_e_t1->u.user.name, IPT_STANDARD_TARGET) == 0) {
+ if (!xt_e_t1 || !xt_e_t2)
+ return false;
+
+ if (g_strcmp0(xt_e_t1->u.user.name, "") == 0 &&
+ g_strcmp0(xt_e_t2->u.user.name, "") == 0) {
+ /* fallthrough */
+ return true;
+ } else if (g_strcmp0(xt_e_t1->u.user.name, IPT_STANDARD_TARGET) == 0) {
struct xt_standard_target *xt_s_t1;
struct xt_standard_target *xt_s_t2;
xt_s_t2 = (struct xt_standard_target *) xt_e_t2;
if (xt_s_t1->verdict != xt_s_t2->verdict)
- return FALSE;
+ return false;
} else {
if (xt_e_t1->u.target_size != xt_e_t2->u.target_size)
- return FALSE;
+ return false;
- if (strcmp(xt_e_t1->u.user.name, xt_e_t2->u.user.name) != 0)
- return FALSE;
+ if (g_strcmp0(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;
+ return true;
}
-static gboolean is_same_match(struct xt_entry_match *xt_e_m1,
+static bool is_same_match(struct xt_entry_match *xt_e_m1,
struct xt_entry_match *xt_e_m2)
{
- if (xt_e_m1 == NULL || xt_e_m2 == NULL)
- return FALSE;
+ unsigned int i;
+
+ if (!xt_e_m1 || !xt_e_m2)
+ return false;
if (xt_e_m1->u.match_size != xt_e_m2->u.match_size)
- return FALSE;
+ return false;
if (xt_e_m1->u.user.revision != xt_e_m2->u.user.revision)
- return FALSE;
+ return false;
- if (strcmp(xt_e_m1->u.user.name, xt_e_m2->u.user.name) != 0)
- return FALSE;
+ if (g_strcmp0(xt_e_m1->u.user.name, xt_e_m2->u.user.name) != 0)
+ return false;
- return TRUE;
+ 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 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,
+ GList *matches,
struct xtables_rule_match *xt_rm)
{
GList *chain_tail, *chain_head, *list;
int builtin;
chain_head = find_chain_head(table, chain_name);
- if (chain_head == NULL)
+ if (!chain_head)
return NULL;
chain_tail = find_chain_tail(table, chain_name);
- if (chain_tail == NULL)
+ if (!chain_tail)
return NULL;
- if (!xt_t && !xt_m)
+ if (!xt_t && !matches)
return NULL;
entry_test = new_rule(ip, target_name, xt_t, xt_rm);
- if (entry_test == NULL)
+ if (!entry_test)
return NULL;
- if (xt_t != NULL)
+ if (xt_t)
xt_e_t = ipt_get_target(entry_test);
- if (xt_m != NULL)
+ if (matches)
xt_e_m = (struct xt_entry_match *)entry_test->elems;
entry = chain_head->data;
tmp = list->data;
tmp_e = tmp->entry;
- if (is_same_ipt_entry(entry_test, tmp_e) == FALSE)
+ if (!is_same_ipt_entry(entry_test, tmp_e))
continue;
- if (xt_t != NULL) {
+ if (xt_t) {
struct xt_entry_target *tmp_xt_e_t;
tmp_xt_e_t = ipt_get_target(tmp_e);
continue;
}
- if (xt_m != NULL) {
+ if (matches) {
struct xt_entry_match *tmp_xt_e_m;
tmp_xt_e_m = (struct xt_entry_match *)tmp_e->elems;
struct ipt_ip *ip, const char *chain_name,
const char *target_name,
struct xtables_target *xt_t,
- struct xtables_match *xt_m,
+ GList *matches,
struct xtables_rule_match *xt_rm)
{
struct connman_iptables_entry *entry;
- GList *chain_tail, *list;
+ GList *chain_head, *chain_tail, *list;
int builtin, removed;
+
+ DBG("table %s chain %s", table->name, chain_name);
+
removed = 0;
+ chain_head = find_chain_head(table, chain_name);
+ if (!chain_head)
+ return -EINVAL;
+
chain_tail = find_chain_tail(table, chain_name);
- if (chain_tail == NULL)
+ if (!chain_tail)
return -EINVAL;
list = find_existing_rule(table, ip, chain_name, target_name,
- xt_t, xt_m, xt_rm);
- if (list == NULL)
+ xt_t, matches, xt_rm);
+ if (!list)
return -EINVAL;
+ entry = chain_head->data;
+ builtin = entry->builtin;
+
+ if (builtin >= 0 && list == chain_head) {
+ /*
+ * We are about to remove the first rule in the
+ * chain. In this case we need to store the builtin
+ * value to the new chain_head.
+ *
+ * Note, for builtin chains, chain_head->next is
+ * always valid. A builtin chain has always a policy
+ * rule at the end.
+ */
+ chain_head = chain_head->next;
+
+ entry = chain_head->data;
+ entry->builtin = builtin;
+ }
+
entry = list->data;
- if (entry == NULL)
+ if (!entry)
return -EINVAL;
- builtin = entry->builtin;
-
/* We have deleted a rule,
* all references should be bumped accordingly */
- if (list->next != NULL)
+ if (list->next)
update_targets_reference(table, list->next->data,
- list->data, TRUE);
+ list->data, true);
removed += remove_table_entry(table, entry);
- if (builtin >= 0) {
- list = list->next;
- if (list) {
- entry = list->data;
- entry->builtin = builtin;
- }
-
- table->underflow[builtin] -= removed;
- for (list = chain_tail; list; list = list->next) {
- entry = list->data;
-
- builtin = entry->builtin;
- if (builtin < 0)
- continue;
-
- table->hook_entry[builtin] -= removed;
- table->underflow[builtin] -= removed;
- }
- }
+ if (builtin >= 0)
+ delete_update_hooks(table, builtin, chain_head, removed);
update_offsets(table);
static int iptables_change_policy(struct connman_iptables *table,
const char *chain_name, const char *policy)
{
- GList *chain_head;
+ GList *chain_head, *chain_tail;
struct connman_iptables_entry *entry;
struct xt_entry_target *target;
struct xt_standard_target *t;
int verdict;
+ DBG("table %s chain %s policy %s", table->name, chain_name, policy);
+
verdict = target_to_verdict(policy);
- if (verdict == 0)
+ switch (verdict) {
+ case -NF_ACCEPT - 1:
+ case -NF_DROP - 1:
+ break;
+ default:
return -EINVAL;
+ }
chain_head = find_chain_head(table, chain_name);
- if (chain_head == NULL)
+ if (!chain_head)
return -EINVAL;
entry = chain_head->data;
if (entry->builtin < 0)
return -EINVAL;
+ chain_tail = find_chain_tail(table, chain_name);
+ if (!chain_tail)
+ return -EINVAL;
+
+ entry = chain_tail->prev->data;
target = ipt_get_target(entry->entry);
t = (struct xt_standard_target *)target;
+ if (t->verdict != verdict)
+ entry->counter_idx = -1;
t->verdict = verdict;
return 0;
unsigned char *entry_index;
r = g_try_malloc0(sizeof(struct ipt_replace) + table->size);
- if (r == NULL)
+ if (!r)
return NULL;
memset(r, 0, sizeof(*r) + table->size);
r->counters = g_try_malloc0(sizeof(struct xt_counters)
* table->old_entries);
- if (r->counters == NULL) {
+ if (!r->counters) {
g_free(r);
return NULL;
}
- strcpy(r->name, table->info->name);
+ g_stpcpy(r->name, table->info->name);
r->num_entries = table->num_entries;
r->size = table->size;
if (strlen(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)
+ if (inet_ntop(AF_INET, &ip->src, ip_string, INET6_ADDRSTRLEN) &&
+ inet_ntop(AF_INET, &ip->smsk, ip_mask,
+ INET6_ADDRSTRLEN))
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)
+ if (inet_ntop(AF_INET, &ip->dst, ip_string, INET6_ADDRSTRLEN) &&
+ inet_ntop(AF_INET, &ip->dmsk, ip_mask,
+ INET6_ADDRSTRLEN))
DBG("\tdst %s/%s", ip_string, ip_mask);
}
target = ipt_get_target(entry);
- if (!strcmp(target->u.user.name, IPT_STANDARD_TARGET)) {
+ if (!g_strcmp0(target->u.user.name, IPT_STANDARD_TARGET)) {
struct xt_standard_target *t;
t = (struct xt_standard_target *)target;
xt_t = xtables_find_target(IPT_STANDARD_TARGET,
XTF_LOAD_MUST_SUCCEED);
- if(xt_t->print != NULL)
+ if (xt_t->print)
xt_t->print(NULL, target, 1);
} else {
xt_t = xtables_find_target(target->u.user.name, XTF_TRY_LOAD);
- if (xt_t == NULL) {
+ if (!xt_t) {
DBG("\ttarget %s", target->u.user.name);
return;
}
- if(xt_t->print != NULL) {
+ if (xt_t->print) {
DBG("\ttarget ");
xt_t->print(NULL, target, 1);
}
}
+
+ if (xt_t == xt_t->next)
+ free(xt_t);
}
static void dump_match(struct ipt_entry *entry)
return;
xt_m = xtables_find_match(match->u.user.name, XTF_TRY_LOAD, NULL);
- if (xt_m == NULL)
+ if (!xt_m)
goto out;
- if(xt_m->print != NULL) {
+ if (xt_m->print) {
DBG("\tmatch ");
xt_m->print(NULL, match, 1);
return;
}
+ if (xt_m == xt_m->next)
+ free(xt_m);
out:
DBG("\tmatch %s", match->u.user.name);
return 0;
}
- if (!strcmp(target->u.user.name, IPT_ERROR_TARGET)) {
+ if (!g_strcmp0(target->u.user.name, IPT_ERROR_TARGET)) {
DBG("\tUSER CHAIN (%s) match %p target %p",
target->data, entry->elems,
(char *)entry + entry->target_offset);
iterate_entries(table->blob_entries->entrytable,
table->info->valid_hooks,
table->info->hook_entry,
+ table->info->underflow,
table->blob_entries->size,
print_entry, dump_entry);
}
repl->underflow[NF_IP_POST_ROUTING]);
iterate_entries(repl->entries, repl->valid_hooks,
- repl->hook_entry, repl->size, print_entry, dump_entry);
+ repl->hook_entry, repl->underflow,
+ repl->size, print_entry, dump_entry);
}
static int iptables_get_entries(struct connman_iptables *table)
{
socklen_t entry_size;
+ int err;
entry_size = sizeof(struct ipt_get_entries) + table->info->size;
- return getsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_GET_ENTRIES,
+ err = getsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_GET_ENTRIES,
table->blob_entries, &entry_size);
+ if (err < 0)
+ return -errno;
+
+ return 0;
}
static int iptables_replace(struct connman_iptables *table,
struct ipt_replace *r)
{
- return setsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_SET_REPLACE, r,
- sizeof(*r) + r->size);
+ int err;
+
+ err = setsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_SET_REPLACE, r,
+ sizeof(*r) + r->size);
+ if (err < 0)
+ return -errno;
+
+ return 0;
+}
+
+static int iptables_add_counters(struct connman_iptables *table,
+ struct xt_counters_info *c)
+{
+ int err;
+
+ err = setsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_SET_ADD_COUNTERS, c,
+ sizeof(*c) + sizeof(struct xt_counters) * c->num_counters);
+ if (err < 0)
+ return -errno;
+
+ return 0;
}
static int add_entry(struct ipt_entry *entry, int builtin, unsigned int hook,
struct ipt_entry *new_entry;
new_entry = g_try_malloc0(entry->next_offset);
- if (new_entry == NULL)
+ if (!new_entry)
return -ENOMEM;
memcpy(new_entry, entry, entry->next_offset);
- return iptables_add_entry(table, new_entry, NULL, builtin);
+ return iptables_add_entry(table, new_entry, NULL, builtin,
+ table->num_entries);
}
static void table_cleanup(struct connman_iptables *table)
GList *list;
struct connman_iptables_entry *entry;
- if (table == NULL)
+ if (!table)
return;
if (table->ipt_sock >= 0)
}
g_list_free(table->entries);
+ g_free(table->name);
g_free(table->info);
g_free(table->blob_entries);
g_free(table);
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)
DBG("ip_tables module loading gives error but trying anyway");
module = g_strconcat("iptable_", table_name, NULL);
- if (module == NULL)
+ if (!module)
return NULL;
if (xtables_insmod(module, NULL, TRUE) != 0)
g_free(module);
- table = g_hash_table_lookup(table_hash, table_name);
- if (table != NULL)
- return table;
-
table = g_try_new0(struct connman_iptables, 1);
- if (table == NULL)
+ if (!table)
return NULL;
table->info = g_try_new0(struct ipt_getinfo, 1);
- if (table->info == NULL)
+ if (!table->info)
goto err;
table->ipt_sock = socket(AF_INET, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_RAW);
goto err;
s = sizeof(*table->info);
- strcpy(table->info->name, table_name);
+ g_stpcpy(table->info->name, table_name);
if (getsockopt(table->ipt_sock, IPPROTO_IP, IPT_SO_GET_INFO,
table->info, &s) < 0) {
connman_error("iptables support missing error %d (%s)", errno,
table->blob_entries = g_try_malloc0(sizeof(struct ipt_get_entries) +
table->info->size);
- if (table->blob_entries == NULL)
+ if (!table->blob_entries)
goto err;
- strcpy(table->blob_entries->name, table_name);
+ g_stpcpy(table->blob_entries->name, table_name);
table->blob_entries->size = table->info->size;
if (iptables_get_entries(table) < 0)
iterate_entries(table->blob_entries->entrytable,
table->info->valid_hooks, table->info->hook_entry,
- table->blob_entries->size, add_entry, table);
+ 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)
+ if (debug_enabled)
dump_table(table);
return table;
.option_offset = 0,
.opts = iptables_opts,
.orig_opts = iptables_opts,
+#if XTABLES_VERSION_CODE > 10
+ .compat_rev = xtables_compatible_revision,
+#endif
};
static struct xtables_target *prepare_target(struct connman_iptables *table,
const char *target_name)
{
struct xtables_target *xt_t = NULL;
- gboolean is_builtin, is_user_defined;
+ bool is_builtin, is_user_defined;
GList *chain_head = NULL;
size_t target_size;
- is_builtin = FALSE;
- is_user_defined = FALSE;
+ is_builtin = false;
+ is_user_defined = false;
if (is_builtin_target(target_name))
- is_builtin = TRUE;
+ is_builtin = true;
else {
chain_head = find_chain_head(table, target_name);
- if (chain_head != NULL && chain_head->next != NULL)
- is_user_defined = TRUE;
+ if (chain_head && chain_head->next)
+ is_user_defined = true;
}
if (is_builtin || is_user_defined)
else
xt_t = xtables_find_target(target_name, XTF_TRY_LOAD);
- if (xt_t == NULL)
+ if (!xt_t)
return NULL;
target_size = ALIGN(sizeof(struct ipt_entry_target)) + xt_t->size;
xt_t->t = g_try_malloc0(target_size);
- if (xt_t->t == NULL)
+ if (!xt_t->t)
return NULL;
xt_t->t->u.target_size = target_size;
struct xt_standard_target *target;
target = (struct xt_standard_target *)(xt_t->t);
- strcpy(target->target.u.user.name, IPT_STANDARD_TARGET);
+ g_stpcpy(target->target.u.user.name, IPT_STANDARD_TARGET);
- if (is_builtin == TRUE)
+ if (is_builtin)
target->verdict = target_to_verdict(target_name);
- else if (is_user_defined == TRUE) {
+ else if (is_user_defined) {
struct connman_iptables_entry *target_rule;
- if (chain_head == NULL) {
- g_free(xt_t->t);
- return NULL;
- }
-
target_rule = chain_head->next->data;
target->verdict = target_rule->offset;
}
} else {
- strcpy(xt_t->t->u.user.name, target_name);
+ g_stpcpy(xt_t->t->u.user.name, target_name);
xt_t->t->u.user.revision = xt_t->revision;
- if (xt_t->init != NULL)
+ if (xt_t->init)
xt_t->init(xt_t->t);
}
-#if XTABLES_VERSION_CODE > 5
- if (xt_t->x6_options != NULL)
+ if (xt_t->x6_options)
iptables_globals.opts =
xtables_options_xfrm(
iptables_globals.orig_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) {
+ if (!iptables_globals.opts) {
g_free(xt_t->t);
xt_t = NULL;
}
struct xtables_match *xt_m;
size_t match_size;
- if (match_name == NULL)
+ if (!match_name)
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)
+ if (!xt_m->m)
return NULL;
xt_m->m->u.match_size = match_size;
- strcpy(xt_m->m->u.user.name, xt_m->name);
+ g_stpcpy(xt_m->m->u.user.name, xt_m->name);
xt_m->m->u.user.revision = xt_m->revision;
- if (xt_m->init != NULL)
+ if (xt_m->init)
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)
+ if (xt_m->x6_options)
iptables_globals.opts =
xtables_options_xfrm(
iptables_globals.orig_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) {
+ if (!iptables_globals.opts) {
g_free(xt_m->m);
+
+ if (xt_m == xt_m->next)
+ free(xt_m);
+
xt_m = NULL;
}
-done:
return xt_m;
}
-static int parse_ip_and_mask(const char *str, struct in_addr *ip, struct in_addr *mask)
+static int parse_ip_and_mask(const char *str, struct in_addr *ip,
+ struct in_addr *mask)
{
char **tokens;
uint32_t prefixlength;
int err;
tokens = g_strsplit(str, "/", 2);
- if (tokens == NULL)
+ if (!tokens)
return -1;
if (!inet_pton(AF_INET, tokens[0], ip)) {
goto out;
}
- if (tokens[1] != NULL) {
+ if (tokens[1]) {
prefixlength = strtol(tokens[1], NULL, 10);
if (prefixlength > 31) {
err = -1;
return err;
}
-static struct connman_iptables *pre_load_table(const char *table_name,
- struct connman_iptables *table)
+static struct connman_iptables *get_table(const char *table_name)
{
- if (table != NULL)
- return table;
+ struct connman_iptables *table;
- return iptables_init(table_name);
-}
+ if (!table_name)
+ table_name = "filter";
-static void clear_tables_flags(void)
-{
- struct xtables_match *xt_m;
- struct xtables_target *xt_t;
+ table = g_hash_table_lookup(table_hash, table_name);
+ if (table)
+ return table;
- /*
- * 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;
+ table = iptables_init(table_name);
+ if (!table)
+ return NULL;
- for (xt_t = xtables_targets; xt_t != NULL; xt_t = xt_t->next) {
- xt_t->tflags = 0;
- xt_t->used = 0;
- }
+ table->name = g_strdup(table_name);
+ g_hash_table_replace(table_hash, table->name, table);
+
+ return table;
}
struct parse_context {
char **argv;
struct ipt_ip *ip;
struct xtables_target *xt_t;
- struct xtables_match *xt_m;
+ GList *xt_m;
struct xtables_rule_match *xt_rm;
+ int proto;
};
static int prepare_getopt_args(const char *str, struct parse_context *ctx)
tokens = g_strsplit_set(str, " ", -1);
- for (i = 0; tokens[i]; i++);
+ i = g_strv_length(tokens);
/* Add space for the argv[0] value */
ctx->argc = i + 1;
/* Don't forget the last NULL entry */
ctx->argv = g_try_malloc0((ctx->argc + 1) * sizeof(char *));
- if (ctx->argv == NULL) {
+ if (!ctx->argv) {
g_strfreev(tokens);
return -ENOMEM;
}
for (i = 1; i < ctx->argc; i++)
ctx->argv[i] = tokens[i - 1];
+ g_free(tokens);
+
return 0;
}
-#if XTABLES_VERSION_CODE > 5
-
-static int parse_xt_modules(int c, connman_bool_t invert,
+static int parse_xt_modules(int c, bool invert,
struct parse_context *ctx)
{
struct xtables_match *m;
struct xtables_rule_match *rm;
+ struct ipt_entry fw;
+
+ memset(&fw, 0, sizeof(fw));
- DBG("xtables version code > 5");
+ /* The SNAT parser wants to know the protocol. */
+ if (ctx->proto == 0)
+ ctx->proto = IPPROTO_IP;
+ fw.ip.proto = ctx->proto;
- for (rm = ctx->xt_rm; rm != NULL; rm = rm->next) {
+ for (rm = ctx->xt_rm; rm; rm = rm->next) {
if (rm->completed != 0)
continue;
m = rm->match;
- if (m->x6_parse == NULL && m->parse == NULL)
+ if (!m->x6_parse && !m->parse)
continue;
if (c < (int) m->option_offset ||
+ XT_OPTION_OFFSET_SCALE)
continue;
- xtables_option_mpcall(c, ctx->argv, invert, m, NULL);
+ xtables_option_mpcall(c, ctx->argv, invert, m, &fw);
}
- if (ctx->xt_t == NULL)
+ if (!ctx->xt_t)
return 0;
- if (ctx->xt_t->x6_parse == NULL && ctx->xt_t->parse == NULL)
+ if (!ctx->xt_t->x6_parse && !ctx->xt_t->parse)
return 0;
if (c < (int) ctx->xt_t->option_offset ||
+ XT_OPTION_OFFSET_SCALE)
return 0;
- xtables_option_tpcall(c, ctx->argv, invert, ctx->xt_t, NULL);
+ xtables_option_tpcall(c, ctx->argv, invert, ctx->xt_t, &fw);
return 0;
}
{
struct xtables_rule_match *rm;
- DBG("xtables version code > 5");
-
- for (rm = ctx->xt_rm; rm != NULL; rm = rm->next)
+ for (rm = ctx->xt_rm; rm; rm = rm->next)
xtables_option_mfcall(rm->match);
- if (ctx->xt_t != NULL)
+ if (ctx->xt_t)
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;
-}
-
-#endif
-
static int parse_rule_spec(struct connman_iptables *table,
struct parse_context *ctx)
{
* xtables_option_mpcall() depending on which version
* of libxtables is found.
*/
- connman_bool_t invert = FALSE;
+ struct xtables_match *xt_m;
+ bool invert = false;
int len, c, err;
- DBG("");
-
ctx->ip = g_try_new0(struct ipt_ip, 1);
- if (ctx->ip == NULL)
+ if (!ctx->ip)
return -ENOMEM;
/*
- * 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_tables_flags();
-
- /*
* Tell getopt_long not to generate error messages for unknown
* options and also reset optind back to 0.
*/
if (len + 1 > IFNAMSIZ)
break;
- strcpy(ctx->ip->iniface, optarg);
+ g_stpcpy(ctx->ip->iniface, optarg);
memset(ctx->ip->iniface_mask, 0xff, len + 1);
if (invert)
if (len + 1 > IFNAMSIZ)
break;
- strcpy(ctx->ip->outiface, optarg);
+ g_stpcpy(ctx->ip->outiface, optarg);
memset(ctx->ip->outiface_mask, 0xff, len + 1);
if (invert)
break;
case 'm':
/* Matches */
- ctx->xt_m = prepare_matches(table, &ctx->xt_rm, optarg);
- if (ctx->xt_m == NULL) {
+ xt_m = prepare_matches(table, &ctx->xt_rm, optarg);
+ if (!xt_m) {
err = -EINVAL;
goto out;
}
+ ctx->xt_m = g_list_append(ctx->xt_m, xt_m);
break;
+ case 'p':
+ ctx->proto = xtables_parse_protocol(optarg);
+ break;
case 'j':
/* Target */
ctx->xt_t = prepare_target(table, optarg);
- if (ctx->xt_t == NULL) {
+ if (!ctx->xt_t) {
err = -EINVAL;
goto out;
}
break;
case 1:
if (optarg[0] == '!' && optarg[1] == '\0') {
- invert = TRUE;
+ invert = true;
/* Remove the '!' from the optarg */
optarg[0] = '\0';
break;
}
- invert = FALSE;
+ invert = false;
}
err = final_check_xt_modules(ctx);
return err;
}
+static void reset_xtables(void)
+{
+ struct xtables_match *xt_m;
+ struct xtables_target *xt_t;
+
+ /*
+ * 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; xt_m = xt_m->next)
+ xt_m->mflags = 0;
+
+ for (xt_t = xtables_targets; xt_t; xt_t = xt_t->next) {
+ xt_t->tflags = 0;
+ xt_t->used = 0;
+ }
+
+ /*
+ * 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;
+}
+
static void cleanup_parse_context(struct parse_context *ctx)
{
+ struct xtables_rule_match *rm, *tmp;
+ GList *list;
+
g_strfreev(ctx->argv);
g_free(ctx->ip);
- if (ctx->xt_t != NULL)
+ if (ctx->xt_t) {
g_free(ctx->xt_t->t);
- if (ctx->xt_m != NULL)
- g_free(ctx->xt_m->m);
+ ctx->xt_t->t = NULL;
+ }
+
+ for (list = ctx->xt_m; list; list = list->next) {
+ struct xtables_match *xt_m = list->data;
+
+ g_free(xt_m->m);
+
+ if (xt_m != xt_m->next)
+ continue;
+
+ g_free(xt_m);
+ }
+ g_list_free(ctx->xt_m);
+
+ for (tmp = NULL, rm = ctx->xt_rm; rm; rm = rm->next) {
+ if (tmp)
+ g_free(tmp);
+ tmp = rm;
+ }
+ g_free(tmp);
+
g_free(ctx);
}
+int __connman_iptables_dump(const char *table_name)
+{
+ struct connman_iptables *table;
+
+ DBG("-t %s -L", table_name);
+
+ table = get_table(table_name);
+ if (!table)
+ return -EINVAL;
+
+ dump_table(table);
+
+ return 0;
+}
+
int __connman_iptables_new_chain(const char *table_name,
const char *chain)
{
DBG("-t %s -N %s", table_name, chain);
- table = pre_load_table(table_name, NULL);
- if (table == NULL)
+ table = get_table(table_name);
+ if (!table)
return -EINVAL;
return iptables_add_chain(table, chain);
DBG("-t %s -X %s", table_name, chain);
- table = pre_load_table(table_name, NULL);
- if (table == NULL)
+ table = get_table(table_name);
+ if (!table)
return -EINVAL;
return iptables_delete_chain(table, chain);
DBG("-t %s -F %s", table_name, chain);
- table = pre_load_table(table_name, NULL);
- if (table == NULL)
+ table = get_table(table_name);
+ if (!table)
return -EINVAL;
return iptables_flush_chain(table, chain);
DBG("-t %s -F %s", table_name, chain);
- table = pre_load_table(table_name, NULL);
- if (table == NULL)
+ table = get_table(table_name);
+ if (!table)
return -EINVAL;
return iptables_change_policy(table, chain, policy);
int err;
ctx = g_try_new0(struct parse_context, 1);
- if (ctx == NULL)
+ if (!ctx)
return -ENOMEM;
DBG("-t %s -A %s %s", table_name, chain, rule_spec);
if (err < 0)
goto out;
- table = pre_load_table(table_name, NULL);
- if (table == NULL) {
+ table = get_table(table_name);
+ if (!table) {
+ err = -EINVAL;
+ goto out;
+ }
+
+ err = parse_rule_spec(table, ctx);
+ if (err < 0)
+ goto out;
+
+ if (!ctx->xt_t)
+ target_name = NULL;
+ else
+ target_name = ctx->xt_t->name;
+
+ err = iptables_append_rule(table, ctx->ip, chain,
+ target_name, ctx->xt_t, ctx->xt_rm);
+out:
+ cleanup_parse_context(ctx);
+ reset_xtables();
+
+ return err;
+}
+
+int __connman_iptables_insert(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;
+
+ ctx = g_try_new0(struct parse_context, 1);
+ if (!ctx)
+ return -ENOMEM;
+
+ DBG("-t %s -I %s %s", table_name, chain, rule_spec);
+
+ err = prepare_getopt_args(rule_spec, ctx);
+ if (err < 0)
+ goto out;
+
+ table = get_table(table_name);
+ if (!table) {
err = -EINVAL;
goto out;
}
if (err < 0)
goto out;
- if (ctx->xt_t == NULL)
+ if (!ctx->xt_t)
target_name = NULL;
else
target_name = ctx->xt_t->name;
target_name, ctx->xt_t, ctx->xt_rm);
out:
cleanup_parse_context(ctx);
+ reset_xtables();
return err;
}
int err;
ctx = g_try_new0(struct parse_context, 1);
- if (ctx == NULL)
+ if (!ctx)
return -ENOMEM;
DBG("-t %s -D %s %s", table_name, chain, rule_spec);
if (err < 0)
goto out;
- table = pre_load_table(table_name, NULL);
- if (table == NULL) {
+ table = get_table(table_name);
+ if (!table) {
err = -EINVAL;
goto out;
}
if (err < 0)
goto out;
- if (ctx->xt_t == NULL)
+ if (!ctx->xt_t)
target_name = NULL;
else
target_name = ctx->xt_t->name;
ctx->xt_rm);
out:
cleanup_parse_context(ctx);
+ reset_xtables();
return err;
}
struct connman_iptables *table;
struct ipt_replace *repl;
int err;
+ struct xt_counters_info *counters;
+ struct connman_iptables_entry *e;
+ GList *list;
+ unsigned int cnt;
DBG("%s", table_name);
table = g_hash_table_lookup(table_hash, table_name);
- if (table == NULL)
+ if (!table)
return -EINVAL;
repl = iptables_blob(table);
+ if(!repl)
+ return -ENOMEM;
- if (debug_enabled == TRUE)
+ if (debug_enabled)
dump_ipt_replace(repl);
err = iptables_replace(table, repl);
- g_free(repl->counters);
- g_free(repl);
+ if (err < 0)
+ goto out_free;
+
+ counters = g_try_malloc0(sizeof(*counters) +
+ sizeof(struct xt_counters) * table->num_entries);
+ if (!counters) {
+ err = -ENOMEM;
+ goto out_hash_remove;
+ }
+ g_stpcpy(counters->name, table->info->name);
+ counters->num_counters = table->num_entries;
+ for (list = table->entries, cnt = 0; list; list = list->next, cnt++) {
+ e = list->data;
+ if (e->counter_idx >= 0)
+ counters->counters[cnt] = repl->counters[e->counter_idx];
+ }
+ err = iptables_add_counters(table, counters);
+ g_free(counters);
if (err < 0)
- return err;
+ goto out_hash_remove;
- g_hash_table_remove(table_hash, table_name);
+ err = 0;
- return 0;
+out_hash_remove:
+ g_hash_table_remove(table_hash, table_name);
+out_free:
+ g_free(repl->counters);
+ g_free(repl);
+ return err;
}
static void remove_table(gpointer user_data)
table_cleanup(table);
}
-static int flush_table_cb(struct ipt_entry *entry, int builtin,
+static int iterate_chains_cb(struct ipt_entry *entry, int builtin,
unsigned int hook, size_t size,
unsigned int offset, void *user_data)
{
- GSList **chains = user_data;
+ struct cb_data *cbd = user_data;
+ connman_iptables_iterate_chains_cb_t cb = cbd->cb;
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);
+ if (!g_strcmp0(target->u.user.name, IPT_ERROR_TARGET))
+ (*cb)((const char *)target->data, cbd->user_data);
else if (builtin >= 0)
- name = g_strdup(hooknames[builtin]);
- else
- return 0;
-
- *chains = g_slist_prepend(*chains, name);
+ (*cb)(hooknames[builtin], cbd->user_data);
return 0;
}
-static void flush_table(const char *name)
+int __connman_iptables_iterate_chains(const char *table_name,
+ connman_iptables_iterate_chains_cb_t cb,
+ void *user_data)
{
- GSList *chains = NULL, *list;
+ struct cb_data *cbd = cb_data_new(cb, user_data);
struct connman_iptables *table;
- table = pre_load_table(name, NULL);
- if (table == NULL)
- return;
+ table = get_table(table_name);
+ if (!table) {
+ g_free(cbd);
+ return -EINVAL;
+ }
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);
+ iterate_chains_cb, cbd);
- for (list = chains; list != NULL; list = list->next) {
- char *chain = list->data;
+ g_free(cbd);
- DBG("chain %s", chain);
- iptables_flush_chain(table, chain);
- }
-
- __connman_iptables_commit(name);
- g_slist_free_full(chains, g_free);
-}
-
-static void flush_all_chains(void)
-{
- flush_table("filter");
- flush_table("mangle");
- flush_table("nat");
+ return 0;
}
int __connman_iptables_init(void)
DBG("");
if (getenv("CONNMAN_IPTABLES_DEBUG"))
- debug_enabled = TRUE;
+ debug_enabled = true;
table_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
- g_free, remove_table);
+ NULL, remove_table);
xtables_init_all(&iptables_globals, NFPROTO_IPV4);
- flush_all_chains();
-
return 0;
}
DBG("");
g_hash_table_destroy(table_hash);
-
- xtables_free_opts(1);
}
projects / platform / upstream / connman.git / blobdiff