netifd: vxlan: add aging and maxaddress options

[project/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index 1e0628003d890420c5f735b90cc9c4c9229e3731..6270d95d755de7caa55dae420f2aa8379e83372b 100644 (file)
--- 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>
@@ -37,7 +50,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
        }
 
        ret = device_claim(&vldev->dep);
-       if (ret)
+       if (ret < 0)
                return ret;
 
        system_vlan_add(vldev->dep.dev, vldev->id);
@@ -50,6 +63,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
 
 static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
 {
+       char name[IFNAMSIZ + 1];
        struct vlan_device *vldev;
 
        vldev = container_of(dep, struct vlan_device, dep);
@@ -60,6 +74,17 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
        case DEV_EVENT_REMOVE:
                device_set_present(&vldev->dev, false);
                break;
+       case DEV_EVENT_UPDATE_IFNAME:
+               vldev->dev.hidden = dep->dev->hidden;
+               if (snprintf(name, sizeof(name), "%s.%d", dep->dev->ifname,
+                            vldev->id) >= sizeof(name) - 1 ||
+                   device_set_ifname(&vldev->dev, name))
+                       free_vlan_if(&vldev->dev);
+               break;
+       case DEV_EVENT_TOPO_CHANGE:
+               /* Propagate topo changes */
+               device_broadcast_event(&vldev->dev, DEV_EVENT_TOPO_CHANGE);
+               break;
        default:
                break;
        }
@@ -67,16 +92,17 @@ 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;
+       char name[IFNAMSIZ + 1];
 
        /* 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;
 
@@ -90,21 +116,36 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        if (!create)
                return NULL;
 
+       if (snprintf(name, sizeof(name), "%s.%d", dev->ifname, id) >= sizeof(name) - 1)
+               return NULL;
+
+       D(DEVICE, "Create vlan device '%s'\n", name);
+
        vldev = calloc(1, sizeof(*vldev));
-       snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
+       if (!vldev)
+               return NULL;
+
+       vldev->id = id;
+       vldev->dev.hidden = dev->hidden;
+       strcpy(vldev->dev.ifname, name);
+
+       if (device_init(&vldev->dev, &vlan_type, NULL) < 0)
+               goto error;
 
-       device_init(&vldev->dev, &vlan_type, NULL);
        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);
 
        return &vldev->dev;
+
+error:
+       device_cleanup(&vldev->dev);
+       free(vldev);
+       return NULL;
 }
 
 static char *split_vlan(char *s)
@@ -132,7 +173,7 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
 
        s = split_vlan(buf);
        dev = device_get(buf, create);
-       if (!dev && !create)
+       if (!dev)
                goto error;
 
        do {