bridge: fix stray semicolon, fixes a bug in bridge primary port reset

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index 319e530..b0a7d02 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -14,22 +14,14 @@
 #ifndef __NETIFD_UTILS_H
 #define __NETIFD_UTILS_H
 
+#include <unistd.h>
+#include <stdio.h>
 #include <libubox/list.h>
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/blobmsg.h>
 #include <libubox/vlist.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/utils.h>
 
 static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
 {
@@ -52,6 +44,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))
 
@@ -69,7 +64,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);
+       list_add_tail(&node->list, &tree->list);
 }
 
 #define vlist_simple_for_each_element(tree, element, node_member) \
@@ -110,4 +105,17 @@ static inline int fls(int x)
 }
 #endif
 
+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);
+bool check_pid_path(int pid, const char *exe);
+
+char * format_macaddr(uint8_t *mac);
+
+uint32_t crc32_file(FILE *fp);
+
+#ifdef __APPLE__
+#define s6_addr32      __u6_addr.__u6_addr32
+#endif
+
 #endif