ucimap: rename uci_sectmap* to uci_sectionmap*

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

diff --git a/ucimap-example.c b/ucimap-example.c
index 6a91f0a..d401624 100644 (file)
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -26,7 +26,7 @@ struct uci_network {
        const char *name;
        const char *proto;
        const char *ifname;
-       const char *ipaddr;
+       unsigned char ipaddr[4];
        int test;
        bool enabled;
        struct ucimap_list *aliases;
@@ -40,6 +40,23 @@ 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];
+       int i;
+
+       if (sscanf(str, "%d.%d.%d.%d", &tmp[0], &tmp[1], &tmp[2], &tmp[3]) != 4)
+               return -1;
+
+       for (i = 0; i < 4; i++)
+               target[i] = (char) tmp[i];
+
+       return 0;
+}
+
+static int
 network_init_interface(struct uci_map *map, void *section, struct uci_section *s)
 {
        struct uci_network *net = section;
@@ -82,41 +99,89 @@ network_add_alias(struct uci_map *map, void *section)
        return 0;
 }
 
-static struct uci_sectmap network_interface;
-static struct uci_sectmap network_alias;
+struct my_optmap {
+       struct uci_optmap map;
+       int test;
+};
+
+static struct uci_sectionmap network_interface;
+static struct uci_sectionmap network_alias;
 
-static struct uci_optmap network_interface_options[] = {
-       OPTMAP_OPTION(UCIMAP_STRING, struct uci_network, proto, .data.s.maxlen = 32),
-       OPTMAP_OPTION(UCIMAP_STRING, struct uci_network, ifname),
-       OPTMAP_OPTION(UCIMAP_STRING, struct uci_network, ipaddr),
-       OPTMAP_OPTION(UCIMAP_BOOL, struct uci_network, enabled),
-       OPTMAP_OPTION(UCIMAP_INT, struct uci_network, test),
-       OPTMAP_OPTION(UCIMAP_LIST | UCIMAP_SECTION, struct uci_network, aliases, .data.sm = &network_alias),
+static struct my_optmap network_interface_options[] = {
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, proto),
+                       .type = UCIMAP_STRING,
+                       .name = "proto",
+                       .data.s.maxlen = 32,
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, ifname),
+                       .type = UCIMAP_STRING,
+                       .name = "ifname"
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, ipaddr),
+                       .type = UCIMAP_CUSTOM,
+                       .name = "ipaddr",
+                       .parse = network_parse_ip,
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, enabled),
+                       .type = UCIMAP_BOOL,
+                       .name = "enabled",
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, test),
+                       .type = UCIMAP_INT,
+                       .name = "test"
+               }
+       },
+       {
+               .map = {
+                       UCIMAP_OPTION(struct uci_network, aliases),
+                       .type = UCIMAP_LIST | UCIMAP_SECTION,
+                       .data.sm = &network_alias
+               }
+       }
 };
 
-static struct uci_sectmap network_interface = {
+static struct uci_sectionmap network_interface = {
        .type = "interface",
-       .options = network_interface_options,
        .alloc_len = sizeof(struct uci_network),
-       .init_section = network_init_interface,
-       .add_section = network_add_interface,
+       .init = network_init_interface,
+       .add = network_add_interface,
+       .options = &network_interface_options[0].map,
        .n_options = ARRAY_SIZE(network_interface_options),
+       .options_size = sizeof(struct my_optmap)
 };
 
 static struct uci_optmap network_alias_options[] = {
-       OPTMAP_OPTION(UCIMAP_SECTION, struct uci_alias, interface, .data.sm = &network_interface),
+       {
+               UCIMAP_OPTION(struct uci_alias, interface),
+               .type = UCIMAP_SECTION,
+               .data.sm = &network_interface
+       }
 };
 
-static struct uci_sectmap network_alias = {
+static struct uci_sectionmap network_alias = {
        .type = "alias",
        .options = network_alias_options,
        .alloc_len = sizeof(struct uci_network),
-       .init_section = network_init_alias,
-       .add_section = network_add_alias,
+       .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,
 };
@@ -149,13 +214,14 @@ int main(int argc, char **argv)
                printf("New network section '%s'\n"
                        "       type: %s\n"
                        "       ifname: %s\n"
-                       "       ipaddr: %s\n"
+                       "       ipaddr: %d.%d.%d.%d\n"
                        "       test: %d\n"
                        "       enabled: %s\n",
                        net->name,
                        net->proto,
                        net->ifname,
-                       net->ipaddr,
+                       net->ipaddr[0], net->ipaddr[1],
+                       net->ipaddr[2], net->ipaddr[3],
                        net->test,
                        (net->enabled ? "on" : "off"));