X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=3a404326ebd19b4e707e26c6a061608bc9c51032;hp=3dceef07797f4e473d67f327c9643fb03ec1713c;hb=8a1a1dda9cfff45a7cd48f5d108d0174fadd84ee;hpb=70d48250e7d25e7df13032eb69e30f0022e4e556

diff --git a/interface.c b/interface.c
index 3dceef0..3a40432 100644
--- a/interface.c
+++ b/interface.c
@@ -18,6 +18,7 @@ enum {
 	IFACE_ATTR_PROTO,
 	IFACE_ATTR_AUTO,
 	IFACE_ATTR_DEFAULTROUTE,
+	IFACE_ATTR_METRIC,
 	IFACE_ATTR_MAX
 };
 
@@ -26,6 +27,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },
+	[IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct config_param_list interface_attr_list = {
@@ -79,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;
@@ -92,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
@@ -104,6 +142,8 @@ mark_interface_down(struct interface *iface)
 {
 	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);
 	iface->state = IFS_DOWN;
 }
@@ -187,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);
@@ -195,26 +235,27 @@ interface_claim_device(struct interface *iface)
 
 
 static void
-interface_cleanup(struct interface *iface)
+interface_cleanup(struct interface *iface, bool reload)
 {
 	struct interface_user *dep, *tmp;
 
 	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)
-		device_remove_user(&iface->main_dev);
-	iface->l3_dev = &iface->main_dev;
+	if (iface->main_dev.dev &&
+	    (!reload || !iface->main_dev.hotplug))
+		interface_set_main_dev(iface, NULL);
 	interface_set_proto_state(iface, NULL);
 }
 
 static void
 interface_do_free(struct interface *iface)
 {
-	interface_cleanup(iface);
+	interface_cleanup(iface, false);
 	free(iface->config);
 	netifd_ubus_remove_interface(iface);
 	avl_delete(&interfaces.avl, &iface->node.avl);
@@ -224,7 +265,7 @@ interface_do_free(struct interface *iface)
 static void
 interface_do_reload(struct interface *iface)
 {
-	interface_cleanup(iface);
+	interface_cleanup(iface, true);
 	proto_init_interface(iface, iface->config);
 	interface_claim_device(iface);
 }
@@ -269,9 +310,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 			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);
+		system_flush_routes();
 		interface_handle_config_change(iface);
 		break;
 	case IFPEV_LINK_LOST:
@@ -281,6 +321,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		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);
+		system_flush_routes();
 		iface->state = IFS_SETUP;
 		break;
 	}
@@ -315,10 +357,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));
@@ -348,20 +390,65 @@ interface_add(struct interface *iface, struct blob_attr *config)
 		iface->ifname = blobmsg_data(cur);
 
 	iface->config = config;
-	vlist_add(&interfaces, &iface->node);
+	vlist_add(&interfaces, &iface->node, iface->name);
 }
 
 void
-interface_remove_link(struct interface *iface, struct device *dev)
+interface_set_l3_dev(struct interface *iface, struct device *dev)
 {
-	struct device *mdev = iface->main_dev.dev;
+	bool enabled = iface->config_ip.enabled;
+	bool claimed = iface->l3_dev.claimed;
 
-	if (mdev && mdev->hotplug_ops) {
-		mdev->hotplug_ops->del(mdev, dev);
+	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)
+{
+	struct device *mdev = iface->main_dev.dev;
+
+	if (mdev && mdev->hotplug_ops)
+		return mdev->hotplug_ops->del(mdev, dev);
+
+	if (!iface->main_dev.hotplug)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	if (dev != iface->main_dev.dev)
+		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	device_remove_user(&iface->main_dev);
+	return 0;
 }
 
 int
@@ -369,14 +456,21 @@ interface_add_link(struct interface *iface, struct device *dev)
 {
 	struct device *mdev = iface->main_dev.dev;
 
-	if (mdev && mdev->hotplug_ops)
-		return mdev->hotplug_ops->add(mdev, dev);
+	if (mdev == dev)
+		return 0;
 
-	if (iface->main_dev.dev)
-		interface_remove_link(iface, NULL);
+	if (iface->main_dev.hotplug)
+		device_remove_user(&iface->main_dev);
 
-	device_add_user(&iface->main_dev, dev);
+	if (mdev) {
+		if (mdev->hotplug_ops)
+			return mdev->hotplug_ops->add(mdev, dev);
+		else
+			return UBUS_STATUS_NOT_SUPPORTED;
+	}
 
+	interface_set_main_dev(iface, dev);
+	iface->main_dev.hotplug = true;
 	return 0;
 }
 
@@ -456,15 +550,7 @@ interface_update_start(struct interface *iface)
 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
@@ -501,11 +587,21 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 		goto reload;
 	}
 
-	if (if_old->proto_ip.no_defaultroute != if_new->proto_ip.no_defaultroute) {
-		if_old->proto_ip.no_defaultroute = if_new->proto_ip.no_defaultroute;
-		interface_ip_set_enabled(&if_old->proto_ip, if_old->proto_ip.enabled);
+#define UPDATE(field) ({						\
+		bool __changed = (if_old->field != if_new->field);	\
+		if_old->field = if_new->field;				\
+		__changed;						\
+	})
+
+	if (UPDATE(metric) || UPDATE(proto_ip.no_defaultroute)) {
+		interface_ip_set_enabled(&if_old->config_ip, false);
+		interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
+		interface_ip_set_enabled(&if_old->proto_ip, false);
+		interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
 	}
 
+#undef UPDATE
+
 	goto out;
 
 reload:
@@ -540,8 +636,7 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
 static void __init
 interface_init_list(void)
 {
-	vlist_init(&interfaces, avl_strcmp, interface_update,
-		   struct interface, node, name);
+	vlist_init(&interfaces, avl_strcmp, interface_update);
 	interfaces.keep_old = true;
 	interfaces.no_delete = true;
 }