X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=521954639ee7b87b8a32ad6e95892c39401923d1;hp=15f0525941b9b31792dc3a467f720cea7e1f9df2;hb=986c4a1434cc61d2de560690ecc0d532a157d40a;hpb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18

diff --git a/utils.c b/utils.c
index 15f0525..5219546 100644
--- a/utils.c
+++ b/utils.c
@@ -7,28 +7,22 @@ avl_strcmp(const void *k1, const void *k2, void *ptr)
 	return strcmp(k1, k2);
 }
 
-static int
-vlist_cmp(const void *k1, const void *k2, void *ptr)
-{
-	struct vlist_tree *vl = ptr;
-	return memcmp(k1, k2, vl->data_len);
-}
-
 void
-__vlist_init(struct vlist_tree *tree, vlist_update_cb update, int offset, int len)
+__vlist_init(struct vlist_tree *tree, avl_tree_comp cmp,
+	     vlist_update_cb update, int offset)
 {
-	tree->data_offset = offset;
-	tree->data_len = len;
+	tree->key_offset = offset;
 	tree->update = update;
 	tree->version = 1;
 
-	avl_init(&tree->avl, vlist_cmp, 0, tree);
+	avl_init(&tree->avl, cmp, 0, tree);
 }
 
 void
 vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
 {
-	avl_delete(&tree->avl, &node->avl);
+	if (!tree->no_delete)
+		avl_delete(&tree->avl, &node->avl);
 	tree->update(tree, NULL, node);
 }
 
@@ -37,17 +31,23 @@ vlist_add(struct vlist_tree *tree, struct vlist_node *node)
 {
 	struct vlist_node *old_node = NULL;
 	struct avl_node *anode;
+	void *key = (char *) node + tree->key_offset;
 
-	node->avl.key = (char *) node + tree->data_offset;
+	node->avl.key = key;
 	node->version = tree->version;
 
-	anode = avl_find(&tree->avl, (char *) node + tree->data_offset);
+	anode = avl_find(&tree->avl, key);
 	if (anode) {
 		old_node = container_of(anode, struct vlist_node, avl);
+		if (tree->keep_old || !tree->no_delete)
+			goto update_only;
+
 		avl_delete(&tree->avl, anode);
 	}
 
 	avl_insert(&tree->avl, &node->avl);
+
+update_only:
 	tree->update(tree, node, old_node);
 }