X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=vlan.c;h=067f6245bf487f3661d49cd787017edadccfedec;hp=85fe078eb118f11bf0f6007d2819bbc801105663;hb=HEAD;hpb=170304603e7d905e98301c703ad2ec107b9a774c

diff --git a/vlan.c b/vlan.c
index 85fe078..067f624 100644
--- a/vlan.c
+++ b/vlan.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -32,33 +45,49 @@ static int vlan_set_device_state(struct device *dev, bool up)
 	if (!up) {
 		vldev->set_state(dev, false);
 		system_vlan_del(dev);
-		release_device(vldev->dep.dev);
+		device_release(&vldev->dep);
 		return 0;
 	}
 
-	ret = device_claim(vldev->dep.dev);
-	if (ret)
+	ret = device_claim(&vldev->dep);
+	if (ret < 0)
 		return ret;
 
 	system_vlan_add(vldev->dep.dev, vldev->id);
 	ret = vldev->set_state(dev, true);
 	if (ret)
-		release_device(vldev->dep.dev);
+		device_release(&vldev->dep);
 
 	return ret;
 }
 
+static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
+{
+	char name[IFNAMSIZ];
+
+	vldev->dev.hidden = dev->hidden;
+	snprintf(name, IFNAMSIZ, "%s.%d", dev->ifname, vldev->id);
+	device_set_ifname(&vldev->dev, name);
+}
+
 static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
 {
 	struct vlan_device *vldev;
+	bool new_state = false;
 
 	vldev = container_of(dep, struct vlan_device, dep);
 	switch(ev) {
 	case DEV_EVENT_ADD:
-		device_set_present(&vldev->dev, true);
-		break;
+		new_state = true;
 	case DEV_EVENT_REMOVE:
-		device_set_present(&vldev->dev, false);
+		device_set_present(&vldev->dev, new_state);
+		break;
+	case DEV_EVENT_UPDATE_IFNAME:
+		vlan_dev_set_name(vldev, dep->dev);
+		break;
+	case DEV_EVENT_TOPO_CHANGE:
+		/* Propagate topo changes */
+		device_broadcast_event(&vldev->dev, DEV_EVENT_TOPO_CHANGE);
 		break;
 	default:
 		break;
@@ -67,15 +96,16 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
 
 static struct device *get_vlan_device(struct device *dev, int id, bool create)
 {
-	static const struct device_type vlan_type = {
+	static struct device_type vlan_type = {
 		.name = "VLAN",
+		.config_params = &device_attr_list,
 		.free = free_vlan_if,
 	};
 	struct vlan_device *vldev;
 	struct device_user *dep;
 
 	/* look for an existing interface before creating a new one */
-	list_for_each_entry(dep, &dev->users, list) {
+	list_for_each_entry(dep, &dev->users.list, list.list) {
 		if (dep->cb != vlan_dev_cb)
 			continue;
 
@@ -89,16 +119,22 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
 	if (!create)
 		return NULL;
 
+	D(DEVICE, "Create vlan device '%s.%d'\n", dev->ifname, id);
+
 	vldev = calloc(1, sizeof(*vldev));
-	snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
+	if (!vldev)
+		return NULL;
+
+	vldev->id = id;
 
 	device_init(&vldev->dev, &vlan_type, NULL);
 
+	vlan_dev_set_name(vldev, dev);
+	vldev->dev.default_config = true;
+
 	vldev->set_state = vldev->dev.set_state;
 	vldev->dev.set_state = vlan_set_device_state;
 
-	vldev->id = id;
-
 	vldev->dep.cb = vlan_dev_cb;
 	device_add_user(&vldev->dep, dev);
 
@@ -120,7 +156,7 @@ out:
 
 struct device *get_vlan_device_chain(const char *ifname, bool create)
 {
-	struct device *iface = NULL;
+	struct device *dev = NULL;
 	char *buf, *s, *next, *err = NULL;
 	int id;
 
@@ -129,8 +165,8 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
 		return NULL;
 
 	s = split_vlan(buf);
-	iface = device_get(buf, create);
-	if (!iface && !create)
+	dev = device_get(buf, create);
+	if (!dev)
 		goto error;
 
 	do {
@@ -139,8 +175,8 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
 		if (err && *err)
 			goto error;
 
-		iface = get_vlan_device(iface, id, create);
-		if (!iface)
+		dev = get_vlan_device(dev, id, create);
+		if (!dev)
 			goto error;
 
 		s = next;
@@ -149,8 +185,8 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
 	} while (1);
 
 error:
-	iface = NULL;
+	dev = NULL;
 out:
 	free(buf);
-	return iface;
+	return dev;
 }