X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=6691e61dbbfd543c9c58ec8e771e78512cb839dd;hp=8705c16accaa799dcd32e91bc3734838df89e2d5;hb=6b4570a107447034b5ae3861a7ca388d3052460a;hpb=216f718323126aa5b89b820363c20f49488cbba1 diff --git a/config.c b/config.c index 8705c16..6691e61 100644 --- a/config.c +++ b/config.c @@ -1,3 +1,17 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#define _GNU_SOURCE #include #include #include @@ -6,120 +20,36 @@ #include "netifd.h" #include "interface.h" +#include "interface-ip.h" +#include "iprule.h" #include "proto.h" +#include "wireless.h" #include "config.h" bool config_init = false; static struct uci_context *uci_ctx; static struct uci_package *uci_network; +static struct uci_package *uci_wireless; static struct blob_buf b; -static unsigned int config_version = 1; -static void uci_attr_to_blob(struct blob_buf *b, const char *str, - const char *name, enum blobmsg_type type) -{ - char *err; - int intval; - - switch (type) { - case BLOBMSG_TYPE_STRING: - blobmsg_add_string(b, name, str); - break; - case BLOBMSG_TYPE_BOOL: - if (!strcmp(str, "true") || !strcmp(str, "1")) - intval = 1; - else if (!strcmp(str, "false") || !strcmp(str, "0")) - intval = 0; - else - return; - - blobmsg_add_u8(b, name, intval); - break; - case BLOBMSG_TYPE_INT32: - intval = strtol(str, &err, 0); - if (*err) - return; - - blobmsg_add_u32(b, name, intval); - break; - default: - break; - } -} - -static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o, - enum blobmsg_type type) -{ - struct uci_element *e; - char *str, *next, *word; - - if (o->type == UCI_TYPE_LIST) { - uci_foreach_element(&o->v.list, e) { - uci_attr_to_blob(b, e->name, NULL, type); - } - return; - } - - str = strdup(o->v.string); - next = str; - - while ((word = strsep(&next, " \t")) != NULL) { - if (!*word) - continue; - - uci_attr_to_blob(b, word, NULL, type); - } - - free(str); -} - -static void __uci_to_blob(struct blob_buf *b, struct uci_section *s, - const struct config_param_list *p) +static int +config_section_idx(struct uci_section *s) { - const struct blobmsg_policy *attr = NULL; struct uci_element *e; - struct uci_option *o; - void *array; - int i; - - uci_foreach_element(&s->options, e) { - for (i = 0; i < p->n_params; i++) { - attr = &p->params[i]; - if (!strcmp(attr->name, e->name)) - break; - } - - if (i == p->n_params) - continue; + int idx = 0; - o = uci_to_option(e); - - if (attr->type == BLOBMSG_TYPE_ARRAY) { - if (!p->info) - continue; - - array = blobmsg_open_array(b, attr->name); - uci_array_to_blob(b, o, p->info[i].type); - blobmsg_close_array(b, array); - continue; - } + uci_foreach_element(&uci_wireless->sections, e) { + struct uci_section *cur = uci_to_section(e); - if (o->type == UCI_TYPE_LIST) - continue; + if (s == cur) + return idx; - uci_attr_to_blob(b, o->v.string, attr->name, attr->type); + if (!strcmp(cur->type, s->type)) + idx++; } -} -static void uci_to_blob(struct blob_buf *b, struct uci_section *s, - const struct config_param_list *p) -{ - int i; - - __uci_to_blob(b, s, p); - for (i = 0; i < p->n_next; i++) - uci_to_blob(b, s, p->next[i]); + return -1; } static int @@ -132,8 +62,8 @@ config_parse_bridge_interface(struct uci_section *s) blobmsg_add_string(&b, "name", name); uci_to_blob(&b, s, bridge_device_type.config_params); - if (!bridge_device_type.create(b.head)) { - DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name); + if (!device_create(name, &bridge_device_type, b.head)) { + D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name); return -EINVAL; } @@ -142,42 +72,100 @@ config_parse_bridge_interface(struct uci_section *s) return 0; } -void -config_set_state(struct config_state *state, const struct blob_attr *attr) -{ - state->data = malloc(blob_pad_len(attr)); - if (!state->data) - return; - - memcpy(state->data, attr, blob_pad_len(attr)); -} - static void -config_parse_interface(struct uci_section *s) +config_parse_interface(struct uci_section *s, bool alias) { struct interface *iface; - const char *type; + const char *type = NULL, *disabled; + struct blob_attr *config; + struct device *dev; + bool bridge = false; - DPRINTF("Create interface '%s'\n", s->e.name); + disabled = uci_lookup_option_string(uci_ctx, s, "disabled"); + if (disabled && !strcmp(disabled, "1")) + return; blob_buf_init(&b, 0); - type = uci_lookup_option_string(uci_ctx, s, "type"); - if (type && !strcmp(type, "bridge")) + if (!alias) + type = uci_lookup_option_string(uci_ctx, s, "type"); + if (type && !strcmp(type, "bridge")) { if (config_parse_bridge_interface(s)) return; + bridge = true; + } + uci_to_blob(&b, s, &interface_attr_list); + iface = interface_alloc(s->e.name, b.head); if (!iface) return; - blob_buf_init(&b, 0); if (iface->proto_handler && iface->proto_handler->config_params) uci_to_blob(&b, s, iface->proto_handler->config_params); - proto_init_interface(iface, b.head); - iface->config.version = config_version; + if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params)) + iface->device_config = true; + + config = blob_memdup(b.head); + if (!config) + goto error; + + if (alias) { + if (!interface_add_alias(iface, config)) + goto error_free_config; + } else { + interface_add(iface, config); + } + + /* + * need to look up the interface name again, in case of config update, + * the pointer will have changed + */ + iface = vlist_find(&interfaces, s->e.name, iface, node); + if (!iface) + return; + + dev = iface->main_dev.dev; + if (!dev || !dev->default_config) + return; + + blob_buf_init(&b, 0); + uci_to_blob(&b, s, dev->type->config_params); + if (blob_len(b.head) == 0) + return; + + device_set_config(dev, dev->type, b.head); + return; +error_free_config: + free(config); +error: + free(iface); +} + +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_parse_rule(struct uci_section *s, bool v6) +{ + void *rule; + + blob_buf_init(&b, 0); + rule = blobmsg_open_array(&b, "rule"); + uci_to_blob(&b, s, &rule_attr_list); + blobmsg_close_array(&b, rule); + iprule_add(blob_data(b.head), v6); } static void @@ -187,59 +175,257 @@ config_init_devices(void) uci_foreach_element(&uci_network->sections, e) { struct uci_section *s = uci_to_section(e); - const struct device_type *devtype; - const char *type; + const struct device_type *devtype = NULL; + const char *type, *name; if (strcmp(s->type, "device") != 0) continue; - blob_buf_init(&b, 0); + name = uci_lookup_option_string(uci_ctx, s, "name"); + if (!name) + continue; + type = uci_lookup_option_string(uci_ctx, s, "type"); - if (type && !strcmp(type, "bridge")) - devtype = &bridge_device_type; - else + if (type) { + if (!strcmp(type, "8021ad")) + devtype = &vlandev_device_type; + else if (!strcmp(type, "8021q")) + devtype = &vlandev_device_type; + else if (!strcmp(type, "bridge")) + devtype = &bridge_device_type; + else if (!strcmp(type, "macvlan")) + devtype = &macvlan_device_type; + else if (!strcmp(type, "tunnel")) + devtype = &tunnel_device_type; + } + + if (!devtype) devtype = &simple_device_type; + blob_buf_init(&b, 0); uci_to_blob(&b, s, devtype->config_params); - devtype->create(b.head); + device_create(name, devtype, b.head); } } -void -config_init_interfaces(const char *name) +static struct uci_package * +config_init_package(const char *config) { - struct uci_context *ctx; + struct uci_context *ctx = uci_ctx; struct uci_package *p = NULL; - struct uci_element *e; - ctx = uci_alloc_context(); - uci_ctx = ctx; + if (!ctx) { + ctx = uci_alloc_context(); + uci_ctx = ctx; + + ctx->flags &= ~UCI_FLAG_STRICT; + if (config_path) + uci_set_confdir(ctx, config_path); #ifdef DUMMY_MODE - uci_set_confdir(ctx, "./config"); + uci_set_savedir(ctx, "./tmp"); #endif + } else { + p = uci_lookup_package(ctx, config); + if (p) + uci_unload(ctx, p); + } - if (uci_load(ctx, "network", &p)) { - fprintf(stderr, "Failed to load network config\n"); + if (uci_load(ctx, config, &p)) + return NULL; + + return p; +} + +static void +config_init_interfaces(void) +{ + struct uci_element *e; + + uci_foreach_element(&uci_network->sections, e) { + struct uci_section *s = uci_to_section(e); + + if (!strcmp(s->type, "interface")) + config_parse_interface(s, false); + } + + uci_foreach_element(&uci_network->sections, e) { + struct uci_section *s = uci_to_section(e); + + if (!strcmp(s->type, "alias")) + config_parse_interface(s, true); + } +} + +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); +} + +static void +config_init_rules(void) +{ + struct uci_element *e; + + iprule_update_start(); + + uci_foreach_element(&uci_network->sections, e) { + struct uci_section *s = uci_to_section(e); + + if (!strcmp(s->type, "rule")) + config_parse_rule(s, false); + else if (!strcmp(s->type, "rule6")) + config_parse_rule(s, true); + } + + iprule_update_complete(); +} + +static void +config_init_globals(void) +{ + struct uci_section *globals = uci_lookup_section( + uci_ctx, uci_network, "globals"); + if (!globals) + return; + + const char *ula_prefix = uci_lookup_option_string( + uci_ctx, globals, "ula_prefix"); + interface_ip_set_ula_prefix(ula_prefix); +} + +static void +config_parse_wireless_device(struct uci_section *s) +{ + struct wireless_driver *drv; + const char *driver_name; + + driver_name = uci_lookup_option_string(uci_ctx, s, "type"); + if (!driver_name) + return; + + drv = avl_find_element(&wireless_drivers, driver_name, drv, node); + if (!drv) + return; + + blob_buf_init(&b, 0); + uci_to_blob(&b, s, drv->device.config); + wireless_device_create(drv, s->e.name, b.head); +} + +static void +config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s) +{ + char *name; + + name = alloca(strlen(s->type) + 16); + sprintf(name, "@%s[%d]", s->type, config_section_idx(s)); + + blob_buf_init(&b, 0); + uci_to_blob(&b, s, wdev->drv->interface.config); + wireless_interface_create(wdev, b.head, s->anonymous ? name : s->e.name); +} + +static void +config_init_wireless(void) +{ + struct wireless_device *wdev; + struct uci_element *e; + const char *dev_name; + + if (!uci_wireless) { + DPRINTF("No wireless configuration found\n"); return; } - uci_network = p; - config_init = true; + vlist_update(&wireless_devices); - config_init_devices(); + uci_foreach_element(&uci_wireless->sections, e) { + struct uci_section *s = uci_to_section(e); + if (strcmp(s->type, "wifi-device") != 0) + continue; + + config_parse_wireless_device(s); + } + + vlist_flush(&wireless_devices); + + vlist_for_each_element(&wireless_devices, wdev, node) { + wdev->vif_idx = 0; + vlist_update(&wdev->interfaces); + } - uci_foreach_element(&p->sections, e) { + uci_foreach_element(&uci_wireless->sections, e) { struct uci_section *s = uci_to_section(e); - if (name && strcmp(s->e.name, name) != 0) + if (strcmp(s->type, "wifi-iface") != 0) continue; - if (!strcmp(s->type, "interface")) - config_parse_interface(s); + dev_name = uci_lookup_option_string(uci_ctx, s, "device"); + if (!dev_name) + continue; + + wdev = vlist_find(&wireless_devices, dev_name, wdev, node); + if (!wdev) { + DPRINTF("device %s not found!\n", dev_name); + continue; + } + + config_parse_wireless_interface(wdev, s); } - device_free_unused(NULL); + + vlist_for_each_element(&wireless_devices, wdev, node) + vlist_flush(&wdev->interfaces); +} + +void +config_init_all(void) +{ + uci_network = config_init_package("network"); + if (!uci_network) { + fprintf(stderr, "Failed to load network config\n"); + return; + } + + uci_wireless = config_init_package("wireless"); + + vlist_update(&interfaces); + config_init = true; + device_lock(); + + device_reset_config(); + config_init_devices(); + config_init_interfaces(); + config_init_routes(); + config_init_rules(); + config_init_globals(); + config_init_wireless(); + config_init = false; + device_unlock(); + device_reset_old(); + device_init_pending(); + vlist_flush(&interfaces); + device_free_unused(NULL); + interface_refresh_assignments(false); interface_start_pending(); + wireless_start_pending(); }