X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=b304e00e6a407b251132840e6d664aa6833e6de9;hp=ef7c01c991eaff488f1b6ce71246c7867f6c5dad;hb=56497416cbaece71459f6b710a6c6e79d13a7398;hpb=4fd17ab96b3025a594e0e2ace35882573f571cb8

diff --git a/interface.c b/interface.c
index ef7c01c..b304e00 100644
--- a/interface.c
+++ b/interface.c
@@ -36,6 +36,7 @@ enum {
 	IFACE_ATTR_DNS,
 	IFACE_ATTR_DNS_SEARCH,
 	IFACE_ATTR_METRIC,
+	IFACE_ATTR_INTERFACE,
 	IFACE_ATTR_MAX
 };
 
@@ -48,6 +49,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
 	[IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+	[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
 };
 
 static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
@@ -77,7 +79,7 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 	struct interface_error *error;
 	int i, len = 0;
 	int *datalen = NULL;
-	char *dest;
+	char *dest, *d_subsys, *d_code;
 
 	if (n_data) {
 		len = n_data * sizeof(char *);
@@ -88,13 +90,13 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 		}
 	}
 
-	error = calloc(1, sizeof(*error) + sizeof(char *) + len);
+	error = calloc_a(sizeof(*error) + sizeof(char *) + len,
+		&d_subsys, subsystem ? strlen(subsystem) + 1 : 0,
+		&d_code, code ? strlen(code) + 1 : 0);
 	if (!error)
 		return;
 
 	list_add_tail(&error->list, &iface->errors);
-	error->subsystem = subsystem;
-	error->code = code;
 
 	dest = (char *) &error->data[n_data + 1];
 	for (i = 0; i < n_data; i++) {
@@ -102,7 +104,13 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 		memcpy(dest, data[i], datalen[i]);
 		dest += datalen[i];
 	}
-	error->data[n_data] = NULL;
+	error->data[n_data++] = NULL;
+
+	if (subsystem)
+		error->subsystem = strcpy(d_subsys, subsystem);
+
+	if (code)
+		error->code = strcpy(d_code, code);
 }
 
 static void
@@ -145,19 +153,29 @@ static void
 interface_event(struct interface *iface, enum interface_event ev)
 {
 	struct interface_user *dep, *tmp;
+	struct device *adev = NULL;
 
 	list_for_each_entry_safe(dep, tmp, &iface->users, list)
 		dep->cb(dep, iface, ev);
 
 	list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
 		dep->cb(dep, iface, ev);
+
+	switch (ev) {
+	case IFEV_UP:
+		adev = iface->l3_dev.dev;
+		/* fall through */
+	case IFEV_DOWN:
+		alias_notify_device(iface->name, adev);
+		break;
+	default:
+		break;
+	}
 }
 
 static void
 interface_flush_state(struct interface *iface)
 {
-	if (iface->main_dev.dev)
-		device_release(&iface->main_dev);
 	if (iface->l3_dev.dev)
 		device_release(&iface->l3_dev);
 	interface_data_flush(iface);
@@ -166,20 +184,20 @@ interface_flush_state(struct interface *iface)
 static void
 mark_interface_down(struct interface *iface)
 {
-	if (iface->state == IFS_UP)
+	enum interface_state state = iface->state;
+
+	iface->state = IFS_DOWN;
+	if (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;
 }
 
 void
 __interface_set_down(struct interface *iface, bool force)
 {
-	interface_clear_errors(iface);
-
 	if (iface->state == IFS_DOWN ||
 		iface->state == IFS_TEARDOWN)
 		return;
@@ -211,6 +229,8 @@ interface_cb(struct device_user *dep, enum device_event ev)
 	}
 
 	interface_set_available(iface, new_state);
+	if (!new_state && dep->dev->external)
+		interface_set_main_dev(iface, NULL);
 }
 
 void
@@ -251,43 +271,87 @@ interface_remove_user(struct interface_user *dep)
 }
 
 static void
