#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <ctype.h>
#include "netifd.h"
#include "system.h"
+static struct blob_buf b;
+
struct vlan_device {
struct device dev;
struct device_user dep;
free(vldev);
}
+static int
+__vlan_hotplug_op(struct device *dev, struct device *member, struct blob_attr *vlan, bool add)
+{
+ struct vlan_device *vldev = container_of(dev, struct vlan_device, dev);
+ void *a;
+
+ dev = vldev->dep.dev;
+ if (!dev || !dev->hotplug_ops)
+ return UBUS_STATUS_NOT_SUPPORTED;
+
+ blob_buf_init(&b, 0);
+ a = blobmsg_open_array(&b, "vlans");
+ blobmsg_printf(&b, NULL, "%d:u", vldev->id);
+ if (vlan && blobmsg_len(vlan))
+ blob_put_raw(&b, blobmsg_data(vlan), blobmsg_len(vlan));
+ blobmsg_close_array(&b, a);
+
+ if (add)
+ return dev->hotplug_ops->add(dev, member, blobmsg_data(b.head));
+ else
+ return dev->hotplug_ops->del(dev, member, blobmsg_data(b.head));
+}
+
+static int
+vlan_hotplug_add(struct device *dev, struct device *member, struct blob_attr *vlan)
+{
+ return __vlan_hotplug_op(dev, member, vlan, true);
+}
+
+static int
+vlan_hotplug_del(struct device *dev, struct device *member, struct blob_attr *vlan)
+{
+ return __vlan_hotplug_op(dev, member, vlan, false);
+}
+
+static int
+vlan_hotplug_prepare(struct device *dev, struct device **bridge_dev)
+{
+ struct vlan_device *vldev = container_of(dev, struct vlan_device, dev);
+
+ dev = vldev->dep.dev;
+ if (!dev || !dev->hotplug_ops)
+ return UBUS_STATUS_NOT_SUPPORTED;
+
+ return dev->hotplug_ops->prepare(dev, bridge_dev);
+}
+
+static void vlan_hotplug_check(struct vlan_device *vldev, struct device *dev)
+{
+ static const struct device_hotplug_ops hotplug_ops = {
+ .prepare = vlan_hotplug_prepare,
+ .add = vlan_hotplug_add,
+ .del = vlan_hotplug_del
+ };
+
+ if (!dev || !dev->hotplug_ops || avl_is_empty(&dev->vlans.avl)) {
+ vldev->dev.hotplug_ops = NULL;
+ return;
+ }
+
+ vldev->dev.hotplug_ops = &hotplug_ops;
+}
+
+
static int vlan_set_device_state(struct device *dev, bool up)
{
struct vlan_device *vldev;
static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
{
- char name[IFNAMSIZ + 1];
+ char name[IFNAMSIZ];
struct vlan_device *vldev;
vldev = container_of(dep, struct vlan_device, dep);
device_set_present(&vldev->dev, false);
break;
case DEV_EVENT_UPDATE_IFNAME:
+ vlan_hotplug_check(vldev, dep->dev);
vldev->dev.hidden = dep->dev->hidden;
if (snprintf(name, sizeof(name), "%s.%d", dep->dev->ifname,
- vldev->id) >= sizeof(name) - 1 ||
+ vldev->id) >= (int)sizeof(name) - 1 ||
device_set_ifname(&vldev->dev, name))
free_vlan_if(&vldev->dev);
break;
}
}
-static struct device *get_vlan_device(struct device *dev, int id, bool create)
+static void
+vlan_config_init(struct device *dev)
+{
+ struct vlan_device *vldev;
+
+ vldev = container_of(dev, struct vlan_device, dev);
+ vlan_hotplug_check(vldev, vldev->dep.dev);
+}
+
+static struct device *get_vlan_device(struct device *dev, char *id_str, bool create)
{
static struct device_type vlan_type = {
.name = "VLAN",
.config_params = &device_attr_list,
+ .config_init = vlan_config_init,
.free = free_vlan_if,
};
struct vlan_device *vldev;
struct device_user *dep;
- char name[IFNAMSIZ + 1];
+ char name[IFNAMSIZ];
+ char *err = NULL;
+ int id, *alias_id;
+
+ id = strtoul(id_str, &err, 10);
+ if (err && *err) {
+ alias_id = kvlist_get(&dev->vlan_aliases, id_str);
+ if (!alias_id)
+ return NULL;
+
+ id = *alias_id;
+ }
/* look for an existing interface before creating a new one */
list_for_each_entry(dep, &dev->users.list, list.list) {
if (!create)
return NULL;
- if (snprintf(name, sizeof(name), "%s.%d", dev->ifname, id) >= sizeof(name) - 1)
+ if (snprintf(name, sizeof(name), "%s.%d", dev->ifname, id) >= (int)sizeof(name) - 1)
return NULL;
D(DEVICE, "Create vlan device '%s'\n", name);
goto error;
vldev->dev.default_config = true;
+ vldev->dev.config_pending = true;
vldev->set_state = vldev->dev.set_state;
vldev->dev.set_state = vlan_set_device_state;
vldev->dep.cb = vlan_dev_cb;
+ vlan_hotplug_check(vldev, vldev->dep.dev);
device_add_user(&vldev->dep, dev);
return &vldev->dev;
{
s = strchr(s, '.');
if (!s)
- goto out;
+ return NULL;
*s = 0;
s++;
-out:
return s;
}
-struct device *get_vlan_device_chain(const char *ifname, bool create)
+struct device *get_vlan_device_chain(const char *ifname, int create)
{
- struct device *dev = NULL;
- char *buf, *s, *next, *err = NULL;
- int id;
+ struct device *dev = NULL, *vldev;
+ char *buf, *s, *next;
buf = strdup(ifname);
if (!buf)
return NULL;
s = split_vlan(buf);
- dev = device_get(buf, create);
- if (!dev)
- goto error;
+ dev = __device_get(buf, create, false);
+ if (!dev || !s)
+ goto out;
- do {
+ /* for the first split, we need to check if we're using an alias or
+ * if the . separator isn't being used as a vlan separator (e.g. for
+ * AP WDS VLANs */
+ if (!isdigit(s[0])) {
next = split_vlan(s);
- id = strtoul(s, &err, 10);
- if (err && *err)
- goto error;
+ vldev = get_vlan_device(dev, s, create);
+ if (!vldev) {
+ s[-1] = '.';
+ dev = __device_get(buf, create, false);
+ if (!dev)
+ goto out;
+
+ if (next)
+ next[-1] = '.';
+ } else {
+ dev = vldev;
+ s = next;
+ }
+ }
+
- dev = get_vlan_device(dev, id, create);
+ while (s) {
+ next = split_vlan(s);
+ dev = get_vlan_device(dev, s, create);
if (!dev)
- goto error;
+ break;
s = next;
- if (!s)
- goto out;
- } while (1);
+ }
-error:
- dev = NULL;
out:
free(buf);
return dev;
projects / project / netifd.git / blobdiff