X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=2866280b6173e9135b11318594049cb1c0f75fe5;hp=ab739300791a8d6bd6ec4de96e5edcfb342ff6d7;hb=f365db4c75b7e824eb785be487b0afc18a45ef7f;hpb=98565127c60cba3d5b747bb9eb698e06d187f45b

diff --git a/utils.h b/utils.h
index ab73930..2866280 100644
--- a/utils.h
+++ b/utils.h
@@ -3,15 +3,14 @@
 
 #include <libubox/list.h>
 #include <libubox/avl.h>
+#include <libubox/blobmsg.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
-#else
-#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__)
-#endif
-
-static inline void no_debug(const char *fmt, ...)
+static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
 {
+	if (!attr)
+		return val;
+
+	return blobmsg_get_bool(attr);
 }
 
 #define __init __attribute__((constructor))
@@ -27,8 +26,9 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-	int node_offset;
+	int key_offset;
 	bool keep_old;
+	bool no_delete;
 
 	int version;
 };
@@ -40,14 +40,62 @@ struct vlist_node {
 
 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) \
-	__vlist_init(tree, cmp, update, offsetof(type, node))
+#define vlist_init(tree, cmp, update, type, node, key) \
+	__vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+
+#define vlist_find(tree, name, element, node_member) \
+	avl_find_element(&(tree)->avl, name, element, node_member.avl)
+
+static inline void vlist_update(struct vlist_tree *tree)
+{
+	tree->version++;
+}
 
 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)
+
+
+struct vlist_simple_tree {
+	struct list_head list;
+	int head_offset;
+	int version;
+};
+
+struct vlist_simple_node {
+	struct list_head list;
+	int version;
+};
+
+#define vlist_simple_init(tree, node, member) \
+	__vlist_simple_init(tree, offsetof(node, member))
+
+void __vlist_simple_init(struct vlist_simple_tree *tree, int offset);
+void vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node);
+void vlist_simple_flush(struct vlist_simple_tree *tree);
+void vlist_simple_flush_all(struct vlist_simple_tree *tree);
+
+static inline void vlist_simple_update(struct vlist_simple_tree *tree)
+{
+	tree->version++;
+}
+
+static inline void vlist_simple_add(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
+{
+	list_add(&node->list, &tree->list);
+}
+
+#define vlist_simple_for_each_element(tree, element, node_member) \
+	list_for_each_entry(element, &(tree)->list, node_member.list)
+
+#define vlist_simple_empty(tree) \
+	list_empty(&(tree)->list)
+
+
 #ifdef __linux__
 static inline int fls(int x)
 {