#include "netifd.h"
#include "device.h"
#include "interface.h"
+#include "interface-ip.h"
#include "proto.h"
#include "ubus.h"
#include "config.h"
-static LIST_HEAD(interfaces);
+struct vlist_tree interfaces;
enum {
IFACE_ATTR_IFNAME,
IFACE_ATTR_MAX
};
-static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
- [IFACE_ATTR_IFNAME].type = BLOBMSG_TYPE_STRING,
-};
-
static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
const struct config_param_list interface_attr_list = {
.n_params = IFACE_ATTR_MAX,
.params = iface_attrs,
- .info = iface_attr_info,
};
static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
{
struct interface_error *error, *tmp;
static void
mark_interface_down(struct interface *iface)
{
- interface_del_ctx_addr(iface, NULL);
- device_release(iface->main_dev.dev);
+ vlist_flush_all(&iface->proto_addr);
+ vlist_flush_all(&iface->proto_route);
+ if (iface->main_dev.dev)
+ device_release(&iface->main_dev);
iface->state = IFS_DOWN;
}
if (iface->state != IFS_DOWN)
return 0;
- ret = device_claim(iface->main_dev.dev);
- if (ret)
- return ret;
+ if (iface->main_dev.dev) {
+ ret = device_claim(&iface->main_dev);
+ if (ret)
+ return ret;
+ }
iface->state = IFS_SETUP;
ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
static void
__interface_set_down(struct interface *iface, bool force)
{
- clear_interface_errors(iface);
+ interface_clear_errors(iface);
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
iface->state = IFS_TEARDOWN;
interface_event(iface, IFEV_DOWN);
-
- interface_del_all_routes(iface);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
}
return;
}
- if (iface->active == new_state)
+ interface_set_available(iface, new_state);
+}
+
+void
+interface_set_available(struct interface *iface, bool new_state)
+{
+ if (iface->available == new_state)
return;
- iface->active = new_state;
+ D(INTERFACE, "Interface '%s', available=%d\n", iface->name, new_state);
+ iface->available = new_state;
if (new_state) {
if (iface->autostart && !config_init)
}
static void
+interface_claim_device(struct interface *iface)
+{
+ struct device *dev;
+
+ if (iface->proto_handler &&
+ !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
+ dev = device_get(iface->ifname, true);
+ if (dev)
+ device_add_user(&iface->main_dev, dev);
+ }
+}
+
+
+static void
+interface_cleanup(struct interface *iface)
+{
+ interface_clear_errors(iface);
+ if (iface->main_dev.dev)
+ device_remove_user(&iface->main_dev);
+ interface_set_proto_state(iface, NULL);
+}
+
+static void
+interface_do_free(struct interface *iface)
+{
+ interface_cleanup(iface);
+ free(iface->config);
+ netifd_ubus_remove_interface(iface);
+ free(iface);
+}
+
+static void
+interface_do_reload(struct interface *iface)
+{
+ interface_cleanup(iface);
+
+ interface_claim_device(iface);
+ proto_init_interface(iface, iface->config);
+
+ if (iface->autostart)
+ interface_set_up(iface);
+}
+
+static void
+interface_handle_config_change(struct interface *iface)
+{
+ switch(iface->config_state) {
+ case IFC_NORMAL:
+ break;
+ case IFC_RELOAD:
+ interface_do_reload(iface);
+ break;
+ case IFC_REMOVE:
+ interface_do_free(iface);
+ break;
+ }
+}
+
+static void
interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev)
{
struct interface *iface = state->iface;
return;
mark_interface_down(iface);
+ interface_handle_config_change(iface);
+ break;
+ case IFPEV_LINK_LOST:
+ if (iface->state != IFS_UP)
+ return;
+
+ iface->state = IFS_SETUP;
+ interface_event(iface, IFEV_DOWN);
break;
}
}
void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
{
if (iface->proto) {
- interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, true);
iface->proto->free(iface->proto);
iface->proto = NULL;
}
state->iface = iface;
}
-struct interface *
-interface_alloc(const char *name, struct uci_section *s, struct blob_attr *attr)
+void
+interface_init(struct interface *iface, const char *name,
+ struct blob_attr *config)
{
- struct interface *iface;
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
- struct device *dev;
-
- iface = interface_get(name);
- if (iface)
- return iface;
+ const char *proto_name = NULL;
- iface = calloc(1, sizeof(*iface));
- iface->main_dev.cb = interface_cb;
- iface->l3_iface = &iface->main_dev;
strncpy(iface->name, name, sizeof(iface->name) - 1);
- list_add(&iface->list, &interfaces);
INIT_LIST_HEAD(&iface->errors);
- INIT_LIST_HEAD(&iface->address);
- INIT_LIST_HEAD(&iface->routes);
-
- proto_attach_interface(iface, s);
- netifd_ubus_add_interface(iface);
+ iface->main_dev.cb = interface_cb;
+ iface->l3_dev = &iface->main_dev;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
- blob_data(attr), blob_len(attr));
+ blob_data(config), blob_len(config));
- if ((cur = tb[IFACE_ATTR_IFNAME])) {
- dev = device_get(blobmsg_data(cur), true);
- if (dev)
- device_add_user(&iface->main_dev, dev);
- }
+ if ((cur = tb[IFACE_ATTR_PROTO]))
+ proto_name = blobmsg_data(cur);
- return iface;
+ proto_attach_interface(iface, proto_name);
+
+ if ((cur = tb[IFACE_ATTR_AUTO]))
+ iface->autostart = blobmsg_get_bool(cur);
+ else
+ iface->autostart = true;
+ iface->config_autostart = iface->autostart;
}
void
-interface_free(struct interface *iface)
+interface_add(struct interface *iface, struct blob_attr *config)
{
- netifd_ubus_remove_interface(iface);
- list_del(&iface->list);
- if (iface->proto->free)
- iface->proto->free(iface->proto);
- free(iface);
-}
+ struct blob_attr *tb[IFACE_ATTR_MAX];
+ struct blob_attr *cur;
-struct interface *
-interface_get(const char *name)
-{
- struct interface *iface;
+ blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
+ blob_data(config), blob_len(config));
- list_for_each_entry(iface, &interfaces, list) {
- if (!strcmp(iface->name, name))
- return iface;
- }
- return NULL;
+ if ((cur = tb[IFACE_ATTR_IFNAME]))
+ iface->ifname = blobmsg_data(cur);
+
+ iface->config = config;
+ vlist_add(&interfaces, &iface->node);
}
void
{
iface->autostart = true;
- if (!iface->active) {
+ if (!iface->available) {
interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
return -1;
}
int
interface_set_down(struct interface *iface)
{
- iface->autostart = false;
- __interface_set_down(iface, false);
+ if (!iface) {
+ vlist_for_each_element(&interfaces, iface, node)
+ __interface_set_down(iface, false);
+ } else {
+ iface->autostart = false;
+ __interface_set_down(iface, false);
+ }
return 0;
}
{
struct interface *iface;
- list_for_each_entry(iface, &interfaces, list) {
- if (iface->active && iface->autostart)
+ vlist_for_each_element(&interfaces, iface, node) {
+ if (iface->available && iface->autostart)
interface_set_up(iface);
}
}
+
+static void
+set_config_state(struct interface *iface, enum interface_config_state s)
+{
+ iface->config_state = s;
+ if (iface->state == IFS_DOWN)
+ interface_handle_config_change(iface);
+ else
+ __interface_set_down(iface, false);
+}
+
+static void
+interface_change_config(struct interface *if_old, struct interface *if_new)
+{
+ struct blob_attr *old_config = if_old->config;
+
+ interface_clear_errors(if_old);
+ if_old->config = if_new->config;
+ if (!if_old->config_autostart && if_new->config_autostart)
+ if_old->autostart = true;
+
+ if_old->config_autostart = if_new->config_autostart;
+ if_old->ifname = if_new->ifname;
+
+ set_config_state(if_old, IFC_RELOAD);
+ free(old_config);
+ free(if_new);
+}
+
+static void
+interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
+ struct vlist_node *node_old)
+{
+ struct interface *if_old = container_of(node_old, struct interface, node);
+ struct interface *if_new = container_of(node_new, struct interface, node);
+
+ if (node_old && node_new) {
+ D(INTERFACE, "Update interface '%s'\n", if_new->name);
+ interface_change_config(if_old, if_new);
+ } else if (node_old) {
+ D(INTERFACE, "Remove interface '%s'\n", if_old->name);
+ set_config_state(if_old, IFC_REMOVE);
+ } else if (node_new) {
+ D(INTERFACE, "Create interface '%s'\n", if_new->name);
+ interface_claim_device(if_new);
+ proto_init_interface(if_new, if_new->config);
+ interface_ip_init(if_new);
+ netifd_ubus_add_interface(if_new);
+ }
+}
+
+
+static void __init
+interface_init_list(void)
+{
+ vlist_init(&interfaces, avl_strcmp, interface_update,
+ struct interface, node, name);
+ interfaces.keep_old = true;
+ interfaces.no_delete = true;
+}
projects / project / netifd.git / blobdiff