X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=9ef444e88a233f615c320fe3f3ec65d7f10d2f0b;hp=34ad9adb1603c19558d02851b4064a8fcec72d2e;hb=b8688d2960c998b60713deeff7df1603f7a8bd3e;hpb=4bf10a76e01d2f2971a86765722a4c4a65b584a7

diff --git a/device.c b/device.c
index 34ad9ad..9ef444e 100644
--- a/device.c
+++ b/device.c
@@ -180,16 +180,36 @@ static void __init dev_init(void)
 	avl_init(&devices, avl_strcmp, true, NULL);
 }
 
-void device_broadcast_event(struct device *dev, enum device_event ev)
+
+static void __device_broadcast_event(struct list_head *head, enum device_event ev)
 {
-	struct device_user *dep, *tmp;
+	struct device_user *dep;
+	static uint8_t idx[__DEV_EVENT_MAX];
+	bool found;
 
-	list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-		if (!dep->cb)
-			continue;
+	idx[ev]++;
+	do {
+		found = false;
 
-		dep->cb(dep, ev);
-	}
+		list_for_each_entry(dep, head, list) {
+			if (!dep->cb)
+				continue;
+
+			if (dep->ev_idx[ev] == idx[ev])
+				continue;
+
+			dep->cb(dep, ev);
+			dep->ev_idx[ev] = idx[ev];
+			found = true;
+			break;
+		}
+	} while (found);
+}
+
+void device_broadcast_event(struct device *dev, enum device_event ev)
+{
+	__device_broadcast_event(&dev->aliases, ev);
+	__device_broadcast_event(&dev->users, ev);
 }
 
 int device_claim(struct device_user *dep)
@@ -257,6 +277,7 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
 
 	D(DEVICE, "Initialize device '%s'\n", dev->ifname);
 	INIT_LIST_HEAD(&dev->users);
+	INIT_LIST_HEAD(&dev->aliases);
 	dev->type = type;
 
 	if (!dev->set_state)
@@ -310,8 +331,13 @@ device_get(const char *name, int create)
 		return device_alias_get(name + 1);
 
 	dev = avl_find_element(&devices, name, dev, avl);
-	if (dev)
+	if (dev) {
+		if (create > 1 && !dev->external) {
+			dev->external = true;
+			device_set_present(dev, true);
+		}
 		return dev;
+	}
 
 	if (!create)
 		return NULL;
@@ -376,8 +402,21 @@ void device_set_present(struct device *dev, bool state)
 	device_refresh_present(dev);
 }
 
+static int device_refcount(struct device *dev)
+{
+	struct list_head *list;
+	int count = 0;
+
+	list_for_each(list, &dev->users)
+		count++;
+
+	return count;
+}
+
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+	struct list_head *head;
+
 	if (dep->dev)
 		device_remove_user(dep);
 
@@ -385,7 +424,14 @@ void device_add_user(struct device_user *dep, struct device *dev)
 		return;
 
 	dep->dev = dev;
-	list_add_tail(&dep->list, &dev->users);
+
+	if (dep->alias)
+		head = &dev->aliases;
+	else
+		head = &dev->users;
+	list_add_tail(&dep->list, head);
+	D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
+
 	if (dep->cb && dev->present) {
 		dep->cb(dep, DEV_EVENT_ADD);
 		if (dev->active)
@@ -425,6 +471,7 @@ void device_remove_user(struct device_user *dep)
 
 	list_del(&dep->list);
 	dep->dev = NULL;
+	D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
 	__device_free_unused(dev);
 }
 
@@ -550,6 +597,10 @@ device_create(const char *name, const struct device_type *type,
 	if (odev) {
 		odev->current_config = true;
 		change = device_set_config(odev, type, config);
+		if (odev->external) {
+			system_if_apply_settings(odev, &odev->settings);
+			change = DEV_CONFIG_APPLIED;
+		}
 		switch (change) {
 		case DEV_CONFIG_RESTART:
 		case DEV_CONFIG_APPLIED:
@@ -624,7 +675,7 @@ device_dump_status(struct blob_buf *b, struct device *dev)
 		if (st.flags & DEV_OPT_MTU)
 			blobmsg_add_u32(b, "mtu", st.mtu);
 		if (st.flags & DEV_OPT_MACADDR)
-			blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+			blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
 		if (st.flags & DEV_OPT_TXQUEUELEN)
 			blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
 	}