IFACE_ATTR_IP6TABLE,
IFACE_ATTR_IP6CLASS,
IFACE_ATTR_DELEGATE,
+ IFACE_ATTR_IP6IFACEID,
+ IFACE_ATTR_FORCE_LINK,
IFACE_ATTR_MAX
};
[IFACE_ATTR_IP6TABLE] = { .name = "ip6table", .type = BLOBMSG_TYPE_STRING },
[IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
+ [IFACE_ATTR_IP6IFACEID] = { .name = "ip6ifaceid", .type = BLOBMSG_TYPE_STRING },
+ [IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL },
};
static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
{
enum interface_state state = iface->state;
+ if (state == IFS_DOWN)
+ return;
+
iface->state = IFS_DOWN;
if (state == IFS_UP)
interface_event(iface, IFEV_DOWN);
void
__interface_set_down(struct interface *iface, bool force)
{
- if (iface->state == IFS_DOWN ||
- iface->state == IFS_TEARDOWN)
+ enum interface_state state = iface->state;
+ switch (state) {
+ case IFS_UP:
+ case IFS_SETUP:
+ iface->state = IFS_TEARDOWN;
+ if (state == IFS_UP)
+ interface_event(iface, IFEV_DOWN);
+
+ interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
+ if (force)
+ interface_flush_state(iface);
+
+ if (iface->dynamic)
+ vlist_delete(&interfaces, &iface->node);
+ break;
+
+ case IFS_DOWN:
+ if (iface->main_dev.dev)
+ device_release(&iface->main_dev);
+ case IFS_TEARDOWN:
+ default:
+ break;
+ }
+}
+
+static int
+__interface_set_up(struct interface *iface)
+{
+ int ret;
+
+ netifd_log_message(L_NOTICE, "Interface '%s' is setting up now\n", iface->name);
+
+ iface->state = IFS_SETUP;
+ ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+ if (ret)
+ mark_interface_down(iface);
+
+ return ret;
+}
+
+static void
+interface_check_state(struct interface *iface)
+{
+ bool link_state = iface->link_state || iface->force_link;
+
+ switch (iface->state) {
+ case IFS_UP:
+ case IFS_SETUP:
+ if (!iface->enabled || !link_state) {
+ interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+ mark_interface_down(iface);
+ }
+ break;
+ case IFS_DOWN:
+ if (!iface->available)
+ return;
+
+ if (iface->autostart && iface->enabled && link_state && !config_init)
+ __interface_set_up(iface);
+ break;
+ default:
+ break;
+ }
+}
+
+static void
+interface_set_enabled(struct interface *iface, bool new_state)
+{
+ if (iface->enabled == new_state)
return;
- if (iface->state == IFS_UP)
- interface_event(iface, IFEV_DOWN);
- iface->state = IFS_TEARDOWN;
- interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
- if (force)
- interface_flush_state(iface);
+ netifd_log_message(L_NOTICE, "Interface '%s' is %s\n", iface->name, new_state ? "enabled" : "disabled");
+ iface->enabled = new_state;
+ interface_check_state(iface);
+}
- if (iface->dynamic)
- vlist_delete(&interfaces, &iface->node);
+static void
+interface_set_link_state(struct interface *iface, bool new_state)
+{
+ if (iface->link_state == new_state)
+ return;
+
+ netifd_log_message(L_NOTICE, "Interface '%s' has link connectivity %s\n", iface->name, new_state ? "" : "loss");
+ iface->link_state = new_state;
+ interface_check_state(iface);
+}
+
+static void
+interface_ext_cb(struct device_user *dep, enum device_event ev)
+{
+ if (ev == DEV_EVENT_REMOVE)
+ device_remove_user(dep);
}
static void
interface_cb(struct device_user *dep, enum device_event ev)
{
struct interface *iface;
- bool new_state;
+ bool new_state = false;
iface = container_of(dep, struct interface, main_dev);
switch (ev) {
case DEV_EVENT_ADD:
new_state = true;
- break;
case DEV_EVENT_REMOVE:
- new_state = false;
+ interface_set_available(iface, new_state);
+ if (!new_state && dep->dev && dep->dev->external)
+ interface_set_main_dev(iface, NULL);
break;
- default:
+ case DEV_EVENT_UP:
+ new_state = true;
+ case DEV_EVENT_DOWN:
+ interface_set_enabled(iface, new_state);
+ break;
+ case DEV_EVENT_LINK_UP:
+ new_state = true;
+ case DEV_EVENT_LINK_DOWN:
+ interface_set_link_state(iface, new_state);
+ break;
+ case DEV_EVENT_TOPO_CHANGE:
+ interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
return;
+ default:
+ break;
}
-
- interface_set_available(iface, new_state);
- if (!new_state && dep->dev->external)
- interface_set_main_dev(iface, NULL);
}
void
{
bool changed = (old->assignment_hint != new->assignment_hint ||
old->assignment_length != new->assignment_length ||
+ old->assignment_iface_id_selection != new->assignment_iface_id_selection ||
+ (old->assignment_iface_id_selection == IFID_FIXED &&
+ memcmp(&old->assignment_fixed_iface_id, &new->assignment_fixed_iface_id,
+ sizeof(old->assignment_fixed_iface_id))) ||
list_empty(&old->assignment_classes) != list_empty(&new->assignment_classes));
struct interface_assignment_class *c;
if (changed) {
old->assignment_hint = new->assignment_hint;
old->assignment_length = new->assignment_length;
+ old->assignment_iface_id_selection = new->assignment_iface_id_selection;
+ old->assignment_fixed_iface_id = new->assignment_fixed_iface_id;
interface_refresh_assignments(true);
}
}
} else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
+ if (dev && dev->default_config && iface->device_config)
+ device_apply_config(dev, dev->type, iface->config);
+ } else {
+ dev = iface->ext_dev.dev;
}
if (dev)
interface_clear_errors(iface);
interface_set_proto_state(iface, NULL);
- if (iface->main_dev.dev)
- interface_set_main_dev(iface, NULL);
+ interface_set_main_dev(iface, NULL);
+ interface_set_l3_dev(iface, NULL);
}
static void
{
struct interface_user *dep, *tmp;
+ uloop_timeout_cancel(&iface->remove_timer);
+ device_remove_user(&iface->ext_dev);
+
if (iface->parent_iface.iface)
interface_remove_user(&iface->parent_iface);
return;
}
+ if (!iface->l3_dev.dev)
+ interface_set_l3_dev(iface, iface->main_dev.dev);
+
interface_ip_set_enabled(&iface->config_ip, true);
system_flush_routes();
iface->state = IFS_UP;
mark_interface_down(iface);
if (iface->main_dev.dev)
device_release(&iface->main_dev);
+ if (iface->l3_dev.dev)
+ device_remove_user(&iface->l3_dev);
interface_handle_config_change(iface);
break;
case IFPEV_LINK_LOST:
mark_interface_down(iface);
iface->state = IFS_SETUP;
break;
+ default:
+ return;
}
interface_write_resolv_conf();
struct blob_attr *cur;
const char *proto_name = NULL;
char *iface_name;
+ bool force_link = false;
iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1);
iface->name = strcpy(iface_name, name);
iface->config_ip.enabled = false;
iface->main_dev.cb = interface_cb;
+ iface->ext_dev.cb = interface_ext_cb;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
proto_name = blobmsg_data(cur);
proto_attach_interface(iface, proto_name);
+ if (iface->proto_handler->flags & PROTO_FLAG_FORCE_LINK_DEFAULT)
+ force_link = true;
iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+ iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], force_link);
iface->proto_ip.no_defaultroute =
!blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
iface->proto_ip.no_dns =
if ((cur = tb[IFACE_ATTR_IP6ASSIGN]))
iface->assignment_length = blobmsg_get_u32(cur);
+ /* defaults */
+ iface->assignment_iface_id_selection = IFID_FIXED;
+ iface->assignment_fixed_iface_id = in6addr_any;
+ iface->assignment_fixed_iface_id.s6_addr[15] = 1;
+
+ if ((cur = tb[IFACE_ATTR_IP6IFACEID])) {
+ const char *ifaceid = blobmsg_data(cur);
+ if (!strcmp(ifaceid, "random")) {
+ iface->assignment_iface_id_selection = IFID_RANDOM;
+ }
+ else if (!strcmp(ifaceid, "eui64")) {
+ iface->assignment_iface_id_selection = IFID_EUI64;
+ }
+ else {
+ /* we expect an IPv6 address with network id zero here -> fixed iface id
+ if we cannot parse -> revert to iface id 1 */
+ if (inet_pton(AF_INET6,ifaceid,&iface->assignment_fixed_iface_id) != 1 ||
+ iface->assignment_fixed_iface_id.s6_addr32[0] != 0 ||
+ iface->assignment_fixed_iface_id.s6_addr32[1] != 0) {
+ iface->assignment_fixed_iface_id = in6addr_any;
+ iface->assignment_fixed_iface_id.s6_addr[15] = 1;
+ netifd_log_message(L_WARNING, "Failed to parse ip6ifaceid for interface '%s', \
+ falling back to iface id 1.\n", iface->name);
+ }
+ }
+ }
+
iface->assignment_hint = -1;
if ((cur = tb[IFACE_ATTR_IP6HINT]))
iface->assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) &
void interface_set_dynamic(struct interface *iface)
{
iface->dynamic = true;
+ iface->autostart = true;
iface->node.version = -1; // Don't delete on reload
}
device_add_user(&iface->l3_dev, dev);
if (dev) {
- if (claimed)
- device_claim(&iface->l3_dev);
+ if (claimed) {
+ if (device_claim(&iface->l3_dev) < 0)
+ return;
+ }
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);
-
+ interface_set_available(iface, false);
device_add_user(&iface->main_dev, dev);
- if (!dev)
+ if (!dev) {
+ interface_set_link_state(iface, false);
return;
+ }
- if (claimed)
- device_claim(&iface->l3_dev);
+ if (claimed) {
+ if (device_claim(&iface->l3_dev) < 0)
+ return;
+ }
if (!iface->l3_dev.dev)
interface_set_l3_dev(iface, dev);
if (mdev && mdev->hotplug_ops)
return mdev->hotplug_ops->del(mdev, dev);
+ if (dev == iface->ext_dev.dev)
+ device_remove_user(&iface->ext_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);
+ interface_set_main_dev(iface, NULL);
return 0;
}
-int
-interface_add_link(struct interface *iface, struct device *dev)
+static int
+interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
{
struct device *mdev = iface->main_dev.dev;
return UBUS_STATUS_NOT_SUPPORTED;
}
+ if (link_ext)
+ device_add_user(&iface->ext_dev, dev);
+
interface_set_main_dev(iface, dev);
iface->main_dev.hotplug = true;
return 0;
}
int
-interface_handle_link(struct interface *iface, const char *name, bool add)
+interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext)
{
struct device *dev;
int ret;
device_lock();
- dev = device_get(name, add ? 2 : 0);
+ dev = device_get(name, add ? (link_ext ? 2 : 1) : 0);
if (!dev) {
ret = UBUS_STATUS_NOT_FOUND;
goto out;
if (add) {
device_set_present(dev, true);
- if (iface->device_config)
- device_set_config(dev, &simple_device_type, iface->config);
+ if (iface->device_config && dev->default_config)
+ device_set_config(dev, dev->type, iface->config);
- system_if_apply_settings(dev, &dev->settings);
- ret = interface_add_link(iface, dev);
+ system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
+ ret = interface_add_link(iface, dev, link_ext);
} else {
ret = interface_remove_link(iface, dev);
}
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;
+ if (!ret)
+ interface_check_state(iface);
}
+ else
+ ret = __interface_set_up(iface);
- return 0;
+ return ret;
}
int
})
if_old->config = if_new->config;
- if (!if_old->config_autostart && if_new->config_autostart)
- if_old->autostart = true;
+ if (if_old->config_autostart != if_new->config_autostart) {
+ if (if_old->config_autostart)
+ reload = true;
+
+ if_old->autostart = if_new->config_autostart;
+ }
if_old->device_config = if_new->device_config;
if_old->config_autostart = if_new->config_autostart;
if_old->ifname = if_new->ifname;
if_old->parent_ifname = if_new->parent_ifname;
if_old->proto_handler = if_new->proto_handler;
+ if_old->force_link = if_new->force_link;
if_old->proto_ip.no_dns = if_new->proto_ip.no_dns;
interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
}
if (reload_ip) {
+ bool config_ip_enabled = if_old->config_ip.enabled;
+ bool proto_ip_enabled = if_old->proto_ip.enabled;
+
interface_ip_set_enabled(&if_old->config_ip, false);
interface_ip_set_enabled(&if_old->proto_ip, false);
- interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
- interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
+ interface_ip_set_enabled(&if_old->proto_ip, proto_ip_enabled);
+ interface_ip_set_enabled(&if_old->config_ip, config_ip_enabled);
}
interface_write_resolv_conf();
+ if (if_old->main_dev.dev)
+ interface_check_state(if_old);
out:
if_new->config = NULL;
projects / project / netifd.git / blobdiff