X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=7104750e27d9fdb25a31f045115a6661acf2ad65;hp=9c208a283e40a2da7716651922aaa0b0a4e44b58;hb=5df59a6cf9fd307378bd5cbea809a22f6de9f33d;hpb=134775b1f41fa19a816768268b9d0f8dad86bd90

diff --git a/interface.c b/interface.c
index 9c208a2..7104750 100644
--- a/interface.c
+++ b/interface.c
@@ -26,7 +26,6 @@
 
 struct vlist_tree interfaces;
 static LIST_HEAD(iface_all_users);
-static unsigned int interface_serial = 0;
 
 enum {
 	IFACE_ATTR_IFNAME,
@@ -151,15 +150,23 @@ interface_add_data(struct interface *iface, const struct blob_attr *data)
 	if (!blobmsg_check_attr(data, true))
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	n = calloc(1, sizeof(*n) + blob_pad_len(data));
-	memcpy(n->data, data, blob_pad_len(data));
-	n->node.key = blobmsg_name(n->data);
+	const char *name = blobmsg_name(data);
+	unsigned len = blob_pad_len(data);
+
+	o = avl_find_element(&iface->data, name, o, node);
+	if (o) {
+		if (blob_pad_len(o->data) == len && !memcmp(o->data, data, len))
+			return 0;
 
-	o = avl_find_element(&iface->data, n->node.key, o, node);
-	if (o)
 		interface_data_del(iface, o);
+	}
 
+	n = calloc(1, sizeof(*n) + len);
+	memcpy(n->data, data, len);
+	n->node.key = blobmsg_name(n->data);
 	avl_insert(&iface->data, &n->node);
+
+	iface->updated |= IUF_DATA;
 	return 0;
 }
 
@@ -200,6 +207,9 @@ mark_interface_down(struct interface *iface)
 {
 	enum interface_state state = iface->state;
 
+	if (state == IFS_DOWN)
+		return;
+
 	iface->state = IFS_DOWN;
 	if (state == IFS_UP)
 		interface_event(iface, IFEV_DOWN);
@@ -212,42 +222,118 @@ mark_interface_down(struct interface *iface)
 void
 __interface_set_down(struct interface *iface, bool force)
 {
-	if (iface->state == IFS_DOWN ||
-		iface->state == IFS_TEARDOWN)
+	enum interface_state state = iface->state;
+	switch (state) {
+	case IFS_UP:
+	case IFS_SETUP:
+		iface->state = IFS_TEARDOWN;
+		if (state == IFS_UP)
+			interface_event(iface, IFEV_DOWN);
+
+		interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+		if (force)
+			interface_flush_state(iface);
+
+		if (iface->dynamic)
+			vlist_delete(&interfaces, &iface->node);
+		break;
+
+	case IFS_DOWN:
+		if (iface->main_dev.dev)
+			device_release(&iface->main_dev);
+	case IFS_TEARDOWN:
+	default:
+		break;
+	}
+}
+
+static int
+__interface_set_up(struct interface *iface)
+{
+	int ret;
+
+	netifd_log_message(L_NOTICE, "Interface '%s' is setting up now\n", iface->name);
+
+	iface->state = IFS_SETUP;
+	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+	if (ret)
+		mark_interface_down(iface);
+
+	return ret;
+}
+
+static void
+interface_check_state(struct interface *iface)
+{
+	switch (iface->state) {
+	case IFS_UP:
+		if (!iface->enabled || !iface->link_state) {
+			mark_interface_down(iface);
+			interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+		}
+		break;
+	case IFS_DOWN:
+		if (iface->autostart && iface->enabled && iface->link_state && !config_init)
+			__interface_set_up(iface);
+		break;
+	default:
+		break;
+	}
+}
+
+static void
+interface_set_enabled(struct interface *iface, bool new_state)
+{
+	if (iface->enabled == new_state)
 		return;
 
-	if (iface->state == IFS_UP)
-		interface_event(iface, IFEV_DOWN);
-	iface->state = IFS_TEARDOWN;
-	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
-	if (force)
-		interface_flush_state(iface);
+	netifd_log_message(L_NOTICE, "Interface '%s' is %s\n", iface->name, new_state ? "enabled" : "disabled");
+	iface->enabled = new_state;
+	interface_check_state(iface);
+}
+
+static void
+interface_set_link_state(struct interface *iface, bool new_state)
+{
+	if (iface->link_state == new_state)
+		return;
 
-	if (iface->dynamic)
-		vlist_delete(&interfaces, &iface->node);
+	netifd_log_message(L_NOTICE, "Interface '%s' has link connectivity %s\n", iface->name, new_state ? "" : "loss");
+	iface->link_state = new_state;
+	interface_check_state(iface);
 }
 
 static void
 interface_cb(struct device_user *dep, enum device_event ev)
 {
 	struct interface *iface;
-	bool new_state;
+	bool new_state = false;
 
 	iface = container_of(dep, struct interface, main_dev);
 	switch (ev) {
 	case DEV_EVENT_ADD:
 		new_state = true;
-		break;
 	case DEV_EVENT_REMOVE:
-		new_state = false;
+		interface_set_available(iface, new_state);
+		if (!new_state && dep->dev->external)
+			interface_set_main_dev(iface, NULL);
 		break;
-	default:
+	case DEV_EVENT_UP:
+		new_state = true;
+	case DEV_EVENT_DOWN:
+		interface_set_enabled(iface, new_state);
+		break;
+	case DEV_EVENT_LINK_UP:
+		new_state = true;
+        case DEV_EVENT_LINK_DOWN:
+		interface_set_link_state(iface, new_state);
+		break;
+	case DEV_EVENT_TOPO_CHANGE:
+		interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
 		return;
+	default:
+		break;
 	}
-
-	interface_set_available(iface, new_state);
-	if (!new_state && dep->dev->external)
-		interface_set_main_dev(iface, NULL);
 }
 
 void
@@ -506,6 +592,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		mark_interface_down(iface);
 		if (iface->main_dev.dev)
 			device_release(&iface->main_dev);
+		if (iface->l3_dev.dev)
+			device_remove_user(&iface->l3_dev);
 		interface_handle_config_change(iface);
 		break;
 	case IFPEV_LINK_LOST:
@@ -516,6 +604,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		mark_interface_down(iface);
 		iface->state = IFS_SETUP;
 		break;
+	default:
+		return;
 	}
 
 	interface_write_resolv_conf();
