From c5eaba9ad9c2948cf6537cf273abdea2e61e5f1c Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Fri, 23 Sep 2011 14:43:35 +0300 Subject: [PATCH] iptables: Added helper function to remove table entry --- src/iptables.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) 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; } -- 2.7.4