move dns server/search list parsing to interface core to support peerdns=0 + static...

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index 2866280..5b6c5e7 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -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.
+ */
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 
@@ -5,6 +18,17 @@
 #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)
@@ -26,7 +50,6 @@ struct vlist_tree {
        struct avl_tree avl;
 
        vlist_update_cb update;
-       int key_offset;
        bool keep_old;
        bool no_delete;
 
@@ -38,10 +61,7 @@ struct vlist_node {
        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_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
 
 #define vlist_find(tree, name, element, node_member) \
        avl_find_element(&(tree)->avl, name, element, node_member.avl)
@@ -51,7 +71,7 @@ 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);
@@ -78,6 +98,7 @@ 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)
 {
@@ -86,6 +107,7 @@ static inline void vlist_simple_update(struct vlist_simple_tree *tree)
 
 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);
 }