uci_to_blob(&b, s, bridge_device_type.config_params);
if (!device_create(name, &bridge_device_type, b.head)) {
- DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
+ D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
return -EINVAL;
}
struct interface *iface;
const char *type;
struct blob_attr *config;
-
- DPRINTF("Create interface '%s'\n", s->e.name);
+ struct device *dev;
blob_buf_init(&b, 0);
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
if (blob_len(tb1[i]) != blob_len(tb2[i]))
goto mark;
- if (memcmp(tb1[i], tb2[i], blob_pad_len(tb1[i])) != 0)
+ if (memcmp(tb1[i], tb2[i], blob_raw_len(tb1[i])) != 0)
goto mark;
continue;
{
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));
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");
- ctx = uci_ctx;
if (!p) {
fprintf(stderr, "Failed to load network config\n");
return;
uci_network = p;
config_init = true;
+ device_lock();
+ device_reset_config();
config_init_devices();
uci_foreach_element(&p->sections, e) {
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
- device_free_unused(NULL);
+
config_init = false;
+ device_unlock();
+ device_reset_old();
+ device_init_pending();
+ device_free_unused(NULL);
interface_start_pending();
}