Improved IPv6 featureset

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index 3918cac..d675a5c 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -1,20 +1,25 @@
+/*
+ * 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/avl-cmp.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
+#include <libubox/vlist.h>
+#include <libubox/utils.h>
 
 static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
 {
@@ -26,47 +31,6 @@ static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
 
 #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;
-       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);
-
-#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 *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);
-
-#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;
@@ -78,6 +42,9 @@ struct vlist_simple_node {
        int version;
 };
 
+#define vlist_for_each_element_safe(tree, element, node_member, ptr) \
+        avl_for_each_element_safe(&(tree)->avl, element, node_member.avl, ptr)
+
 #define vlist_simple_init(tree, node, member) \
        __vlist_simple_init(tree, offsetof(node, member))
 
@@ -85,6 +52,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)
 {
@@ -93,6 +61,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);
 }
 
@@ -134,6 +103,14 @@ static inline int fls(int x)
 }
 #endif
 
-int avl_strcmp(const void *k1, const void *k2, void *ptr);
+unsigned int parse_netmask_string(const char *str, bool v6);
+bool split_netmask(char *str, unsigned int *netmask, bool v6);
+int parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask);
+
+char * format_macaddr(uint8_t *mac);
+
+#ifdef __APPLE__
+#define s6_addr32      __u6_addr.__u6_addr32
+#endif
 
 #endif