blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(b), blob_len(b));
if (tb[IFACE_ATTR_INTERFACE])
- name = blobmsg_data(tb[IFACE_ATTR_INTERFACE]);
+ name = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
+
+ if (!name)
+ return -1;
struct interface *iface = get_interface(name);
if (!iface) {
else if ((c = tb[IFACE_ATTR_NETWORKID]))
ifname = blobmsg_get_string(c);
+ if (!ifname)
+ return -1;
+
strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
iface->inuse = true;
signal(SIGHUP, set_stop);
signal(SIGINT, set_stop);
+#ifdef WITH_UBUS
+ init_ubus();
+#endif
+
do {
do_reload = uloop_cancelled = false;
#endif
// Evaluate hybrid mode for master
- struct interface *master = NULL, *i;
+ struct interface *master = NULL, *i, *n;
list_for_each_entry(i, &interfaces, head) {
if (!i->master)
continue;
}
- list_for_each_entry(i, &interfaces, head) {
- if (i->inuse && !i->ignore) {
+ list_for_each_entry_safe(i, n, &interfaces, head) {
+ if (i->inuse) {
// Resolve hybrid mode
if (i->dhcpv6 == RELAYD_HYBRID)
i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?