+/*
+ * 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>
#include "config.h"
static struct avl_tree devices;
-static struct avl_tree aliases;
-
-struct alias_device {
- struct avl_node avl;
- struct device dev;
- struct device_user dep;
- bool cleanup;
- char name[];
-};
-
-static const struct device_type alias_device_type;
static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
[DEV_ATTR_TYPE] = { "type", BLOBMSG_TYPE_STRING },
{
if (dev->parent.dev)
device_remove_user(&dev->parent);
- device_cleanup(dev);
free(dev);
}
.free = simple_device_free,
};
-static int
-alias_device_set_state(struct device *dev, bool state)
-{
- struct alias_device *alias;
-
- alias = container_of(dev, struct alias_device, dev);
- if (!alias->dep.dev)
- return -1;
-
- if (state)
- return device_claim(&alias->dep);
-
- device_release(&alias->dep);
- if (alias->cleanup)
- device_remove_user(&alias->dep);
- return 0;
-}
-
-static struct device *
-alias_device_create(const char *name, struct blob_attr *attr)
-{
- struct alias_device *alias;
-
- alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
- strcpy(alias->name, name);
- alias->dev.set_state = alias_device_set_state;
- device_init_virtual(&alias->dev, &alias_device_type, NULL);
- alias->avl.key = alias->name;
- avl_insert(&aliases, &alias->avl);
-
- return &alias->dev;
-}
-
-static void alias_device_free(struct device *dev)
-{
- struct alias_device *alias;
-
- device_cleanup(dev);
-
- alias = container_of(dev, struct alias_device, dev);
- avl_delete(&aliases, &alias->avl);
- free(alias);
-}
-
-static const struct device_type alias_device_type = {
- .name = "Network alias",
- .create = alias_device_create,
- .free = alias_device_free,
-};
-
static void
device_merge_settings(struct device *dev, struct device_settings *n)
{
static void __init dev_init(void)
{
avl_init(&devices, avl_strcmp, true, NULL);
- avl_init(&aliases, avl_strcmp, false, NULL);
}
-static 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;
- list_for_each_entry_safe(dep, tmp, &dev->users, list) {
+ list_for_each_entry_safe(dep, tmp, head, list) {
if (!dep->cb)
continue;
}
}
-void
-alias_notify_device(const char *name, struct device *dev)
+void device_broadcast_event(struct device *dev, enum device_event ev)
{
- struct alias_device *alias;
-
- device_lock();
-
- alias = avl_find_element(&aliases, name, alias, avl);
- if (!alias)
- return;
-
- alias->cleanup = !dev;
- if (dev) {
- if (dev != alias->dep.dev) {
- device_remove_user(&alias->dep);
- strcpy(alias->dev.ifname, dev->ifname);
- device_add_user(&alias->dep, dev);
- }
- }
-
- device_set_present(&alias->dev, !!dev);
-
- if (!dev && alias->dep.dev && !alias->dep.dev->active)
- device_remove_user(&alias->dep);
-
- device_unlock();
+ __device_broadcast_event(&dev->aliases, ev);
+ __device_broadcast_event(&dev->users, ev);
}
int device_claim(struct device_user *dep)
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)
+ dev->set_state = set_device_state;
}
int device_init(struct device *dev, const struct device_type *type, const char *ifname)
device_init_virtual(dev, type, ifname);
- if (!dev->set_state)
- dev->set_state = set_device_state;
-
dev->avl.key = dev->ifname;
ret = avl_insert(&devices, &dev->avl);
{
struct device *dev;
+ if (!external && system_if_force_external(name))
+ return NULL;
+
D(DEVICE, "Create simple device '%s'\n", name);
dev = calloc(1, sizeof(*dev));
dev->external = external;
return dev;
}
-static struct device *
-device_alias_get(const char *name)
-{
- struct alias_device *alias;
-
- alias = avl_find_element(&aliases, name, alias, avl);
- if (alias)
- return &alias->dev;
-
- return alias_device_create(name, NULL);
-}
-
struct device *
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;
device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
}
-void device_set_present(struct device *dev, bool state)
+void
+device_refresh_present(struct device *dev)
{
- if (dev->sys_present == state)
- return;
+ bool state = dev->sys_present;
- dev->sys_present = state;
- D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
-
- if (state && dev->disabled)
- return;
+ if (dev->disabled || dev->deferred)
+ state = false;
__device_set_present(dev, state);
}
-void
-device_set_disabled(struct device *dev, bool value)
+void device_set_present(struct device *dev, bool state)
{
- dev->disabled = value;
- if (dev->sys_present)
- __device_set_present(dev, !value);
+ if (dev->sys_present == state)
+ return;
+
+ D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+ dev->sys_present = state;
+ device_refresh_present(dev);
}
void device_add_user(struct device_user *dep, struct device *dev)
{
+ struct list_head *head;
+
if (dep->dev)
device_remove_user(dep);
+ if (!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);
+
if (dep->cb && dev->present) {
dep->cb(dep, DEV_EVENT_ADD);
if (dev->active)
{
__devlock++;
free(dev->config);
+ device_cleanup(dev);
dev->type->free(dev);
__devlock--;
}
return;
}
+ blobmsg_add_u8(b, "external", dev->external);
+ blobmsg_add_u8(b, "present", dev->present);
+ blobmsg_add_string(b, "type", dev->type->name);
+
if (!dev->present)
return;
- blobmsg_add_string(b, "type", dev->type->name);
blobmsg_add_u8(b, "up", !!dev->active);
if (dev->type->dump_info)
dev->type->dump_info(dev, b);
projects / project / netifd.git / blobdiff