X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=986cee96e147f062f24bb03a527716d71b57d8c3;hp=f1143c500585a7a76dc6e35c0ef9ceceb9c3d631;hb=6094417533d97662f693d134ab04595a292de30c;hpb=b0b11b2295fbb8399949139d82156e123e005902

diff --git a/utils.c b/utils.c
index f1143c5..986cee9 100644
--- a/utils.c
+++ b/utils.c
@@ -15,76 +15,8 @@
 #include <stdlib.h>
 #include "utils.h"
 
-int
-avl_strcmp(const void *k1, const void *k2, void *ptr)
-{
-	return strcmp(k1, k2);
-}
-
-void
-vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update)
-{
-	tree->update = update;
-	tree->version = 1;
-
-	avl_init(&tree->avl, cmp, 0, tree);
-}
-
-void
-vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
-{
-	if (!tree->no_delete)
-		avl_delete(&tree->avl, &node->avl);
-	tree->update(tree, NULL, node);
-}
-
-void
-vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key)
-{
-	struct vlist_node *old_node = NULL;
-	struct avl_node *anode;
-
-	node->avl.key = key;
-	node->version = tree->version;
-
-	anode = avl_find(&tree->avl, key);
-	if (anode) {
-		old_node = container_of(anode, struct vlist_node, avl);
-		if (tree->keep_old || tree->no_delete) {
-			old_node->version = tree->version;
-			goto update_only;
-		}
-
-		avl_delete(&tree->avl, anode);
-	}
-
-	avl_insert(&tree->avl, &node->avl);
-
-update_only:
-	tree->update(tree, node, old_node);
-}
-
-void
-vlist_flush(struct vlist_tree *tree)
-{
-	struct vlist_node *node, *tmp;
-
-	avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
-		if ((node->version == tree->version || node->version == -1) &&
-		    tree->version != -1)
-			continue;
-
-		vlist_delete(tree, node);
-	}
-}
-
-void
-vlist_flush_all(struct vlist_tree *tree)
-{
-	tree->version = -1;
-	vlist_flush(tree);
-}
-
+#include <arpa/inet.h>
+#include <netinet/in.h>
 
 void
 __vlist_simple_init(struct vlist_simple_tree *tree, int offset)
@@ -123,10 +55,12 @@ vlist_simple_replace(struct vlist_simple_tree *dest, struct vlist_simple_tree *o
 {
 	struct vlist_simple_node *n, *tmp;
 
+	vlist_simple_update(dest);
 	list_for_each_entry_safe(n, tmp, &old->list, list) {
 		list_del(&n->list);
 		vlist_simple_add(dest, n);
 	}
+	vlist_simple_flush(dest);
 }
 
 void
@@ -135,3 +69,63 @@ vlist_simple_flush_all(struct vlist_simple_tree *tree)
 	tree->version = -1;
 	vlist_simple_flush(tree);
 }
+
+unsigned int
+parse_netmask_string(const char *str, bool v6)
+{
+	struct in_addr addr;
+	unsigned int ret;
+	char *err = NULL;
+
+	if (!strchr(str, '.')) {
+		ret = strtoul(str, &err, 0);
+		if (err && *err)
+			goto error;
+
+		return ret;
+	}
+
+	if (v6)
+		goto error;
+
+	if (inet_aton(str, &addr) != 1)
+		goto error;
+
+	return 32 - fls(~(ntohl(addr.s_addr)));
+
+error:
+	return ~0;
+}
+
+bool
+split_netmask(char *str, unsigned int *netmask, bool v6)
+{
+	char *delim = strchr(str, '/');
+
+	if (delim) {
+		*(delim++) = 0;
+
+		*netmask = parse_netmask_string(delim, v6);
+	}
+	return true;
+}
+
+int
+parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
+{
+	char *astr = alloca(strlen(str) + 1);
+
+	strcpy(astr, str);
+	if (!split_netmask(astr, netmask, af == AF_INET6))
+		return 0;
+
+	if (af == AF_INET6) {
+		if (*netmask > 128)
+			return 0;
+	} else {
+		if (*netmask > 32)
+			return 0;
+	}
+
+	return inet_pton(af, astr, addr);
+}