X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=utils.h;h=5b6c5e7960422daf4050382d93203f0f98d0d845;hb=e383571250615faf1d251b08c8b2f92e970d6f85;hp=6500fdf80297b50841c06fc9e28c3e63c2c7e3dc;hpb=05c1f3b0c2058a579ca1a6e2b06329b8c814e5bd;p=project%2Fnetifd.git

diff --git a/utils.h b/utils.h
index 6500fdf..5b6c5e7 100644
--- a/utils.h
+++ b/utils.h
@@ -1,8 +1,41 @@
+/*
+ * 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.
+ */
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 
 #include <libubox/list.h>
 #include <libubox/avl.h>
+#include <libubox/blobmsg.h>
+
+#ifndef __OPTIMIZE__
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#else
+extern int __build_bug_on_failed;
+#define BUILD_BUG_ON(condition)				 \
+	do {							\
+		((void)sizeof(char[1 - 2*!!(condition)]));  \
+		if (condition) __build_bug_on_failed = 1;   \
+	} while(0)
+#endif
+
+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))
 
@@ -17,7 +50,6 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-	int key_offset;
 	bool keep_old;
 	bool no_delete;
 
@@ -29,17 +61,17 @@ struct vlist_node {
 	int version;
 };
 
-void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
+void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
 
-#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_add(struct vlist_tree *tree, struct vlist_node *node, void *key);
 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);
@@ -47,6 +79,45 @@ 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);
+void vlist_simple_replace(struct vlist_simple_tree *dest, struct vlist_simple_tree *old);
+
+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)
+{
+	node->version = tree->version;
+	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)
 {