X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=ucimap-example.c;h=0ad31d6a6ba74fa3a50aa8f29839a0c377b6bee0;hp=4309a76d7680503af92a76f3184eed975eb305b5;hb=8ae8a7fc893e18676d6a35193f8a74c87ceb7b7f;hpb=d788264ddc370ffb5f9fe1f451ac6845da0dfda0 diff --git a/ucimap-example.c b/ucimap-example.c index 4309a76..0ad31d6 100644 --- a/ucimap-example.c +++ b/ucimap-example.c @@ -17,58 +17,176 @@ #include #include +struct list_head ifs; + struct uci_network { struct list_head list; + struct list_head alias; const char *name; const char *proto; const char *ifname; - const char *ipaddr; + unsigned char ipaddr[4]; int test; bool enabled; + struct ucimap_list *aliases; +}; + +struct uci_alias { + struct list_head list; + + const char *name; + struct uci_network *interface; }; static int -network_init_section(struct uci_map *map, void *section, struct uci_section *s) +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; INIT_LIST_HEAD(&net->list); + INIT_LIST_HEAD(&net->alias); net->name = s->e.name; net->test = -1; return 0; } static int -network_add_section(struct uci_map *map, void *section) +network_init_alias(struct uci_map *map, void *section, struct uci_section *s) +{ + struct uci_alias *alias = section; + + INIT_LIST_HEAD(&alias->list); + alias->name = s->e.name; + return 0; +} + +static int +network_add_interface(struct uci_map *map, void *section) { struct uci_network *net = section; - struct uci_network **nptr = map->priv; - *nptr = net; + list_add(&net->list, &ifs); + return 0; } -struct uci_optmap network_smap_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), +static int +network_add_alias(struct uci_map *map, void *section) +{ + struct uci_alias *a = section; + + if (a->interface) + list_add(&a->list, &a->interface->alias); + + return 0; +} + +struct my_optmap { + struct uci_optmap map; + int test; +}; + +static struct uci_sectmap network_interface; +static struct uci_sectmap 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 + } + } }; -struct uci_sectmap network_smap[] = { +static struct uci_sectmap network_interface = { + .type = "interface", + .alloc_len = sizeof(struct uci_network), + .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[] = { { - .type = "interface", - .options = network_smap_options, - .alloc_len = sizeof(struct uci_network), - .init_section = network_init_section, - .add_section = network_add_section, - .n_options = ARRAY_SIZE(network_smap_options), + UCIMAP_OPTION(struct uci_alias, interface), + .type = UCIMAP_SECTION, + .data.sm = &network_interface } }; -struct uci_map network_map = { +static struct uci_sectmap network_alias = { + .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[] = { + &network_interface, + &network_alias, +}; + +static struct uci_map network_map = { .sections = network_smap, .n_sections = ARRAY_SIZE(network_smap), }; @@ -78,36 +196,47 @@ int main(int argc, char **argv) { struct uci_context *ctx; struct uci_package *pkg; - struct uci_network *net = NULL; + struct list_head *p, *p2; + struct uci_network *net; + struct uci_alias *alias; + int i; + INIT_LIST_HEAD(&ifs); ctx = uci_alloc_context(); ucimap_init(&network_map); uci_load(ctx, "network", &pkg); - network_map.priv = &net; ucimap_parse(&network_map, pkg); - if (!net) - goto done; - - printf("New network section '%s'\n" + list_for_each(p, &ifs) { + net = list_entry(p, struct uci_network, list); + 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")); - net->ipaddr = "2.3.4.5"; - ucimap_set_changed(net, &net->ipaddr); - ucimap_store_section(&network_map, pkg, net); - uci_save(ctx, pkg); + for (i = 0; i < net->aliases->n_items; i++) { + alias = net->aliases->item[i].section; + 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); + uci_save(ctx, pkg); +#endif + } + done: ucimap_cleanup(&network_map);