X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=3a8e557063be53dfd52d591c37fc2134a2f5a778;hp=893d3d3a57fa93f18426c9994b0e1c520ac046ff;hb=486aa750a164d41905beb61afec89268e3eb7f48;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516

diff --git a/utils.h b/utils.h
index 893d3d3..3a8e557 100644
--- a/utils.h
+++ b/utils.h
@@ -14,20 +14,13 @@
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 
+#include <stdio.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)
 {
@@ -39,47 +32,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;
@@ -91,6 +43,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))
 
@@ -98,6 +53,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)
 {
@@ -148,6 +104,16 @@ 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);
+
+uint32_t crc32_file(FILE *fp);
+
+#ifdef __APPLE__
+#define s6_addr32	__u6_addr.__u6_addr32
+#endif
 
 #endif