return ret;
}
-static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
-{
- vldev->dev.hidden = dev->hidden;
- snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, vldev->id);
-}
-
static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
{
+ char name[IFNAMSIZ + 1];
struct vlan_device *vldev;
- bool new_state = false;
vldev = container_of(dep, struct vlan_device, dep);
switch(ev) {
case DEV_EVENT_ADD:
- new_state = true;
- case DEV_EVENT_REMOVE:
- device_set_present(&vldev->dev, new_state);
+ device_set_present(&vldev->dev, true);
break;
- case DEV_EVENT_LINK_UP:
- new_state = true;
- case DEV_EVENT_LINK_DOWN:
- device_set_link(&vldev->dev, new_state);
+ case DEV_EVENT_REMOVE:
+ device_set_present(&vldev->dev, false);
break;
case DEV_EVENT_UPDATE_IFNAME:
- vlan_dev_set_name(vldev, dep->dev);
- device_broadcast_event(&vldev->dev, ev);
+ 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 */
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,
- .keep_link_status = true,
.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.list) {
if (!create)
return NULL;
- D(DEVICE, "Create vlan device '%s.%d'\n", dev->ifname, id);
+ 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));
+ if (!vldev)
+ return NULL;
vldev->id = id;
- vlan_dev_set_name(vldev, dev);
+ vldev->dev.hidden = dev->hidden;
+ strcpy(vldev->dev.ifname, name);
+
+ if (device_init(&vldev->dev, &vlan_type, NULL) < 0)
+ goto error;
- device_init_virtual(&vldev->dev, &vlan_type, NULL);
vldev->dev.default_config = true;
vldev->set_state = vldev->dev.set_state;
device_add_user(&vldev->dep, dev);
return &vldev->dev;
+
+error:
+ device_cleanup(&vldev->dev);
+ free(vldev);
+ return NULL;
}
static char *split_vlan(char *s)