X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=ucimap-example.c;h=18c3c1f05397bcb5137530226f817fbe373e1af9;hp=9906592acabff3e4551da001b769497b680fa648;hb=ec8cbbbe0f20e67cbd3bd471b9ac55ceacaef7b8;hpb=96aa070d01e676a6c7f48ff533e219f63da4fd65

diff --git a/ucimap-example.c b/ucimap-example.c
index 9906592..18c3c1f 100644
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -1,6 +1,6 @@
 /*
  * ucimap-example - sample code for the ucimap library
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008-2009 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
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <ucimap.h>
+#include "list.h"
 
 struct list_head ifs;
 
@@ -27,7 +28,7 @@ struct uci_network {
 	const char *name;
 	const char *proto;
 	const char *ifname;
-	unsigned char ipaddr[4];
+	unsigned char *ipaddr;
 	int test;
 	bool enabled;
 	struct ucimap_list *aliases;
@@ -44,13 +45,18 @@ struct uci_alias {
 static int
 network_parse_ip(void *section, struct uci_optmap *om, union ucimap_data *data, const char *str)
 {
-	unsigned char *target = (unsigned char *) data->s;
+	unsigned char *target;
 	int tmp[4];
 	int i;
 
 	if (sscanf(str, "%d.%d.%d.%d", &tmp[0], &tmp[1], &tmp[2], &tmp[3]) != 4)
 		return -1;
 
+	target = malloc(4);
+	if (!target)
+		return -1;
+
+	data->ptr = target;
 	for (i = 0; i < 4; i++)
 		target[i] = (char) tmp[i];
 
@@ -58,17 +64,27 @@ network_parse_ip(void *section, struct uci_optmap *om, union ucimap_data *data,
 }
 
 static int
-network_format_ip(void *sction, struct uci_optmap *om, union ucimap_data *data, char **str)
+network_format_ip(void *section, struct uci_optmap *om, union ucimap_data *data, char **str)
 {
 	static char buf[16];
-	unsigned char *ip = (unsigned char *) data->s;
+	unsigned char *ip = (unsigned char *) data->ptr;
 
-	sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
-	*str = buf;
+	if (ip) {
+		sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+		*str = buf;
+	} else {
+		*str = NULL;
+	}
 
 	return 0;
 }
 
+static void
+network_free_ip(void *section, struct uci_optmap *om, void *ptr)
+{
+	free(ptr);
+}
+
 static int
 network_init_interface(struct uci_map *map, void *section, struct uci_section *s)
 {
@@ -96,7 +112,7 @@ network_add_interface(struct uci_map *map, void *section)
 {
 	struct uci_network *net = section;
 
-	list_add(&net->list, &ifs);
+	list_add_tail(&net->list, &ifs);
 
 	return 0;
 }
@@ -107,7 +123,7 @@ network_add_alias(struct uci_map *map, void *section)
 	struct uci_alias *a = section;
 
 	if (a->interface)
-		list_add(&a->list, &a->interface->alias);
+		list_add_tail(&a->list, &a->interface->alias);
 
 	return 0;
 }
@@ -116,6 +132,8 @@ static struct ucimap_section_data *
 network_allocate(struct uci_map *map, struct uci_sectionmap *sm, struct uci_section *s)
 {
 	struct uci_network *p = malloc(sizeof(struct uci_network));
+	if (!p)
+		return NULL;
 	memset(p, 0, sizeof(struct uci_network));
 	return &p->map;
 }
@@ -151,6 +169,7 @@ static struct my_optmap network_interface_options[] = {
 			.name = "ipaddr",
 			.parse = network_parse_ip,
 			.format = network_format_ip,
+			.free = network_free_ip,
 		}
 	},
 	{
@@ -222,19 +241,34 @@ int main(int argc, char **argv)
 	struct list_head *p;
 	struct uci_network *net;
 	struct uci_alias *alias;
+	bool set = false;
 	int i;
 
 	INIT_LIST_HEAD(&ifs);
 	ctx = uci_alloc_context();
+	if (!ctx)
+		return -1;
 	ucimap_init(&network_map);
 
+	if ((argc >= 2) && !strcmp(argv[1], "-s")) {
+		uci_set_savedir(ctx, "./test/save");
+		set = true;
+	}
+
 	uci_set_confdir(ctx, "./test/config");
 	uci_load(ctx, "network", &pkg);
 
 	ucimap_parse(&network_map, pkg);
 
 	list_for_each(p, &ifs) {
+		const unsigned char *ipaddr;
+		int n_aliases = 0;
+
 		net = list_entry(p, struct uci_network, list);
+		ipaddr = net->ipaddr;
+		if (!ipaddr)
+			ipaddr = (const unsigned char *) "\x00\x00\x00\x00";
+
 		printf("New network section '%s'\n"
 			"	type: %s\n"
 			"	ifname: %s\n"
@@ -244,21 +278,40 @@ int main(int argc, char **argv)
 			net->name,
 			net->proto,
 			net->ifname,
-			net->ipaddr[0],	net->ipaddr[1],
-			net->ipaddr[2],	net->ipaddr[3],
+			ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3],
 			net->test,
 			(net->enabled ? "on" : "off"));
 
-		for (i = 0; i < net->aliases->n_items; i++) {
-			alias = net->aliases->item[i].ptr;
+		if (net->aliases->n_items > 0) {
+			printf("Configured aliases:");
+			for (i = 0; i < net->aliases->n_items; i++) {
+				alias = net->aliases->item[i].ptr;
+				printf(" %s", alias->name);
+			}
+			printf("\n");
+		}
+		list_for_each_entry(alias, &net->alias, list) {
+			n_aliases++;
+			for (i = 0; i < net->aliases->n_items; i++) {
+				if (alias == net->aliases->item[i].ptr)
+					goto next_alias;
+			}
 			printf("New alias: %s\n", alias->name);
+next_alias:
+			continue;
+		}
+		if (set && !strcmp(net->name, "lan")) {
+			ucimap_free_item(&net->map, &net->ipaddr);
+			ucimap_set_changed(&net->map, &net->ipaddr);
+			ucimap_resize_list(&net->map, &net->aliases, n_aliases);
+			net->aliases->n_items = 0;
+			list_for_each_entry(alias, &net->alias, list) {
+				net->aliases->item[net->aliases->n_items++].ptr = alias;
+			}
+			ucimap_set_changed(&net->map, &net->aliases);
+			ucimap_store_section(&network_map, pkg, &net->map);
+			uci_save(ctx, pkg);
 		}
-#if 0
-		memcpy(net->ipaddr, "\x01\x03\x04\x05", 4);
-		ucimap_set_changed(&net->map, &net->ipaddr);
-		ucimap_store_section(&network_map, pkg, &net->map);
-		uci_save(ctx, pkg);
-#endif
 	}