projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework route handling, move parser code to interface-ip.c, add extra options and...
[project/netifd.git]
/
config.c
diff --git
a/config.c
b/config.c
index
c4a6759
..
86c2599
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-147,6
+147,7
@@
config_parse_interface(struct uci_section *s)
struct interface *iface;
const char *type;
struct blob_attr *config;
struct interface *iface;
const char *type;
struct blob_attr *config;
+ struct device *dev;
blob_buf_init(&b, 0);
blob_buf_init(&b, 0);
@@
-173,6
+174,17
@@
config_parse_interface(struct uci_section *s)
memcpy(config, b.head, blob_pad_len(b.head));
interface_add(iface, config);
memcpy(config, b.head, blob_pad_len(b.head));
interface_add(iface, config);
+
+ 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);
}
static void
}
static void
@@
-244,6
+256,12
@@
__config_check_equal(struct blob_attr *c1, struct blob_attr *c2,
{
struct blob_attr **tb1, **tb2;
{
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));
tb1 = alloca(config->n_params * sizeof(struct blob_attr *));
blobmsg_parse(config->params, config->n_params, tb1,
blob_data(c1), blob_len(c1));
@@
-315,12
+333,10
@@
config_init_package(const char *config)
void
config_init_interfaces(const char *name)
{
void
config_init_interfaces(const char *name)
{
- struct uci_context *ctx;
struct uci_package *p = NULL;
struct uci_element *e;
p = config_init_package("network");
struct uci_package *p = NULL;
struct uci_element *e;
p = config_init_package("network");
- ctx = uci_ctx;
if (!p) {
fprintf(stderr, "Failed to load network config\n");
return;
if (!p) {
fprintf(stderr, "Failed to load network config\n");
return;
@@
-328,7
+344,9
@@
config_init_interfaces(const char *name)
uci_network = p;
config_init = true;
uci_network = p;
config_init = true;
+ device_lock();
+ device_reset_config();
config_init_devices();
uci_foreach_element(&p->sections, e) {
config_init_devices();
uci_foreach_element(&p->sections, e) {
@@
-340,9
+358,12
@@
config_init_interfaces(const char *name)
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
- device_free_unused(NULL);
+
config_init = false;
config_init = false;
+ device_unlock();
+ device_reset_old();
device_init_pending();
device_init_pending();
+ device_free_unused(NULL);
interface_start_pending();
}
interface_start_pending();
}