+interface_alias_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
+{
+	struct interface *alias = container_of(dep, struct interface, parent_iface);
+	struct device *dev = iface->l3_dev.dev;
+
+	switch (ev) {
+	case IFEV_UP:
+		if (!dev)
+			return;
+
+		interface_set_main_dev(alias, dev);
+		interface_set_available(alias, true);
+		break;
+	case IFEV_DOWN:
+		interface_set_available(alias, false);
+		interface_set_main_dev(alias, NULL);
+		break;
+	case IFEV_FREE:
+		interface_remove_user(dep);
+		break;
+	case IFEV_RELOAD:
+		break;
+	}
+}
+
+static void
 interface_claim_device(struct interface *iface)
 {
-	struct device *dev;
+	struct interface *parent;
+	struct device *dev = NULL;
+
+	if (iface->parent_iface.iface)
+		interface_remove_user(&iface->parent_iface);
 
-	if (iface->ifname &&
+	if (iface->parent_ifname) {
+		parent = vlist_find(&interfaces, iface->parent_ifname, parent, node);
+		iface->parent_iface.cb = interface_alias_cb;
+		interface_add_user(&iface->parent_iface, parent);
+	} else if (iface->ifname &&
 		!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
 		dev = device_get(iface->ifname, true);
-		if (dev)
-			interface_set_main_dev(iface, dev);
 	}
+
+	if (dev)
+		interface_set_main_dev(iface, dev);
+
 	if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
 		interface_set_available(iface, true);
 }
 
+static void
+interface_cleanup_state(struct interface *iface)
+{
+	interface_flush_state(iface);
+	interface_clear_errors(iface);
+	interface_set_proto_state(iface, NULL);
+}
 
 static void
-interface_cleanup(struct interface *iface, bool reload)
+interface_cleanup(struct interface *iface)
 {
 	struct interface_user *dep, *tmp;
 
+	if (iface->parent_iface.iface)
+		interface_remove_user(&iface->parent_iface);
+
 	list_for_each_entry_safe(dep, tmp, &iface->users, list)
 		interface_remove_user(dep);
 
 	interface_ip_flush(&iface->config_ip);
-	interface_flush_state(iface);
-	interface_clear_errors(iface);
-	if (iface->main_dev.dev &&
-	    (!reload || !iface->main_dev.hotplug))
+	if (iface->main_dev.dev)
 		interface_set_main_dev(iface, NULL);
-	interface_set_proto_state(iface, NULL);
+
+	interface_cleanup_state(iface);
 }
 
 static void
 interface_do_free(struct interface *iface)
 {
 	interface_event(iface, IFEV_FREE);
-	interface_cleanup(iface, false);
+	interface_cleanup(iface);
 	free(iface->config);
 	netifd_ubus_remove_interface(iface);
 	avl_delete(&interfaces.avl, &iface->node.avl);
@@ -298,7 +362,7 @@ static void
 interface_do_reload(struct interface *iface)
 {
 	interface_event(iface, IFEV_RELOAD);
-	interface_cleanup(iface, true);
+	interface_cleanup_state(iface);
 	proto_init_interface(iface, iface->config);
 	interface_claim_device(iface);
 }
@@ -306,7 +370,10 @@ interface_do_reload(struct interface *iface)
 static void
 interface_handle_config_change(struct interface *iface)
 {
-	switch(iface->config_state) {
+	enum interface_config_state state = iface->config_state;
+
+	iface->config_state = IFC_NORMAL;
+	switch(state) {
 	case IFC_NORMAL:
 		break;
 	case IFC_RELOAD:
@@ -335,7 +402,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		iface->state = IFS_UP;
 		iface->start_time = system_get_rtime();
 		interface_event(iface, IFEV_UP);
-		interface_write_resolv_conf();
 		netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
 		break;
 	case IFPEV_DOWN:
@@ -344,6 +410,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 
 		netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
 		mark_interface_down(iface);
+		if (iface->main_dev.dev)
+			device_release(&iface->main_dev);
 		interface_handle_config_change(iface);
 		break;
 	case IFPEV_LINK_LOST:
@@ -355,6 +423,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve
 		iface->state = IFS_SETUP;
 		break;
 	}
+
+	interface_write_resolv_conf();
 }
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
@@ -416,8 +486,7 @@ interface_init(struct interface *iface, const char *name,
 	iface->config_autostart = iface->autostart;
 }
 
-void
-interface_add(struct interface *iface, struct blob_attr *config)
+static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)
 {
 	struct blob_attr *tb[IFACE_ATTR_MAX];
 	struct blob_attr *cur;
@@ -425,11 +494,36 @@ interface_add(struct interface *iface, struct blob_attr *config)
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
 		      blob_data(config), blob_len(config));
 
-	if ((cur = tb[IFACE_ATTR_IFNAME]))
-		iface->ifname = blobmsg_data(cur);
+	if (alias) {
+		if ((cur = tb[IFACE_ATTR_INTERFACE]))
+			iface->parent_ifname = blobmsg_data(cur);
+
+		if (!iface->parent_ifname)
+			return false;
+	} else {
+		if ((cur = tb[IFACE_ATTR_IFNAME]))
+			iface->ifname = blobmsg_data(cur);
+	}
+
 
 	iface->config = config;
 	vlist_add(&interfaces, &iface->node, iface->name);
+	return true;
+}
+
+void
+interface_add(struct interface *iface, struct blob_attr *config)
+{
+	__interface_add(iface, config, false);
+}
+
+bool
+interface_add_alias(struct interface *iface, struct blob_attr *config)
+{
+	if (iface->proto_handler->flags & PROTO_FLAG_NODEV)
+		return false;
+
+	return __interface_add(iface, config, true);
 }
 
 void
@@ -593,7 +687,7 @@ interface_update_complete(struct interface *iface)
 }
 
 static void
