}
static void
+interface_data_del(struct interface *iface, struct interface_data *data)
+{
+ avl_delete(&iface->data, &data->node);
+ free(data);
+}
+
+static void
+interface_data_flush(struct interface *iface)
+{
+ struct interface_data *d, *tmp;
+
+ avl_for_each_element_safe(&iface->data, d, node, tmp)
+ interface_data_del(iface, d);
+}
+
+int
+interface_add_data(struct interface *iface, const struct blob_attr *data)
+{
+ struct interface_data *n, *o;
+
+ if (!blobmsg_check_attr(data, true))
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ n = calloc(1, sizeof(*data) + blob_pad_len(data));
+ memcpy(n->data, data, blob_pad_len(data));
+ n->node.key = blobmsg_name(data);
+
+ o = avl_find_element(&iface->data, n->node.key, o, node);
+ if (o)
+ interface_data_del(iface, o);
+
+ avl_insert(&iface->data, &n->node);
+ return 0;
+}
+
+static void
interface_event(struct interface *iface, enum interface_event ev)
{
struct interface_user *dep, *tmp;
device_release(&iface->main_dev);
if (iface->l3_dev.dev)
device_release(&iface->l3_dev);
+ interface_data_flush(iface);
}
static void
{
if (iface->state == IFS_UP)
interface_event(iface, IFEV_DOWN);
+ interface_ip_set_enabled(&iface->config_ip, false);
+ interface_ip_flush(&iface->proto_ip);
interface_flush_state(iface);
+ system_flush_routes();
iface->state = IFS_DOWN;
}
if (iface->state == IFS_UP)
interface_event(iface, IFEV_DOWN);
iface->state = IFS_TEARDOWN;
- interface_ip_flush(&iface->config_ip);
- interface_ip_flush(&iface->proto_ip);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
if (force)
interface_flush_state(iface);
list_for_each_entry_safe(dep, tmp, &iface->users, list)
interface_remove_user(dep);
+ interface_dequeue_event(iface);
interface_ip_flush(&iface->config_ip);
interface_flush_state(iface);
interface_clear_errors(iface);
return;
netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
- interface_ip_set_enabled(&iface->config_ip, false);
- system_flush_routes();
mark_interface_down(iface);
interface_handle_config_change(iface);
break;
return;
netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
- if (iface->state == IFS_UP)
- interface_event(iface, IFEV_DOWN);
+ mark_interface_down(iface);
iface->state = IFS_SETUP;
break;
}
INIT_LIST_HEAD(&iface->hotplug_list);
interface_ip_init(&iface->proto_ip, iface);
interface_ip_init(&iface->config_ip, iface);
+ avl_init(&iface->data, avl_strcmp, false, NULL);
iface->config_ip.enabled = false;
iface->main_dev.cb = interface_cb;
if (iface->main_dev.dev == dev)
return;
- device_add_user(&iface->main_dev, dev);
if (set_l3)
interface_set_l3_dev(iface, dev);
+ device_add_user(&iface->main_dev, dev);
if (claimed)
device_claim(&iface->l3_dev);
void
interface_update_complete(struct interface *iface)
{
- struct device_route *route;
-
interface_ip_update_complete(&iface->proto_ip);
- vlist_for_each_element(&iface->config_ip.route, route, node) {
- if (iface->l3_dev.dev) {
- system_add_route(iface->l3_dev.dev, route);
- route->enabled = true;
- }
- }
}
static void