/*
* 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
#include <stdlib.h>
#include <unistd.h>
#include <ucimap.h>
+#include "list.h"
struct list_head ifs;
if (!target)
return -1;
- *data->data = target;
+ data->ptr = target;
for (i = 0; i < 4; i++)
target[i] = (char) tmp[i];
}
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->data[0];
+ 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;
}
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;
}
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);
list_for_each(p, &ifs) {
const unsigned char *ipaddr;
+ int n_aliases = 0;
net = list_entry(p, struct uci_network, list);
ipaddr = net->ipaddr;
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
}