X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=892dadef30c60c4169725cbecb371c120057e59d;hp=4ad89f538a41328f006d49c49c3576f1348463da;hb=0942c9368654ee1a0518bbeaf291a51852c11543;hpb=75baeca6f817b161f522a9961bfe5c3718397189

diff --git a/interface.c b/interface.c
index 4ad89f5..892dade 100644
--- a/interface.c
+++ b/interface.c
@@ -12,12 +12,14 @@
 #include "system.h"
 
 struct vlist_tree interfaces;
+static LIST_HEAD(iface_all_users);
 
 enum {
 	IFACE_ATTR_IFNAME,
 	IFACE_ATTR_PROTO,
 	IFACE_ATTR_AUTO,
 	IFACE_ATTR_DEFAULTROUTE,
+	IFACE_ATTR_METRIC,
 	IFACE_ATTR_MAX
 };
 
@@ -26,6 +28,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,12 +82,51 @@ 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;
 
 	list_for_each_entry_safe(dep, tmp, &iface->users, list)
-		dep->cb(dep, IFEV_UP);
+		dep->cb(dep, iface, ev);
+
+	list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
+		dep->cb(dep, iface, ev);
 
 	interface_queue_event(iface, ev);
 }
@@ -92,11 +134,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,7 +146,10 @@ 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);
+	system_flush_routes();
 	iface->state = IFS_DOWN;
 }
 
@@ -120,8 +165,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);
@@ -167,10 +210,15 @@ interface_set_available(struct interface *iface, bool new_state)
 void
 interface_add_user(struct interface_user *dep, struct interface *iface)
 {
+	if (!iface) {
+		list_add(&dep->list, &iface_all_users);
+		return;
+	}
+
 	dep->iface = iface;
 	list_add(&dep->list, &iface->users);
 	if (iface->state == IFS_UP)
-		dep->cb(dep, IFEV_UP);
+		dep->cb(dep, iface, IFEV_UP);
 }
 
 void
@@ -189,7 +237,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);
@@ -204,19 +252,20 @@ 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);
 }
 
 static void
 interface_do_free(struct interface *iface)
 {
+	interface_event(iface, IFEV_FREE);
 	interface_cleanup(iface, false);
 	free(iface->config);
 	netifd_ubus_remove_interface(iface);
@@ -227,6 +276,7 @@ interface_do_free(struct interface *iface)
 static void
 interface_do_reload(struct interface *iface)
 {
+	interface_event(iface, IFEV_RELOAD);
 	interface_cleanup(iface, true);
 	proto_init_interface(iface, iface->config);
 	interface_claim_device(iface);
@@ -272,8 +322,6 @@ 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);
 		interface_handle_config_change(iface);
 		break;
@@ -282,8 +330,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 			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;
 	}
@@ -316,12 +363,11 @@ interface_init(struct interface *iface, const char *name,
 	INIT_LIST_HEAD(&iface->errors);
 	INIT_LIST_HEAD(&iface->users);
 	INIT_LIST_HEAD(&iface->hotplug_list);
-	interface_ip_init(&iface->proto_ip, iface);
-	interface_ip_init(&iface->config_ip, iface);
+	interface_ip_init(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));
@@ -354,6 +400,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)
 {
@@ -390,7 +476,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;
 }
@@ -471,15 +557,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
@@ -516,11 +594,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: