X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=81cbd28180f42c817c139c2044d5425612ec7dcc;hp=1649ceeffe12eb51d9c552e0a8d99239699e0480;hb=23cfcee20f43d824d61fadef48af84a83d5b8816;hpb=0c823ed77d2d4aaca12d4c9504e808e4c715b8e4 diff --git a/config.c b/config.c index 1649cee..81cbd28 100644 --- a/config.c +++ b/config.c @@ -2,15 +2,19 @@ #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 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) @@ -138,6 +142,16 @@ 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) { @@ -163,9 +177,10 @@ config_parse_interface(struct uci_section *s) uci_to_blob(&b, s, iface->proto_handler->config_params); proto_init_interface(iface, b.head); + iface->config.version = config_version; } -void +static void config_init_devices(void) { struct uci_element *e; @@ -221,7 +236,7 @@ config_init_interfaces(const char *name) if (!strcmp(s->type, "interface")) config_parse_interface(s); } - device_free_all(); + device_free_unused(NULL); config_init = false; interface_start_pending();