Move IP address parsing functions to utils.

[project/netifd.git] / utils.h

diff --git a/utils.h b/utils.h
index c8101e7..ec22313 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -1,51 +1,83 @@
+/*
+ * 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>
+#include <libubox/vlist.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
+#ifndef __OPTIMIZE__
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 #else
-#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__)
+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 void no_debug(const char *fmt, ...)
+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))
 
-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;
-       int node_offset;
-
+struct vlist_simple_tree {
+       struct list_head list;
+       int head_offset;
        int version;
 };
 
-struct vlist_node {
-       struct avl_node avl;
+struct vlist_simple_node {
+       struct list_head list;
        int version;
 };
 
-void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
+#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_init(tree, cmp, update, type, node) \
-       __vlist_init(tree, cmp, update, offsetof(type, node))
+#define vlist_simple_empty(tree) \
+       list_empty(&(tree)->list)
 
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
-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);
 
 #ifdef __linux__
 static inline int fls(int x)
@@ -78,6 +110,8 @@ 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);
 
 #endif