-interface_replace_dns(struct interface_ip_settings *old, struct interface_ip_settings *new)
+interface_replace_dns(struct interface_ip_settings *new, struct interface_ip_settings *old)
 {
 	vlist_simple_replace(&new->dns_servers, &old->dns_servers);
 	vlist_simple_replace(&new->dns_search, &old->dns_search);
@@ -604,6 +698,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 {
 	struct blob_attr *old_config = if_old->config;
 	const char *old_ifname = if_old->ifname;
+	const char *old_parent_ifname = if_old->parent_ifname;
 	const struct proto_handler *proto = if_old->proto_handler;
 
 	interface_clear_errors(if_old);
@@ -611,13 +706,27 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 	if (!if_old->config_autostart && if_new->config_autostart)
 		if_old->autostart = true;
 
+	if_old->device_config = if_new->device_config;
 	if_old->config_autostart = if_new->config_autostart;
 	if_old->ifname = if_new->ifname;
+	if_old->parent_ifname = if_new->parent_ifname;
 	if_old->proto_handler = if_new->proto_handler;
 
-	if ((!!old_ifname != !!if_new->ifname) ||
-	    (old_ifname && strcmp(old_ifname, if_new->ifname) != 0) ||
-	    proto != if_new->proto_handler) {
+	if_old->proto_ip.no_dns = if_new->proto_ip.no_dns;
+	interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
+
+#define FIELD_CHANGED_STR(field)					\
+		((!!if_old->field != !!old_ ## field) ||		\
+		 (old_ ## field &&					\
+		  strcmp(old_ ## field, if_old->field) != 0))
+
+	if (FIELD_CHANGED_STR(parent_ifname)) {
+		if (if_old->parent_iface.iface)
+			interface_remove_user(&if_old->parent_iface);
+		goto reload;
+	}
+
+	if (FIELD_CHANGED_STR(ifname) || proto != if_new->proto_handler) {
 		D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
 		  if_old->name);
 		goto reload;
@@ -646,9 +755,6 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 		interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
 	}
 
-	UPDATE(proto_ip.no_dns);
-	interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
-	interface_replace_dns(&if_old->proto_ip, &if_new->proto_ip);
 	interface_write_resolv_conf();
 
 #undef UPDATE
@@ -658,6 +764,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 reload:
 	set_config_state(if_old, IFC_RELOAD);
 out:
+	if_new->config = NULL;
+	interface_cleanup(if_new);
 	free(old_config);
 	free(if_new);
 }