utils: fix existing node check when keep_old/no_delete is enabled

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index 09df8c6..8ef968a 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -2,6 +2,7 @@
 #define __NETIFD_UTILS_H
 
 #include <libubox/list.h>
+#include <libubox/avl.h>
 
 #ifdef DEBUG
 #define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
@@ -15,6 +16,42 @@ static inline void no_debug(const char *fmt, ...)
 
 #define __init __attribute__((constructor))
 
+struct vlist_tree;
+struct vlist_node;
+
+typedef void (*vlist_update_cb)(struct vlist_tree *tree,
+                               struct vlist_node *node_new,
+                               struct vlist_node *node_old);
+
+struct vlist_tree {
+       struct avl_tree avl;
+
+       vlist_update_cb update;
+       int key_offset;
+       bool keep_old;
+       bool no_delete;
+
+       int version;
+};
+
+struct vlist_node {
+       struct avl_node avl;
+       int version;
+};
+
+void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
+
+#define vlist_init(tree, cmp, update, type, node, key) \
+       __vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+
+void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
+void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
+void vlist_flush(struct vlist_tree *tree);
+void vlist_flush_all(struct vlist_tree *tree);
+
+#define vlist_for_each_element(tree, element, node_member) \
+       avl_for_each_element(&(tree)->avl, element, node_member.avl)
+
 #ifdef __linux__
 static inline int fls(int x)
 {