X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=9d5802a41df0aeb195af6b9f26286afec83c7093;hp=0b800646b531d613ada3cf47cd81ba40c6e3e5c7;hb=e7ac4074bf497cd19e38adbb49e2b3eb275eeb05;hpb=b7e1b35ff18a759a54e4033d04a3550499dd9fc1

diff --git a/utils.c b/utils.c
index 0b80064..9d5802a 100644
--- a/utils.c
+++ b/utils.c
@@ -1,3 +1,16 @@
+/*
+ * 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"
@@ -9,10 +22,8 @@ avl_strcmp(const void *k1, const void *k2, void *ptr)
 }
 
 void
-__vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
-	     vlist_update_cb update, int offset)
+vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update)
 {
-	tree->key_offset = offset;
 	tree->update = update;
 	tree->version = 1;
 
@@ -28,11 +39,10 @@ vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
 }
 
 void
-vlist_add(struct vlist_tree *tree, struct vlist_node *node)
+vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key)
 {
 	struct vlist_node *old_node = NULL;
 	struct avl_node *anode;
-	void *key = (char *) node + tree->key_offset;
 
 	node->avl.key = key;
 	node->version = tree->version;
@@ -40,8 +50,10 @@ vlist_add(struct vlist_tree *tree, struct vlist_node *node)
 	anode = avl_find(&tree->avl, key);
 	if (anode) {
 		old_node = container_of(anode, struct vlist_node, avl);
-		if (tree->keep_old || tree->no_delete)
+		if (tree->keep_old || tree->no_delete) {
+			old_node->version = tree->version;
 			goto update_only;
+		}
 
 		avl_delete(&tree->avl, anode);
 	}
@@ -58,7 +70,8 @@ vlist_flush(struct vlist_tree *tree)
 	struct vlist_node *node, *tmp;
 
 	avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
-		if (node->version == tree->version)
+		if ((node->version == tree->version || node->version == -1) &&
+		    tree->version != -1)
 			continue;
 
 		vlist_delete(tree, node);
@@ -68,7 +81,7 @@ vlist_flush(struct vlist_tree *tree)
 void
 vlist_flush_all(struct vlist_tree *tree)
 {
-	tree->version++;
+	tree->version = -1;
 	vlist_flush(tree);
 }
 
@@ -97,7 +110,8 @@ vlist_simple_flush(struct vlist_simple_tree *tree)
 	struct vlist_simple_node *n, *tmp;
 
 	list_for_each_entry_safe(n, tmp, &tree->list, list) {
-		if (n->version == tree->version)
+		if ((n->version == tree->version || n->version == -1) &&
+		    tree->version != -1)
 			continue;
 
 		vlist_simple_delete(tree, n);
@@ -105,8 +119,21 @@ vlist_simple_flush(struct vlist_simple_tree *tree)
 }
 
 void
+vlist_simple_replace(struct vlist_simple_tree *dest, struct vlist_simple_tree *old)
+{
+	struct vlist_simple_node *n, *tmp;
+
+	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_simple_flush_all(struct vlist_simple_tree *tree)
 {
-	tree->version++;
+	tree->version = -1;
 	vlist_simple_flush(tree);
 }