From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Tue, 19 Mar 2013 12:46:26 +0000 (+0100)
Subject: iptables: Add __connman_iptables_insert()
X-Git-Tag: 1.13~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c4ddd222b39cb688301ef94f25eae1a1db574d1;p=platform%2Fupstream%2Fconnman.git

iptables: Add __connman_iptables_insert()

This was wrongly removed with commit 161efbae
---

diff --git a/src/connman.h b/src/connman.h
index 9a607fb..8e26304 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -803,6 +803,9 @@ int __connman_iptables_change_policy(const char *table_name,
 int __connman_iptables_append(const char *table_name,
 			const char *chain,
 			const char *rule_spec);
+int __connman_iptables_insert(const char *table_name,
+			const char *chain,
+			const char *rule_spec);
 int __connman_iptables_delete(const char *table_name,
 			const char *chain,
 			const char *rule_spec);
diff --git a/src/iptables.c b/src/iptables.c
index 0273ac7..5183154 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -833,6 +833,37 @@ static int iptables_append_rule(struct connman_iptables *table,
 	return ret;
 }
 
+static int iptables_insert_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_head;
+
+	DBG("table %s chain %s", table->name, chain_name);
+
+	chain_head = find_chain_head(table, chain_name);
+	if (chain_head == NULL)
+		return -EINVAL;
+
+	new_entry = prepare_rule_inclusion(table, ip, chain_name,
+				target_name, xt_t, &builtin, xt_rm, TRUE);
+	if (new_entry == NULL)
+		return -EINVAL;
+
+	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);
+
+	return ret;
+}
+
 static gboolean is_same_ipt_entry(struct ipt_entry *i_e1,
 					struct ipt_entry *i_e2)
 {
@@ -2151,6 +2182,49 @@ out:
 	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 == NULL)
+		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 == 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;
+}
+
 int __connman_iptables_delete(const char *table_name,
 				const char *chain,
 				const char *rule_spec)