X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=interface.c;h=6b95a6db39ff66a5cae465bc4a8d8cd168d2ed09;hb=bc214ca470015b12a4f905f57ba6f2352c60f5a5;hp=f281a9b4bbf2d1dd63de31b5375a8d296e531561;hpb=a609b5e8f39b132ff72476761add46d263c4147f;p=project%2Fnetifd.git

diff --git a/interface.c b/interface.c
index f281a9b..6b95a6d 100644
--- a/interface.c
+++ b/interface.c
@@ -81,6 +81,42 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 }
 
 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;
@@ -94,11 +130,11 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 interface_flush_state(struct interface *iface)
 {
-	interface_ip_flush(&iface->proto_ip);
 	if (iface->main_dev.dev)
 		device_release(&iface->main_dev);
-	if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev)
-		device_release(iface->l3_dev);
+	if (iface->l3_dev.dev)
+		device_release(&iface->l3_dev);
+	interface_data_flush(iface);
 }
 
 static void
@@ -106,6 +142,8 @@ mark_interface_down(struct interface *iface)
 {
 	if (iface->state == IFS_UP)
 		interface_event(iface, IFEV_DOWN);
+	interface_ip_flush(&iface->config_ip);
+	interface_ip_flush(&iface->proto_ip);
 	interface_flush_state(iface);
 	iface->state = IFS_DOWN;
 }
@@ -122,8 +160,6 @@ __interface_set_down(struct interface *iface, bool force)
 	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);
@@ -191,7 +227,7 @@ interface_claim_device(struct interface *iface)
 		!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
 		dev = device_get(iface->ifname, true);
 		if (dev)
-			device_add_user(&iface->main_dev, dev);
+			interface_set_main_dev(iface, dev);
 	}
 	if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
 		interface_set_available(iface, true);
@@ -206,13 +242,13 @@ interface_cleanup(struct interface *iface, bool reload)
 	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);
 	if (iface->main_dev.dev &&
 	    (!reload || !iface->main_dev.hotplug))
-		device_remove_user(&iface->main_dev);
-	iface->l3_dev = &iface->main_dev;
+		interface_set_main_dev(iface, NULL);
 	interface_set_proto_state(iface, NULL);
 }
 
@@ -320,10 +356,10 @@ interface_init(struct interface *iface, const char *name,
 	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;
-	iface->l3_dev = &iface->main_dev;
 
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
 		      blob_data(config), blob_len(config));
@@ -356,6 +392,46 @@ interface_add(struct interface *iface, struct blob_attr *config)
 	vlist_add(&interfaces, &iface->node, iface->name);
 }
 
+void
+interface_set_l3_dev(struct interface *iface, struct device *dev)
+{
+	bool enabled = iface->config_ip.enabled;
+	bool claimed = iface->l3_dev.claimed;
+
+	if (iface->l3_dev.dev == dev)
+		return;
+
+	interface_ip_set_enabled(&iface->config_ip, false);
+	interface_ip_flush(&iface->proto_ip);
+	device_add_user(&iface->l3_dev, dev);
+
+	if (dev) {
+		if (claimed)
+			device_claim(&iface->l3_dev);
+		interface_ip_set_enabled(&iface->config_ip, enabled);
+	}
+}
+
+void
+interface_set_main_dev(struct interface *iface, struct device *dev)
+{
+	bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev);
+	bool claimed = iface->l3_dev.claimed;
+
+	if (iface->main_dev.dev == dev)
+		return;
+
+	if (set_l3)
+		interface_set_l3_dev(iface, dev);
+
+	device_add_user(&iface->main_dev, dev);
+	if (claimed)
+		device_claim(&iface->l3_dev);
+
+	if (!iface->l3_dev.dev)
+		interface_set_l3_dev(iface, dev);
+}
+
 int
 interface_remove_link(struct interface *iface, struct device *dev)
 {
@@ -392,7 +468,7 @@ interface_add_link(struct interface *iface, struct device *dev)
 			return UBUS_STATUS_NOT_SUPPORTED;
 	}
 
-	device_add_user(&iface->main_dev, dev);
+	interface_set_main_dev(iface, dev);
 	iface->main_dev.hotplug = true;
 	return 0;
 }
@@ -477,8 +553,8 @@ interface_update_complete(struct interface *iface)
 
 	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);
+		if (iface->l3_dev.dev) {
+			system_add_route(iface->l3_dev.dev, route);
 			route->enabled = true;
 		}
 	}