X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=config.c;h=5a2e439b9294381a38ad6a7f6579ba26eb7bb433;hb=efa325e9079b11421a77ee77956339f481254d1f;hp=4158cc8365d12acb3fd347c6167e627e6677709f;hpb=5eefbc1a53e34db35c9a567d147c6d0bd341cf18;p=project%2Fnetifd.git diff --git a/config.c b/config.c index 4158cc8..5a2e439 100644 --- a/config.c +++ b/config.c @@ -6,6 +6,7 @@ #include "netifd.h" #include "interface.h" +#include "interface-ip.h" #include "proto.h" #include "config.h" @@ -188,6 +189,18 @@ config_parse_interface(struct uci_section *s) } static void +config_parse_route(struct uci_section *s, bool v6) +{ + void *route; + + blob_buf_init(&b, 0); + route = blobmsg_open_array(&b, "route"); + uci_to_blob(&b, s, &route_attr_list); + blobmsg_close_array(&b, route); + interface_ip_add_route(NULL, blob_data(b.head), v6); +} + +static void config_init_devices(void) { struct uci_element *e; @@ -343,6 +356,28 @@ config_init_interfaces(void) } } +static void +config_init_routes(void) +{ + struct interface *iface; + struct uci_element *e; + + vlist_for_each_element(&interfaces, iface, node) + interface_ip_update_start(&iface->config_ip); + + uci_foreach_element(&uci_network->sections, e) { + struct uci_section *s = uci_to_section(e); + + if (!strcmp(s->type, "route")) + config_parse_route(s, false); + else if (!strcmp(s->type, "route6")) + config_parse_route(s, true); + } + + vlist_for_each_element(&interfaces, iface, node) + interface_ip_update_complete(&iface->config_ip); +} + void config_init_all(void) { @@ -358,6 +393,7 @@ config_init_all(void) device_reset_config(); config_init_devices(); config_init_interfaces(); + config_init_routes(); config_init = false; device_unlock();