static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
- [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_IFNAME] = { .name = "l3_device", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_UP] = { .name = "up", .type = BLOBMSG_TYPE_BOOL },
[IFACE_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
[IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
static void subscribe_netifd(void)
{
- netifd.cb = handle_update;
ubus_subscribe(ubus, &netifd, objid);
ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0);
}
const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
+ bool matched = false;
struct interface *c;
list_for_each_entry(c, &interfaces, head) {
char *f = memmem(c->upstream, c->upstream_len,
interface, strlen(interface) + 1);
- if (strcmp(interface, c->name) && strcmp(ifname, c->ifname) &&
- (!f || (f != c->upstream && f[-1] != 0)))
+ bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
+ matched |= cmatched;
+
+ if (!cmatched && (!f || (f != c->upstream && f[-1] != 0)))
continue;
- if (!c || !c->ignore)
- config_parse_interface(tb[IFACE_ATTR_DATA], interface, false);
+ if (!c->ignore)
+ config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+ blobmsg_data_len(tb[IFACE_ATTR_DATA]), c->name, false);
}
+
+ if (!matched)
+ config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+ blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
}
}
return -1;
}
+ netifd.cb = handle_update;
+ ubus_register_subscriber(ubus, &netifd);
+
ubus_add_uloop(ubus);
ubus_add_object(ubus, &main_object);
ubus_register_event_handler(ubus, &event_handler, "ubus.object.add");