X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=8db2b59b15514d1e3367c36781d263e28de1171e;hp=556daf8f0efa91f3406175ee47ff5ca82554af2e;hb=2674941b06c1ec67f1aff1bff9212e1372106641;hpb=d7f7f002e3d168aedb5f2bc92180f5966482d7d9 diff --git a/config.c b/config.c index 556daf8..8db2b59 100644 --- a/config.c +++ b/config.c @@ -20,6 +20,7 @@ #include "netifd.h" #include "interface.h" #include "interface-ip.h" +#include "iprule.h" #include "proto.h" #include "config.h" @@ -29,119 +30,6 @@ static struct uci_context *uci_ctx; static struct uci_package *uci_network; static struct blob_buf b; -static bool 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 false; - - blobmsg_add_u8(b, name, intval); - break; - case BLOBMSG_TYPE_INT32: - intval = strtol(str, &err, 0); - if (*err) - return false; - - blobmsg_add_u32(b, name, intval); - break; - default: - return false; - } - return true; -} - -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 int __uci_to_blob(struct blob_buf *b, struct uci_section *s, - const struct config_param_list *p) -{ - const struct blobmsg_policy *attr = NULL; - struct uci_element *e; - struct uci_option *o; - void *array; - int i, ret = 0; - - 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; - - 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); - ret++; - continue; - } - - if (o->type == UCI_TYPE_LIST) - continue; - - ret += uci_attr_to_blob(b, o->v.string, attr->name, attr->type); - } - - return ret; -} - -static int uci_to_blob(struct blob_buf *b, struct uci_section *s, - const struct config_param_list *p) -{ - int ret = 0; - int i; - - ret += __uci_to_blob(b, s, p); - for (i = 0; i < p->n_next; i++) - ret += uci_to_blob(b, s, p->next[i]); - - return ret; -} - static int config_parse_bridge_interface(struct uci_section *s) { @@ -195,12 +83,10 @@ config_parse_interface(struct uci_section *s, bool alias) if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params)) iface->device_config = true; - config = malloc(blob_pad_len(b.head)); + config = blob_memdup(b.head); if (!config) goto error; - memcpy(config, b.head, blob_pad_len(b.head)); - if (alias) { if (!interface_add_alias(iface, config)) goto error_free_config; @@ -246,6 +132,18 @@ config_parse_route(struct uci_section *s, bool 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 config_init_devices(void) { struct uci_element *e; @@ -279,94 +177,6 @@ config_init_devices(void) } } -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; - - if (!!c1 ^ !!c2) - return false; - - if (!c1 && !c2) - return true; - - 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) { @@ -436,6 +246,25 @@ config_init_routes(void) } 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( @@ -465,6 +294,7 @@ config_init_all(void) config_init_devices(); config_init_interfaces(); config_init_routes(); + config_init_rules(); config_init_globals(); config_init = false; @@ -474,5 +304,6 @@ config_init_all(void) device_init_pending(); vlist_flush(&interfaces); device_free_unused(NULL); + interface_refresh_assignments(false); interface_start_pending(); }