From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Date: Fri, 23 Sep 2011 11:43:35 +0000 (+0300)
Subject: iptables: Added helper function to remove table entry
X-Git-Tag: 2.0_alpha~1072
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5eaba9ad9c2948cf6537cf273abdea2e61e5f1c;p=framework%2Fconnectivity%2Fconnman.git

iptables: Added helper function to remove table entry
---

diff --git a/src/iptables.c b/src/iptables.c
index 45c71cd..fec4fb8 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -335,6 +335,22 @@ static int iptables_add_entry(struct connman_iptables *table,
 	return 0;
 }
 
+static int remove_table_entry(struct connman_iptables *table,
+				struct connman_iptables_entry *entry)
+{
+	int removed = 0;
+
+	table->num_entries--;
+	table->size -= entry->entry->next_offset;
+	removed = entry->entry->next_offset;
+
+	g_free(entry->entry);
+
+	table->entries = g_list_remove(table->entries, entry);
+
+	return removed;
+}
+
 static int iptables_flush_chain(struct connman_iptables *table,
 						char *name)
 {
@@ -365,13 +381,7 @@ static int iptables_flush_chain(struct connman_iptables *table,
 		entry = list->data;
 		next = g_list_next(list);
 
-		table->num_entries--;
-		table->size -= entry->entry->next_offset;
-		removed += entry->entry->next_offset;
-
-		g_free(entry->entry);
-
-		table->entries = g_list_remove(table->entries, list->data);
+		removed += remove_table_entry(table, entry);
 
 		list = next;
 	}