projects
/
framework
/
connectivity
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
006cef4
)
tools: Added helper function to remove table entry in iptables-test
author
Tomasz Bursztyka
<tomasz.bursztyka@linux.intel.com>
Thu, 22 Sep 2011 12:39:20 +0000
(15:39 +0300)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Thu, 22 Sep 2011 13:22:46 +0000
(15:22 +0200)
tools/iptables-test.c
patch
|
blob
|
history
diff --git
a/tools/iptables-test.c
b/tools/iptables-test.c
index
555aa2a
..
5e7c866
100644
(file)
--- a/
tools/iptables-test.c
+++ b/
tools/iptables-test.c
@@
-327,6
+327,22
@@
static int connman_add_entry(struct connman_iptables *table,
return 0;
}
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 connman_iptables_flush_chain(struct connman_iptables *table,
char *name)
{
static int connman_iptables_flush_chain(struct connman_iptables *table,
char *name)
{
@@
-357,11
+373,7
@@
static int connman_iptables_flush_chain(struct connman_iptables *table,
entry = list->data;
next = g_list_next(list);
entry = list->data;
next = g_list_next(list);
- table->num_entries--;
- table->size -= entry->entry->next_offset;
- removed += entry->entry->next_offset;
-
- table->entries = g_list_remove(table->entries, list->data);
+ removed += remove_table_entry(table, entry);
list = next;
}
list = next;
}