struct list_head ifs;
struct uci_network {
+ struct ucimap_section_data map;
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 ucimap_section_data map;
struct list_head list;
const char *name;
};
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 = (unsigned char *) 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;
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[] = {
{
{
.map = {
UCIMAP_OPTION(struct uci_network, ipaddr),
- .type = UCIMAP_STRING,
+ .type = UCIMAP_CUSTOM,
.name = "ipaddr",
+ .parse = network_parse_ip,
}
},
{
}
};
-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),
- .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_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_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,
};
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"));