X-Git-Url: http://git.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=ucimap-example.c;h=157c32f583020ff361ec25200f10c1ce222fa098;hp=0ad31d6a6ba74fa3a50aa8f29839a0c377b6bee0;hb=034d6a865d55fbdab0d53f8f47ca0ce706b8e69a;hpb=8ae8a7fc893e18676d6a35193f8a74c87ceb7b7f

diff --git a/ucimap-example.c b/ucimap-example.c
index 0ad31d6..157c32f 100644
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -20,6 +20,7 @@
 struct list_head ifs;
 
 struct uci_network {
+	struct ucimap_section_data map;
 	struct list_head list;
 	struct list_head alias;
 
@@ -33,6 +34,7 @@ struct uci_network {
 };
 
 struct uci_alias {
+	struct ucimap_section_data map;
 	struct list_head list;
 
 	const char *name;
@@ -42,9 +44,8 @@ struct uci_alias {
 static int
 network_parse_ip(void *section, struct uci_optmap *om, union ucimap_data *data, const char *str)
 {
-	struct uci_network *net = section;
-	unsigned char *target = data->s;
-	unsigned int tmp[4];
+	unsigned char *target = (unsigned char *) data->s;
+	int tmp[4];
 	int i;
 
 	if (sscanf(str, "%d.%d.%d.%d", &tmp[0], &tmp[1], &tmp[2], &tmp[3]) != 4)
@@ -56,6 +57,18 @@ network_parse_ip(void *section, struct uci_optmap *om, union ucimap_data *data,
 	return 0;
 }
 
+static int
+network_format_ip(void *sction, struct uci_optmap *om, union ucimap_data *data, char **str)
+{
+	static char buf[16];
+	unsigned char *ip = (unsigned char *) data->s;
+
+	sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+	*str = buf;
+
+	return 0;
+}
+
 static int
 network_init_interface(struct uci_map *map, void *section, struct uci_section *s)
 {
@@ -99,13 +112,21 @@ network_add_alias(struct uci_map *map, void *section)
 	return 0;
 }
 
+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));
+	memset(p, 0, sizeof(struct uci_network));
+	return &p->map;
+}
+
 struct my_optmap {
 	struct uci_optmap map;
 	int test;
 };
 
-static struct uci_sectmap network_interface;
-static struct uci_sectmap network_alias;
+static struct uci_sectionmap network_interface;
+static struct uci_sectionmap network_alias;
 
 static struct my_optmap network_interface_options[] = {
 	{
@@ -129,6 +150,7 @@ static struct my_optmap network_interface_options[] = {
 			.type = UCIMAP_CUSTOM,
 			.name = "ipaddr",
 			.parse = network_parse_ip,
+			.format = network_format_ip,
 		}
 	},
 	{
@@ -154,9 +176,10 @@ static struct my_optmap network_interface_options[] = {
 	}
 };
 
-static struct uci_sectmap network_interface = {
+static struct uci_sectionmap network_interface = {
+	UCIMAP_SECTION(struct uci_network, map),
 	.type = "interface",
-	.alloc_len = sizeof(struct uci_network),
+	.alloc = network_allocate,
 	.init = network_init_interface,
 	.add = network_add_interface,
 	.options = &network_interface_options[0].map,
@@ -172,16 +195,16 @@ static struct uci_optmap network_alias_options[] = {
 	}
 };
 
-static struct uci_sectmap network_alias = {
+static struct uci_sectionmap network_alias = {
+	UCIMAP_SECTION(struct uci_alias, map),
 	.type = "alias",
 	.options = network_alias_options,
-	.alloc_len = sizeof(struct uci_network),
 	.init = network_init_alias,
 	.add = network_add_alias,
 	.n_options = ARRAY_SIZE(network_alias_options),
 };
 
-static struct uci_sectmap *network_smap[] = {
+static struct uci_sectionmap *network_smap[] = {
 	&network_interface,
 	&network_alias,
 };
@@ -196,7 +219,7 @@ int main(int argc, char **argv)
 {
 	struct uci_context *ctx;
 	struct uci_package *pkg;
-	struct list_head *p, *p2;
+	struct list_head *p;
 	struct uci_network *net;
 	struct uci_alias *alias;
 	int i;
@@ -205,6 +228,7 @@ int main(int argc, char **argv)
 	ctx = uci_alloc_context();
 	ucimap_init(&network_map);
 
+	uci_set_confdir(ctx, "./test/config");
 	uci_load(ctx, "network", &pkg);
 
 	ucimap_parse(&network_map, pkg);
@@ -230,15 +254,14 @@ int main(int argc, char **argv)
 			printf("New alias: %s\n", alias->name);
 		}
 #if 0
-		net->ipaddr = "2.3.4.5";
-		ucimap_set_changed(net, &net->ipaddr);
-		ucimap_store_section(&network_map, pkg, net);
+		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
 	}
 
 
-done:
 	ucimap_cleanup(&network_map);
 	uci_free_context(ctx);