/*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2011 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
type *__entry; \
\
for (__i = 0, __n = 0; __i < (size); \
- __i += __entry->next_offset, __n++) { \
+ __i += __entry->next_offset, __n++) { \
__entry = (void *)(entries) + __i; \
if (__n < n) \
continue; \
return -ENOMEM;
}
-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,
+ char *target_name, struct xtables_target *xt_t,
+ char *match_name, struct xtables_match *xt_m)
{
struct ipt_entry *new_entry;
size_t match_size, target_size;
return new_entry;
}
-static int
-connman_iptables_append_rule(struct connman_iptables *table,
+static int connman_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)
return 0;
}
-static struct ipt_replace *
-connman_iptables_blob(struct connman_iptables *table)
+static struct ipt_replace *connman_iptables_blob(struct connman_iptables *table)
{
struct ipt_replace *r;
GList *list;
static struct connman_iptables *connman_iptables_init(const char *table_name)
{
- struct connman_iptables *table;
+ struct connman_iptables *table = NULL;
+ char *module = NULL;
socklen_t s;
+ if (xtables_insmod("ip_tables", NULL, TRUE) != 0)
+ goto err;
+
+ module = g_strconcat("iptable_", table_name, NULL);
+ if (module == NULL)
+ goto err;
+
+ if (xtables_insmod(module, NULL, TRUE) != 0)
+ goto err;
+
+ g_free(module);
+ module = NULL;
+
table = g_try_new0(struct connman_iptables, 1);
if (table == NULL)
return NULL;
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;
table->blob_entries->size,
add_entry, table);
-
return table;
err:
+ g_free(module);
connman_iptables_cleanup(table);
return NULL;
}
+static struct option connman_iptables_opts[] = {
+ {.name = "append", .has_arg = 1, .val = 'A'},
+ {.name = "delete", .has_arg = 1, .val = 'D'},
+ {.name = "flush-chain", .has_arg = 1, .val = 'F'},
+ {.name = "insert", .has_arg = 1, .val = 'I'},
+ {.name = "list", .has_arg = 2, .val = 'L'},
+ {.name = "new-chain", .has_arg = 1, .val = 'N'},
+ {.name = "delete-chain", .has_arg = 1, .val = 'X'},
+ {.name = "destination", .has_arg = 1, .val = 'd'},
+ {.name = "in-interface", .has_arg = 1, .val = 'i'},
+ {.name = "jump", .has_arg = 1, .val = 'j'},
+ {.name = "match", .has_arg = 1, .val = 'm'},
+ {.name = "out-interface", .has_arg = 1, .val = 'o'},
+ {.name = "source", .has_arg = 1, .val = 's'},
+ {.name = "table", .has_arg = 1, .val = 't'},
+ {NULL},
+};
+
+struct xtables_globals connman_iptables_globals = {
+ .option_offset = 0,
+ .opts = connman_iptables_opts,
+ .orig_opts = connman_iptables_opts,
+};
+
static struct xtables_target *prepare_target(struct connman_iptables *table,
char *target_name)
{
xt_t->init(xt_t->t);
}
+ if (xt_t->x6_options != NULL)
+ connman_iptables_globals.opts =
+ xtables_options_xfrm(
+#if XTABLES_VERSION_CODE > 5
+ connman_iptables_globals.orig_opts,
+#endif
+ connman_iptables_globals.opts,
+ xt_t->x6_options,
+ &xt_t->option_offset);
+ else
+ connman_iptables_globals.opts =
+ xtables_merge_options(
+#if XTABLES_VERSION_CODE > 5
+ connman_iptables_globals.orig_opts,
+#endif
+ connman_iptables_globals.opts,
+ xt_t->extra_opts,
+ &xt_t->option_offset);
+
+ if (connman_iptables_globals.opts == NULL) {
+ g_free(xt_t->t);
+ xt_t = NULL;
+ }
+
return xt_t;
}
-static struct option connman_iptables_opts[] = {
- {.name = "append", .has_arg = 1, .val = 'A'},
- {.name = "delete", .has_arg = 1, .val = 'D'},
- {.name = "flush-chain", .has_arg = 1, .val = 'F'},
- {.name = "insert", .has_arg = 1, .val = 'I'},
- {.name = "list", .has_arg = 2, .val = 'L'},
- {.name = "new-chain", .has_arg = 1, .val = 'N'},
- {.name = "delete-chain", .has_arg = 1, .val = 'X'},
- {.name = "destination", .has_arg = 1, .val = 'd'},
- {.name = "in-interface", .has_arg = 1, .val = 'i'},
- {.name = "jump", .has_arg = 1, .val = 'j'},
- {.name = "match", .has_arg = 1, .val = 'm'},
- {.name = "out-interface", .has_arg = 1, .val = 'o'},
- {.name = "source", .has_arg = 1, .val = 's'},
- {.name = "table", .has_arg = 1, .val = 't'},
- {NULL},
-};
+static struct xtables_match *prepare_matches(struct connman_iptables *table,
+ struct xtables_rule_match **xt_rm, char *match_name)
+{
+ struct xtables_match *xt_m;
+ size_t match_size;
-struct xtables_globals connman_iptables_globals = {
- .option_offset = 0,
- .opts = connman_iptables_opts,
- .orig_opts = connman_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) {
+ connman_iptables_globals.opts =
+ xtables_merge_options(
+#if XTABLES_VERSION_CODE > 5
+ connman_iptables_globals.orig_opts,
+#endif
+ connman_iptables_globals.opts,
+ xt_m->extra_opts,
+ &xt_m->option_offset);
+
+ if (connman_iptables_globals.opts == NULL) {
+ g_free(xt_m->m);
+ xt_m = NULL;
+ }
+ }
+
+ return xt_m;
+}
int main(int argc, char *argv[])
{
struct connman_iptables *table;
+ struct xtables_rule_match *xt_rm;
struct xtables_match *xt_m;
struct xtables_target *xt_t;
struct ipt_ip ip;
char *table_name, *chain, *new_chain, *match_name, *target_name;
char *delete_chain, *flush_chain;
int c, in_len, out_len;
- size_t size;
gboolean dump, invert, delete, insert, delete_rule;
struct in_addr src, dst;
delete_chain = flush_chain = NULL;
memset(&ip, 0, sizeof(struct ipt_ip));
table = NULL;
+ xt_rm = NULL;
xt_m = NULL;
xt_t = NULL;
case 'j':
target_name = optarg;
+ xt_t = prepare_target(table, target_name);
+ if (xt_t == NULL)
+ goto out;
+
break;
case 'm':
match_name = optarg;
-
- 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);
+ xt_m = prepare_matches(table, &xt_rm, match_name);
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) {
- connman_iptables_globals.opts =
- xtables_merge_options(
-#if XTABLES_VERSION_CODE > 5
- connman_iptables_globals.orig_opts,
-#endif
- connman_iptables_globals.opts,
- xt_m->extra_opts,
- &xt_m->option_offset);
- if (connman_iptables_globals.opts == NULL)
- goto out;
- }
break;
}
if (chain) {
- xt_t = prepare_target(table, target_name);
- if (xt_t == NULL)
- goto out;
-
- connman_iptables_globals.opts =
- xtables_merge_options(
-#if XTABLES_VERSION_CODE > 5
- connman_iptables_globals.orig_opts,
-#endif
- connman_iptables_globals.opts,
- xt_t->extra_opts,
- &xt_t->option_offset);
- if (connman_iptables_globals.opts == NULL)
- goto out;
-
if (delete_rule == TRUE) {
printf("Deleting %s to %s (match %s)\n", target_name,
chain, match_name);