if (iface->proto_handler && iface->proto_handler->config_params)
uci_to_blob(&b, s, iface->proto_handler->config_params);
- if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
+ if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params) > 1)
iface->device_config = true;
config = blob_memdup(b.head);
if (blob_len(b.head) == 0)
return;
- device_set_config(dev, dev->type, b.head);
+ if (iface->device_config && dev->default_config)
+ device_set_config(dev, dev->type, b.head);
return;
error_free_config:
free(config);
struct uci_element *e;
uci_foreach_element(&uci_network->sections, e) {
+ const struct uci_blob_param_list *params = NULL;
struct uci_section *s = uci_to_section(e);
const struct device_type *devtype = NULL;
+ struct device *dev;
const char *type, *name;
if (strcmp(s->type, "device") != 0)
devtype = &tunnel_device_type;
}
- if (!devtype)
- devtype = &simple_device_type;
+ if (devtype)
+ params = devtype->config_params;
+ if (!params)
+ params = simple_device_type.config_params;
blob_buf_init(&b, 0);
- uci_to_blob(&b, s, devtype->config_params);
- device_create(name, devtype, b.head);
+ uci_to_blob(&b, s, params);
+ if (devtype) {
+ dev = device_create(name, devtype, b.head);
+ if (!dev)
+ continue;
+ } else {
+ dev = device_get(name, 1);
+ if (!dev)
+ continue;
+
+ device_apply_config(dev, dev->type, b.head);
+ }
+ dev->default_config = false;
}
}