interface: clean up after hotplug interfaces are removed

[project/netifd.git] / utils.c

diff --git a/utils.c b/utils.c
index a67a8c9..65109d7 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -1,71 +1,68 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * 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 published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
+#include <stdlib.h>
 #include "utils.h"
 
-int
-avl_strcmp(const void *k1, const void *k2, void *ptr)
-{
-       return strcmp(k1, k2);
-}
-
 void
-__vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
-            vlist_update_cb update, int offset)
+__vlist_simple_init(struct vlist_simple_tree *tree, int offset)
 {
-       tree->node_offset = offset;
-       tree->update = update;
+       INIT_LIST_HEAD(&tree->list);
        tree->version = 1;
-
-       avl_init(&tree->avl, cmp, 0, tree);
+       tree->head_offset = offset;
 }
 
 void
-vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
+vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
 {
-       avl_delete(&tree->avl, &node->avl);
-       tree->update(tree, NULL, node);
+       char *ptr;
+
+       list_del(&node->list);
+       ptr = (char *) node - tree->head_offset;
+       free(ptr);
 }
 
 void
-vlist_add(struct vlist_tree *tree, struct vlist_node *node)
+vlist_simple_flush(struct vlist_simple_tree *tree)
 {
-       struct vlist_node *old_node = NULL;
-       struct avl_node *anode;
-       void *key = (char *) node - tree->node_offset;
-
-       node->avl.key = key;
-       node->version = tree->version;
+       struct vlist_simple_node *n, *tmp;
 
-       anode = avl_find(&tree->avl, key);
-       if (anode) {
-               if (tree->keep_old)
-                       goto update_only;
+       list_for_each_entry_safe(n, tmp, &tree->list, list) {
+               if ((n->version == tree->version || n->version == -1) &&
+                   tree->version != -1)
+                       continue;
 
-               old_node = container_of(anode, struct vlist_node, avl);
-               avl_delete(&tree->avl, anode);
+               vlist_simple_delete(tree, n);
        }
-
-       avl_insert(&tree->avl, &node->avl);
-
-update_only:
-       tree->update(tree, node, old_node);
 }
 
 void
-vlist_flush(struct vlist_tree *tree)
+vlist_simple_replace(struct vlist_simple_tree *dest, struct vlist_simple_tree *old)
 {
-       struct vlist_node *node, *tmp;
-
-       avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
-               if (node->version == tree->version)
-                       continue;
+       struct vlist_simple_node *n, *tmp;
 
-               vlist_delete(tree, node);
+       vlist_simple_update(dest);
+       list_for_each_entry_safe(n, tmp, &old->list, list) {
+               list_del(&n->list);
+               vlist_simple_add(dest, n);
        }
+       vlist_simple_flush(dest);
 }
 
 void
-vlist_flush_all(struct vlist_tree *tree)
+vlist_simple_flush_all(struct vlist_simple_tree *tree)
 {
-       tree->version++;
-       vlist_flush(tree);
+       tree->version = -1;
+       vlist_simple_flush(tree);
 }