@@ -597,13 +687,6 @@ interface_alloc(const char *name, struct blob_attr *config)
 			DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
 	}
 
-	// Set a default exteranl routing table for IPv6 to do source-based-filtering
-	struct interface *iface_old = vlist_find(&interfaces, name, iface_old, node);
-	if (iface_old && iface_old->ip6table > 1000 && iface_old->ip6table < 2000)
-		iface->ip6table = iface_old->ip6table;
-	else
-		iface->ip6table = 1000 + ++interface_serial;
-
 	if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
 			DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
@@ -684,7 +767,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 void
 interface_set_main_dev(struct interface *iface, struct device *dev)
 {
-	bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev);
+	bool set_l3 = (!dev || iface->main_dev.dev == iface->l3_dev.dev);
 	bool claimed = iface->l3_dev.claimed;
 
 	if (iface->main_dev.dev == dev)
@@ -694,8 +777,10 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
 		interface_set_l3_dev(iface, dev);
 
 	device_add_user(&iface->main_dev, dev);
-	if (!dev)
+	if (!dev) {
+		interface_set_link_state(iface, false);
 		return;
+	}
 
 	if (claimed)
 		device_claim(&iface->l3_dev);
@@ -764,7 +849,7 @@ interface_handle_link(struct interface *iface, const char *name, bool add)
 		if (iface->device_config)
 			device_set_config(dev, &simple_device_type, iface->config);
 
-		system_if_apply_settings(dev, &dev->settings);
+		system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 		ret = interface_add_link(iface, dev);
 	} else {
 		ret = interface_remove_link(iface, dev);
@@ -794,18 +879,13 @@ interface_set_up(struct interface *iface)
 
 	if (iface->main_dev.dev) {
 		ret = device_claim(&iface->main_dev);
-		if (ret)
-			return ret;
-	}
-
-	iface->state = IFS_SETUP;
-	ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
-	if (ret) {
-		mark_interface_down(iface);
-		return ret;
+		if (!ret)
+			interface_check_state(iface);
 	}
+	else
+		ret = __interface_set_up(iface);
 
-	return 0;
+	return ret;
 }
 
 int
@@ -846,6 +926,7 @@ set_config_state(struct interface *iface, enum interface_config_state s)
 void
 interface_update_start(struct interface *iface)
 {
+	iface->updated = 0;
 	interface_ip_update_start(&iface->proto_ip);
 }