ucimap: implement format callback for custom data types

[project/uci.git] / ucimap-example.c

diff --git a/ucimap-example.c b/ucimap-example.c
index 0ad31d6a6ba74fa3a50aa8f29839a0c377b6bee0..baea5500b9791b9de684382991939c97d9c6017c 100644 (file)
--- 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;
@@ -43,7 +45,7 @@ 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 char *target = (unsigned char *) data->s;
        unsigned int tmp[4];
        int i;
 
@@ -56,6 +58,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 +113,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 +151,7 @@ static struct my_optmap network_interface_options[] = {
                        .type = UCIMAP_CUSTOM,
                        .name = "ipaddr",
                        .parse = network_parse_ip,
+                       .format = network_format_ip,
                }
        },
        {
@@ -154,9 +177,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 +196,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,
 };
@@ -230,9 +254,9 @@ 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
        }