- blobmsg_for_each_attr(c, dump, rem) {
- struct interface *iface = find_interface(c);
- if (!iface || !iface->ignore)
- config_parse_interface(c, NULL);
+ blobmsg_for_each_attr(a, dump, rem) {
+ struct blob_attr *tb[IFACE_ATTR_MAX];
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(a), blobmsg_data_len(a));
+
+ if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA])
+ continue;
+
+ const char *interface = (tb[IFACE_ATTR_INTERFACE]) ?
+ blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]) : "";
+ const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
+ blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
+
+ bool matched = false;
+ struct interface *c, *n;
+ list_for_each_entry_safe(c, n, &interfaces, head) {
+ char *f = memmem(c->upstream, c->upstream_len,
+ interface, strlen(interface) + 1);
+ bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
+ matched |= cmatched;
+
+ if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0)))
+ continue;
+
+ 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);