X-Git-Url: http://git.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=848990eae5b5a305d120192fe5fe9b377116e11e;hp=4a3a725ce35aa9557ac75fee622a951af85e01ef;hb=8795f9ef89626cd658f615c78c6a17e990c0dcaa;hpb=77b48da58865ff36c545540faa6cd7e1754b74e5 diff --git a/interface.c b/interface.c index 4a3a725..848990e 100644 --- a/interface.c +++ b/interface.c @@ -43,6 +43,8 @@ enum { IFACE_ATTR_IP6TABLE, IFACE_ATTR_IP6CLASS, IFACE_ATTR_DELEGATE, + IFACE_ATTR_IP6IFACEID, + IFACE_ATTR_FORCE_LINK, IFACE_ATTR_MAX }; @@ -62,21 +64,20 @@ static const struct blobmsg_policy iface_attrs[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 }, -}; - -static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = { - [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, - [IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_IP6IFACEID] = { .name = "ip6ifaceid", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL }, }; const struct uci_blob_param_list interface_attr_list = { .n_params = IFACE_ATTR_MAX, .params = iface_attrs, - .info = iface_attr_info, }; static void -interface_clear_errors(struct interface *iface) +set_config_state(struct interface *iface, enum interface_config_state s); + +static void +interface_error_flush(struct interface *iface) { struct interface_error *error, *tmp; @@ -86,6 +87,17 @@ interface_clear_errors(struct interface *iface) } } +static void +interface_clear_errors(struct interface *iface) +{ + /* don't flush the errors in case the configured protocol handler matches the + running protocol handler and is having the last error capability */ + if (!(iface->proto && + (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) && + (iface->proto->handler->name == iface->proto_handler->name))) + interface_error_flush(iface); +} + void interface_add_error(struct interface *iface, const char *subsystem, const char *code, const char **data, int n_data) { @@ -94,6 +106,14 @@ void interface_add_error(struct interface *iface, const char *subsystem, int *datalen = NULL; char *dest, *d_subsys, *d_code; + /* if the configured protocol handler has the last error support capability, + errors should only be added if the running protocol handler matches the + configured one */ + if (iface->proto && + (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) && + (iface->proto->handler->name != iface->proto_handler->name)) + return; + if (n_data) { len = n_data * sizeof(char *); datalen = alloca(len); @@ -109,6 +129,11 @@ void interface_add_error(struct interface *iface, const char *subsystem, if (!error) return; + /* Only keep the last flagged error, prevent this list grows unlimitted in case the + protocol can't be established (e.g auth failure) */ + if (iface->proto_handler->flags & PROTO_FLAG_LASTERROR) + interface_error_flush(iface); + list_add_tail(&error->list, &iface->errors); dest = (char *) &error->data[n_data + 1]; @@ -117,7 +142,7 @@ void interface_add_error(struct interface *iface, const char *subsystem, memcpy(dest, data[i], datalen[i]); dest += datalen[i]; } - error->data[n_data++] = NULL; + error->data[n_data] = NULL; if (subsystem) error->subsystem = strcpy(d_subsys, subsystem); @@ -184,6 +209,7 @@ interface_event(struct interface *iface, enum interface_event ev) switch (ev) { case IFEV_UP: + interface_error_flush(iface); adev = iface->l3_dev.dev; /* fall through */ case IFEV_DOWN: @@ -233,9 +259,6 @@ __interface_set_down(struct interface *iface, bool force) 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: @@ -265,15 +288,21 @@ __interface_set_up(struct interface *iface) static void interface_check_state(struct interface *iface) { + bool link_state = iface->link_state || iface->force_link; + switch (iface->state) { case IFS_UP: - if (!iface->enabled || !iface->link_state) { - mark_interface_down(iface); + 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->autostart && iface->enabled && iface->link_state && !config_init) + if (!iface->available) + return; + + if (iface->autostart && iface->enabled && link_state && !config_init) __interface_set_up(iface); break; default: @@ -304,7 +333,14 @@ interface_set_link_state(struct interface *iface, bool new_state) } static void -interface_cb(struct device_user *dep, enum device_event ev) +interface_ext_dev_cb(struct device_user *dep, enum device_event ev) +{ + if (ev == DEV_EVENT_REMOVE) + device_remove_user(dep); +} + +static void +interface_main_dev_cb(struct device_user *dep, enum device_event ev) { struct interface *iface; bool new_state = false; @@ -315,7 +351,7 @@ interface_cb(struct device_user *dep, enum device_event ev) new_state = true; case DEV_EVENT_REMOVE: interface_set_available(iface, new_state); - if (!new_state && dep->dev->external) + if (!new_state && dep->dev && dep->dev->external) interface_set_main_dev(iface, NULL); break; case DEV_EVENT_UP: @@ -325,9 +361,30 @@ interface_cb(struct device_user *dep, enum device_event ev) break; case DEV_EVENT_LINK_UP: new_state = true; - case DEV_EVENT_LINK_DOWN: + 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; + } +} + +static void +interface_l3_dev_cb(struct device_user *dep, enum device_event ev) +{ + struct interface *iface; + + iface = container_of(dep, struct interface, l3_dev); + if (iface->l3_dev.dev == iface->main_dev.dev) + return; + + switch (ev) { + case DEV_EVENT_LINK_DOWN: + interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false); + break; default: break; } @@ -405,6 +462,10 @@ interface_merge_assignment_data(struct interface *old, struct interface *new) { 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; @@ -437,6 +498,8 @@ interface_merge_assignment_data(struct interface *old, struct interface *new) 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); } } @@ -468,6 +531,21 @@ interface_alias_cb(struct interface_user *dep, struct interface *iface, enum int } } +static void +interface_set_device_config(struct interface *iface, struct device *dev) +{ + if (!dev || !dev->default_config) + return; + + if (!iface->device_config && + (!dev->iface_config || dev->config_iface != iface)) + return; + + dev->config_iface = iface; + dev->iface_config = iface->device_config; + device_apply_config(dev, dev->type, iface->config); +} + static void interface_claim_device(struct interface *iface) { @@ -484,6 +562,9 @@ interface_claim_device(struct interface *iface) } else if (iface->ifname && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) { dev = device_get(iface->ifname, true); + interface_set_device_config(iface, dev); + } else { + dev = iface->ext_dev.dev; } if (dev) @@ -502,8 +583,8 @@ interface_cleanup_state(struct interface *iface) 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 @@ -511,6 +592,9 @@ interface_cleanup(struct interface *iface) { 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); @@ -560,6 +644,8 @@ interface_handle_config_change(struct interface *iface) } if (iface->autostart && iface->available) interface_set_up(iface); + else if (iface->dynamic) + set_config_state(iface, IFC_REMOVE); } static void @@ -574,6 +660,9 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve 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; @@ -589,6 +678,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve 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: @@ -599,6 +690,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve mark_interface_down(iface); iface->state = IFS_SETUP; break; + default: + return; } interface_write_resolv_conf(); @@ -627,6 +720,7 @@ interface_alloc(const char *name, struct blob_attr *config) 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); @@ -638,7 +732,9 @@ interface_alloc(const char *name, struct blob_attr *config) avl_init(&iface->data, avl_strcmp, false, NULL); iface->config_ip.enabled = false; - iface->main_dev.cb = interface_cb; + iface->main_dev.cb = interface_main_dev_cb; + iface->l3_dev.cb = interface_l3_dev_cb; + iface->ext_dev.cb = interface_ext_dev_cb; blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(config), blob_len(config)); @@ -647,8 +743,11 @@ interface_alloc(const char *name, struct blob_attr *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 = @@ -666,6 +765,33 @@ interface_alloc(const char *name, struct blob_attr *config) 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) & @@ -694,6 +820,7 @@ interface_alloc(const char *name, struct blob_attr *config) void interface_set_dynamic(struct interface *iface) { iface->dynamic = true; + iface->autostart = true; iface->node.version = -1; // Don't delete on reload } @@ -716,7 +843,6 @@ static bool __interface_add(struct interface *iface, struct blob_attr *config, b iface->ifname = blobmsg_data(cur); } - iface->config = config; vlist_add(&interfaces, &iface->node, iface->name); return true; @@ -751,8 +877,10 @@ interface_set_l3_dev(struct interface *iface, struct device *dev) 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); } } @@ -760,23 +888,22 @@ interface_set_l3_dev(struct interface *iface, struct device *dev) void interface_set_main_dev(struct interface *iface, struct device *dev) { - bool set_l3 = (!dev || 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) { 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); @@ -790,18 +917,21 @@ interface_remove_link(struct interface *iface, struct device *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; @@ -818,32 +948,33 @@ interface_add_link(struct interface *iface, struct device *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) { + interface_set_device_config(iface, dev); device_set_present(dev, true); - if (iface->device_config) - device_set_config(dev, &simple_device_type, iface->config); - system_if_apply_settings(dev, &dev->settings, dev->settings.flags); - ret = interface_add_link(iface, dev); + ret = interface_add_link(iface, dev, link_ext); } else { ret = interface_remove_link(iface, dev); } @@ -936,6 +1067,35 @@ interface_replace_dns(struct interface_ip_settings *new, struct interface_ip_set vlist_simple_replace(&new->dns_search, &old->dns_search); } +static bool +interface_device_config_changed(struct interface *if_old, struct interface *if_new) +{ + struct blob_attr *ntb[__DEV_ATTR_MAX]; + struct blob_attr *otb[__DEV_ATTR_MAX]; + struct device *dev = if_old->main_dev.dev; + unsigned long diff = 0; + + BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8); + + if (!dev) + return false; + + if (if_old->device_config != if_new->device_config) + return true; + + if (!if_new->device_config) + return false; + + blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb, + blob_data(if_old->config), blob_len(if_old->config)); + + blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, ntb, + blob_data(if_new->config), blob_len(if_new->config)); + + uci_blob_diff(ntb, otb, &device_attr_list, &diff); + return diff; +} + static void interface_change_config(struct interface *if_old, struct interface *if_new) { @@ -953,6 +1113,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new) reload = true; } + if (!reload && interface_device_config_changed(if_old, if_new)) + reload = true; + if (FIELD_CHANGED_STR(ifname) || if_old->proto_handler != if_new->proto_handler) reload = true; @@ -971,14 +1134,19 @@ interface_change_config(struct interface *if_old, struct interface *if_new) }) 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); @@ -1000,13 +1168,18 @@ interface_change_config(struct interface *if_old, struct interface *if_new) } 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;