X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=6f8d3b7c50876b30245cc97db2c01b8431380f65;hp=a8796afae3265b676fbb2b0b065bb9fd7fa3a3da;hb=2152229c45f470a14dee33507b331ac38055e062;hpb=feec10d799b5a2e1d591102cf966344238818480 diff --git a/config.c b/config.c index a8796af..6f8d3b7 100644 --- a/config.c +++ b/config.c @@ -2,15 +2,18 @@ #include #include +#include + #include "netifd.h" #include "interface.h" #include "proto.h" +#include "config.h" -struct uci_context *uci_ctx; -static struct uci_package *uci_network; bool config_init = false; -static struct blob_buf b; +static struct uci_context *uci_ctx; +static struct uci_package *uci_network; +static struct blob_buf b; static void uci_attr_to_blob(struct blob_buf *b, const char *str, const char *name, enum blobmsg_type type) @@ -128,8 +131,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; } @@ -143,8 +146,7 @@ config_parse_interface(struct uci_section *s) { struct interface *iface; const char *type; - - DPRINTF("Create interface '%s'\n", s->e.name); + struct blob_attr *config; blob_buf_init(&b, 0); @@ -154,14 +156,26 @@ config_parse_interface(struct uci_section *s) return; uci_to_blob(&b, s, &interface_attr_list); - iface = interface_alloc(s->e.name, b.head); + iface = calloc(1, sizeof(*iface)); if (!iface) return; - proto_init_interface(iface, s); + interface_init(iface, s->e.name, b.head); + + if (iface->proto_handler && iface->proto_handler->config_params) + uci_to_blob(&b, s, iface->proto_handler->config_params); + + config = malloc(blob_pad_len(b.head)); + if (!config) { + free(iface); + return; + } + + memcpy(config, b.head, blob_pad_len(b.head)); + interface_add(iface, config); } -void +static void config_init_devices(void) { struct uci_element *e; @@ -169,23 +183,135 @@ 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 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 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); } } +bool +config_diff(struct blob_attr **tb1, struct blob_attr **tb2, + const struct config_param_list *config, unsigned long *diff) +{ + bool ret = false; + int i; + + for (i = 0; i < config->n_params; i++) { + if (!tb1[i] && !tb2[i]) + continue; + + if (!!tb1[i] != !!tb2[i]) + goto mark; + + if (blob_len(tb1[i]) != blob_len(tb2[i])) + goto mark; + + if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0) + goto mark; + + continue; + +mark: + ret = true; + if (diff) + set_bit(diff, i); + else + return ret; + } + + return ret; +} + + +static bool +__config_check_equal(struct blob_attr *c1, struct blob_attr *c2, + const struct config_param_list *config) +{ + struct blob_attr **tb1, **tb2; + + tb1 = alloca(config->n_params * sizeof(struct blob_attr *)); + blobmsg_parse(config->params, config->n_params, tb1, + blob_data(c1), blob_len(c1)); + + tb2 = alloca(config->n_params * sizeof(struct blob_attr *)); + blobmsg_parse(config->params, config->n_params, tb2, + blob_data(c2), blob_len(c2)); + + return !config_diff(tb1, tb2, config, NULL); +} + +bool +config_check_equal(struct blob_attr *c1, struct blob_attr *c2, + const struct config_param_list *config) +{ + int i; + + if (!__config_check_equal(c1, c2, config)) + return false; + + for (i = 0; i < config->n_next; i++) { + if (!__config_check_equal(c1, c2, config->next[i])) + return false; + } + + return true; +} + +struct blob_attr * +config_memdup(struct blob_attr *attr) +{ + struct blob_attr *ret; + int size = blob_pad_len(attr); + + ret = malloc(size); + if (!ret) + return NULL; + + memcpy(ret, attr, size); + return ret; +} + +static struct uci_package * +config_init_package(const char *config) +{ + struct uci_context *ctx = uci_ctx; + struct uci_package *p = NULL; + + if (!ctx) { + ctx = uci_alloc_context(); + uci_ctx = ctx; + +#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)) + return NULL; + + return p; +} + void config_init_interfaces(const char *name) { @@ -193,12 +319,9 @@ config_init_interfaces(const char *name) struct uci_package *p = NULL; struct uci_element *e; - ctx = uci_alloc_context(); - uci_ctx = ctx; - - uci_set_confdir(ctx, "./config"); - - if (uci_load(ctx, "network", &p)) { + p = config_init_package("network"); + ctx = uci_ctx; + if (!p) { fprintf(stderr, "Failed to load network config\n"); return; } @@ -206,6 +329,7 @@ config_init_interfaces(const char *name) uci_network = p; config_init = true; + device_reset_config(); config_init_devices(); uci_foreach_element(&p->sections, e) { @@ -217,8 +341,10 @@ config_init_interfaces(const char *name) if (!strcmp(s->type, "interface")) config_parse_interface(s); } - device_free_all(); config_init = false; + device_reset_old(); + device_init_pending(); + device_free_unused(NULL); interface_start_pending(); }