IFACE_ATTR_IFNAME,
IFACE_ATTR_PROTO,
IFACE_ATTR_AUTO,
+ IFACE_ATTR_DEFAULTROUTE,
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 },
};
const struct config_param_list interface_attr_list = {
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, IFEV_UP);
+
interface_queue_event(iface, ev);
}
static void
-mark_interface_down(struct interface *iface)
+interface_flush_state(struct interface *iface)
{
- vlist_flush_all(&iface->proto_addr);
- vlist_flush_all(&iface->proto_route);
+ interface_ip_flush(&iface->proto_ip);
if (iface->main_dev.dev)
device_release(&iface->main_dev);
- iface->state = IFS_DOWN;
+ if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev)
+ device_release(iface->l3_dev);
}
-static int
-__interface_set_up(struct interface *iface)
+static void
+mark_interface_down(struct interface *iface)
{
- int ret;
-
- 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 0;
-
+ if (iface->state == IFS_UP)
+ interface_event(iface, IFEV_DOWN);
+ interface_flush_state(iface);
+ iface->state = IFS_DOWN;
}
-static void
+void
__interface_set_down(struct interface *iface, bool force)
{
interface_clear_errors(iface);
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_ip_flush(&iface->config_ip);
+ interface_ip_flush(&iface->proto_ip);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+ if (force)
+ interface_flush_state(iface);
}
static void
__interface_set_down(iface, true);
}
+void
+interface_add_user(struct interface_user *dep, struct interface *iface)
+{
+ dep->iface = iface;
+ list_add(&dep->list, &iface->users);
+ if (iface->state == IFS_UP)
+ dep->cb(dep, IFEV_UP);
+}
+
+void
+interface_remove_user(struct interface_user *dep)
+{
+ list_del_init(&dep->list);
+ dep->iface = NULL;
+}
+
static void
interface_claim_device(struct interface *iface)
{
struct device *dev;
- if (iface->proto_handler &&
+ if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
if (dev)
device_add_user(&iface->main_dev, dev);
}
+ if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
+ interface_set_available(iface, true);
}
static void
-interface_cleanup(struct interface *iface)
+interface_cleanup(struct interface *iface, bool reload)
{
- interface_clear_dns(iface);
+ 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)
+ if (iface->main_dev.dev &&
+ (!reload || !iface->main_dev.hotplug))
device_remove_user(&iface->main_dev);
+ iface->l3_dev = &iface->main_dev;
interface_set_proto_state(iface, NULL);
}
static void
interface_do_free(struct interface *iface)
{
- interface_cleanup(iface);
+ interface_cleanup(iface, false);
free(iface->config);
netifd_ubus_remove_interface(iface);
avl_delete(&interfaces.avl, &iface->node.avl);
static void
interface_do_reload(struct interface *iface)
{
- interface_cleanup(iface);
-
- interface_claim_device(iface);
+ interface_cleanup(iface, true);
proto_init_interface(iface, iface->config);
-
- if (iface->autostart && !config_init)
- interface_set_up(iface);
+ interface_claim_device(iface);
}
static void
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);
+ interface_ip_set_enabled(&iface->config_ip, false);
+ system_flush_routes();
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);
+ if (iface->state == IFS_UP)
+ interface_event(iface, IFEV_DOWN);
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);
- INIT_LIST_HEAD(&iface->proto_dns_search);
- INIT_LIST_HEAD(&iface->proto_dns_servers);
+ interface_ip_init(&iface->proto_ip, iface);
+ interface_ip_init(&iface->config_ip, iface);
+ iface->config_ip.enabled = false;
iface->main_dev.cb = interface_cb;
iface->l3_dev = &iface->main_dev;
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;
}
iface->ifname = blobmsg_data(cur);
iface->config = config;
- vlist_add(&interfaces, &iface->node);
+ vlist_add(&interfaces, &iface->node, iface->name);
}
-void
+int
interface_remove_link(struct interface *iface, struct device *dev)
{
struct device *mdev = iface->main_dev.dev;
- if (mdev && mdev->hotplug_ops) {
- mdev->hotplug_ops->del(mdev, dev);
- return;
- }
+ 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;
+ }
+ device_add_user(&iface->main_dev, 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;
+ }
- return __interface_set_up(iface);
+ iface->state = IFS_SETUP;
+ ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+ if (ret) {
+ mark_interface_down(iface);
+ return ret;
+ }
+
+ return 0;
}
int
__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)
+{
+ struct device_route *route;
+
+ interface_ip_update_complete(&iface->proto_ip);
+ vlist_for_each_element(&iface->config_ip.route, route, node) {
+ if (iface->l3_dev->dev) {
+ system_add_route(iface->l3_dev->dev, route);
+ route->enabled = true;
+ }
+ }
+}
+
static void
interface_change_config(struct interface *if_old, struct interface *if_new)
{
if_old->ifname = if_new->ifname;
if_old->proto_handler = if_new->proto_handler;
- if (strcmp(old_ifname, if_new->ifname) != 0 ||
- proto != 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;
goto reload;
}
+ if (if_old->proto_ip.no_defaultroute != if_new->proto_ip.no_defaultroute) {
+ if_old->proto_ip.no_defaultroute = if_new->proto_ip.no_defaultroute;
+ interface_ip_set_enabled(&if_old->proto_ip, if_old->proto_ip.enabled);
+ }
+
goto out;
reload:
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);
+ 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