#include "proto.h"
#include "ubus.h"
#include "config.h"
+#include "system.h"
struct vlist_tree interfaces;
+static LIST_HEAD(iface_all_users);
enum {
IFACE_ATTR_IFNAME,
IFACE_ATTR_PROTO,
IFACE_ATTR_AUTO,
+ IFACE_ATTR_DEFAULTROUTE,
+ IFACE_ATTR_METRIC,
IFACE_ATTR_MAX
};
[IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
+ [IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },
+ [IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
};
const struct config_param_list interface_attr_list = {
};
static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
{
struct interface_error *error, *tmp;
}
static void
-interface_event(struct interface *iface, enum interface_event ev)
+interface_data_del(struct interface *iface, struct interface_data *data)
{
- /* TODO */
+ avl_delete(&iface->data, &data->node);
+ free(data);
}
static void
-mark_interface_down(struct interface *iface)
+interface_data_flush(struct interface *iface)
{
- 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;
+ struct interface_data *d, *tmp;
+
+ avl_for_each_element_safe(&iface->data, d, node, tmp)
+ interface_data_del(iface, d);
}
-static int
-__interface_set_up(struct interface *iface)
+int
+interface_add_data(struct interface *iface, const struct blob_attr *data)
{
- int ret;
+ struct interface_data *n, *o;
- if (iface->state != IFS_DOWN)
- return 0;
+ if (!blobmsg_check_attr(data, true))
+ return UBUS_STATUS_INVALID_ARGUMENT;
- if (iface->main_dev.dev) {
- ret = device_claim(&iface->main_dev);
- if (ret)
- return ret;
- }
+ n = calloc(1, sizeof(*data) + blob_pad_len(data));
+ memcpy(n->data, data, blob_pad_len(data));
+ n->node.key = blobmsg_name(data);
- iface->state = IFS_SETUP;
- ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
- if (ret) {
- mark_interface_down(iface);
- return ret;
- }
+ o = avl_find_element(&iface->data, n->node.key, o, node);
+ if (o)
+ interface_data_del(iface, o);
+ avl_insert(&iface->data, &n->node);
return 0;
+}
+
+static void
+interface_event(struct interface *iface, enum interface_event ev)
+{
+ struct interface_user *dep, *tmp;
+
+ list_for_each_entry_safe(dep, tmp, &iface->users, list)
+ dep->cb(dep, iface, ev);
+ list_for_each_entry_safe(dep, tmp, &iface_all_users, list)
+ dep->cb(dep, iface, ev);
}
static void
+interface_flush_state(struct interface *iface)
+{
+ if (iface->main_dev.dev)
+ device_release(&iface->main_dev);
+ if (iface->l3_dev.dev)
+ device_release(&iface->l3_dev);
+ interface_data_flush(iface);
+}
+
+static void
+mark_interface_down(struct interface *iface)
+{
+ if (iface->state == IFS_UP)
+ interface_event(iface, IFEV_DOWN);
+ interface_ip_set_enabled(&iface->config_ip, false);
+ interface_ip_flush(&iface->proto_ip);
+ interface_flush_state(iface);
+ system_flush_routes();
+ iface->state = IFS_DOWN;
+}
+
+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)
return;
+ if (iface->state == IFS_UP)
+ interface_event(iface, IFEV_DOWN);
iface->state = IFS_TEARDOWN;
- interface_event(iface, IFEV_DOWN);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+ if (force)
+ interface_flush_state(iface);
}
static void
if (iface->available == new_state)
return;
+ D(INTERFACE, "Interface '%s', available=%d\n", iface->name, new_state);
iface->available = new_state;
if (new_state) {
__interface_set_down(iface, true);
}
+void
+interface_add_user(struct interface_user *dep, struct interface *iface)
+{
+ if (!iface) {
+ list_add(&dep->list, &iface_all_users);
+ return;
+ }
+
+ dep->iface = iface;
+ list_add(&dep->list, &iface->users);
+ if (iface->state == IFS_UP)
+ dep->cb(dep, iface, IFEV_UP);
+}
+
+void
+interface_remove_user(struct interface_user *dep)
+{
+ list_del_init(&dep->list);
+ dep->iface = NULL;
+}
+
static void
-interface_do_free(struct interface *iface)
+interface_claim_device(struct interface *iface)
{
- if (iface->main_dev.dev)
- device_remove_user(&iface->main_dev);
+ struct device *dev;
+
+ if (iface->ifname &&
+ !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
+ dev = device_get(iface->ifname, true);
+ if (dev)
+ interface_set_main_dev(iface, dev);
+ }
+ if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
+ interface_set_available(iface, true);
+}
+
+
+static void
+interface_cleanup(struct interface *iface, bool reload)
+{
+ struct interface_user *dep, *tmp;
+
+ list_for_each_entry_safe(dep, tmp, &iface->users, list)
+ interface_remove_user(dep);
+
+ interface_ip_flush(&iface->config_ip);
+ interface_flush_state(iface);
+ interface_clear_errors(iface);
+ if (iface->main_dev.dev &&
+ (!reload || !iface->main_dev.hotplug))
+ interface_set_main_dev(iface, NULL);
interface_set_proto_state(iface, NULL);
+}
+
+static void
+interface_do_free(struct interface *iface)
+{
+ interface_event(iface, IFEV_FREE);
+ interface_cleanup(iface, false);
free(iface->config);
netifd_ubus_remove_interface(iface);
+ avl_delete(&interfaces.avl, &iface->node.avl);
free(iface);
}
static void
+interface_do_reload(struct interface *iface)
+{
+ interface_event(iface, IFEV_RELOAD);
+ interface_cleanup(iface, true);
+ proto_init_interface(iface, iface->config);
+ interface_claim_device(iface);
+}
+
+static void
interface_handle_config_change(struct interface *iface)
{
switch(iface->config_state) {
case IFC_NORMAL:
break;
case IFC_RELOAD:
- if (iface->autostart)
- interface_set_up(iface);
+ interface_do_reload(iface);
break;
case IFC_REMOVE:
interface_do_free(iface);
- break;
+ return;
}
+ if (iface->autostart && iface->available)
+ interface_set_up(iface);
}
static void
if (iface->state != IFS_SETUP)
return;
+ interface_ip_set_enabled(&iface->config_ip, true);
+ system_flush_routes();
iface->state = IFS_UP;
+ iface->start_time = system_get_rtime();
interface_event(iface, IFEV_UP);
+ interface_write_resolv_conf();
+ netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name);
break;
case IFPEV_DOWN:
if (iface->state == IFS_DOWN)
return;
+ netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name);
mark_interface_down(iface);
interface_handle_config_change(iface);
break;
if (iface->state != IFS_UP)
return;
+ netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name);
+ mark_interface_down(iface);
iface->state = IFS_SETUP;
- interface_event(iface, IFEV_DOWN);
break;
}
}
strncpy(iface->name, name, sizeof(iface->name) - 1);
INIT_LIST_HEAD(&iface->errors);
+ INIT_LIST_HEAD(&iface->users);
+ INIT_LIST_HEAD(&iface->hotplug_list);
+ interface_ip_init(iface);
+ avl_init(&iface->data, avl_strcmp, false, NULL);
+ iface->config_ip.enabled = false;
iface->main_dev.cb = interface_cb;
- iface->l3_dev = &iface->main_dev;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
proto_attach_interface(iface, proto_name);
- if ((cur = tb[IFACE_ATTR_AUTO]))
- iface->autostart = blobmsg_get_bool(cur);
- else
- iface->autostart = true;
+ iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+ iface->proto_ip.no_defaultroute =
+ !blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
+
iface->config_autostart = iface->autostart;
}
{
struct blob_attr *tb[IFACE_ATTR_MAX];
struct blob_attr *cur;
- struct device *dev;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
- if ((cur = tb[IFACE_ATTR_IFNAME])) {
+ if ((cur = tb[IFACE_ATTR_IFNAME]))
iface->ifname = blobmsg_data(cur);
- 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);
- }
- }
-
iface->config = config;
- vlist_add(&interfaces, &iface->node);
+ vlist_add(&interfaces, &iface->node, iface->name);
}
void
-interface_remove_link(struct interface *iface, struct device *dev)
+interface_set_l3_dev(struct interface *iface, struct device *dev)
{
- struct device *mdev = iface->main_dev.dev;
+ bool enabled = iface->config_ip.enabled;
+ bool claimed = iface->l3_dev.claimed;
- if (mdev && mdev->hotplug_ops) {
- mdev->hotplug_ops->del(mdev, dev);
+ if (iface->l3_dev.dev == dev)
return;
+
+ interface_ip_set_enabled(&iface->config_ip, false);
+ interface_ip_flush(&iface->proto_ip);
+ device_add_user(&iface->l3_dev, dev);
+
+ if (dev) {
+ if (claimed)
+ device_claim(&iface->l3_dev);
+ interface_ip_set_enabled(&iface->config_ip, enabled);
}
+}
+
+void
+interface_set_main_dev(struct interface *iface, struct device *dev)
+{
+ bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev);
+ bool claimed = iface->l3_dev.claimed;
+
+ if (iface->main_dev.dev == dev)
+ return;
+
+ if (set_l3)
+ interface_set_l3_dev(iface, dev);
+
+ device_add_user(&iface->main_dev, dev);
+ if (claimed)
+ device_claim(&iface->l3_dev);
+
+ if (!iface->l3_dev.dev)
+ interface_set_l3_dev(iface, dev);
+}
+
+int
+interface_remove_link(struct interface *iface, struct device *dev)
+{
+ struct device *mdev = iface->main_dev.dev;
+
+ if (mdev && mdev->hotplug_ops)
+ return mdev->hotplug_ops->del(mdev, dev);
+
+ if (!iface->main_dev.hotplug)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if (dev != iface->main_dev.dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
device_remove_user(&iface->main_dev);
+ return 0;
}
int
{
struct device *mdev = iface->main_dev.dev;
- if (mdev && mdev->hotplug_ops)
- return mdev->hotplug_ops->add(mdev, dev);
+ if (mdev == dev)
+ return 0;
- if (iface->main_dev.dev)
- interface_remove_link(iface, NULL);
+ if (iface->main_dev.hotplug)
+ device_remove_user(&iface->main_dev);
- device_add_user(&iface->main_dev, dev);
+ if (mdev) {
+ if (mdev->hotplug_ops)
+ return mdev->hotplug_ops->add(mdev, dev);
+ else
+ return UBUS_STATUS_NOT_SUPPORTED;
+ }
+ interface_set_main_dev(iface, dev);
+ iface->main_dev.hotplug = true;
return 0;
}
int
interface_set_up(struct interface *iface)
{
+ int ret;
+
iface->autostart = true;
+ if (iface->state != IFS_DOWN)
+ return 0;
+
+ interface_clear_errors(iface);
if (!iface->available) {
interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
return -1;
}
- if (iface->state != IFS_DOWN)
- return 0;
+ 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);
+ if (ret) {
+ mark_interface_down(iface);
+ return ret;
+ }
- return __interface_set_up(iface);
+ return 0;
}
int
if (iface->state == IFS_DOWN)
interface_handle_config_change(iface);
else
- interface_set_down(iface);
+ __interface_set_down(iface, false);
+}
+
+void
+interface_update_start(struct interface *iface)
+{
+ interface_ip_update_start(&iface->proto_ip);
+}
+
+void
+interface_update_complete(struct interface *iface)
+{
+ interface_ip_update_complete(&iface->proto_ip);
}
static void
interface_change_config(struct interface *if_old, struct interface *if_new)
{
struct blob_attr *old_config = if_old->config;
+ const char *old_ifname = if_old->ifname;
+ const struct proto_handler *proto = if_old->proto_handler;
+ 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;
+ if_old->proto_handler = if_new->proto_handler;
+
+ if ((!!old_ifname != !!if_new->ifname) ||
+ (old_ifname && strcmp(old_ifname, if_new->ifname) != 0) ||
+ proto != if_new->proto_handler) {
+ D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
+ if_old->name);
+ goto reload;
+ }
+
+ if (!proto->config_params)
+ D(INTERFACE, "No config parameters for interface '%s'\n",
+ if_old->name);
+ else if (!config_check_equal(old_config, if_new->config,
+ proto->config_params)) {
+ D(INTERFACE, "Reload interface '%s because of config changes\n",
+ if_old->name);
+ goto reload;
+ }
+
+#define UPDATE(field) ({ \
+ bool __changed = (if_old->field != if_new->field); \
+ if_old->field = if_new->field; \
+ __changed; \
+ })
+
+ if (UPDATE(metric) || UPDATE(proto_ip.no_defaultroute)) {
+ interface_ip_set_enabled(&if_old->config_ip, false);
+ interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
+ interface_ip_set_enabled(&if_old->proto_ip, false);
+ interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
+ }
+
+#undef UPDATE
+
+ goto out;
+reload:
set_config_state(if_old, IFC_RELOAD);
+out:
free(old_config);
free(if_new);
}
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)
+ 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)
+ } else if (node_old) {
+ D(INTERFACE, "Remove interface '%s'\n", if_old->name);
set_config_state(if_old, IFC_REMOVE);
- else if (node_new) {
+ } else if (node_new) {
+ D(INTERFACE, "Create interface '%s'\n", if_new->name);
proto_init_interface(if_new, if_new->config);
- interface_ip_init(if_new);
+ interface_claim_device(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);
+ vlist_init(&interfaces, avl_strcmp, interface_update);
interfaces.keep_old = true;
interfaces.no_delete = true;
}
projects / project / netifd.git / blobdiff