X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=a014111aaadb4478ae9e2cdd978d2bc21d767028;hp=df04ce317ab946b0953884a101fccde3ac1f0fc9;hb=c99182e96d2b66bab77d9eb9584ca7e0211966aa;hpb=9f9f387e14300de1ad517bf57273722c54ba5d7f diff --git a/interface.c b/interface.c index df04ce3..a014111 100644 --- a/interface.c +++ b/interface.c @@ -35,6 +35,7 @@ enum { IFACE_ATTR_PEERDNS, IFACE_ATTR_DNS, IFACE_ATTR_DNS_SEARCH, + IFACE_ATTR_DNS_METRIC, IFACE_ATTR_METRIC, IFACE_ATTR_INTERFACE, IFACE_ATTR_IP6ASSIGN, @@ -43,6 +44,7 @@ enum { IFACE_ATTR_IP6TABLE, IFACE_ATTR_IP6CLASS, IFACE_ATTR_DELEGATE, + IFACE_ATTR_IP6IFACEID, IFACE_ATTR_FORCE_LINK, IFACE_ATTR_MAX }; @@ -56,6 +58,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY }, + [IFACE_ATTR_DNS_METRIC] = { .name = "dns_metric", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING }, @@ -63,22 +66,22 @@ 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 }, + [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] = { - [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, - [IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING }, -}; - 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_event(struct interface *iface, enum interface_event ev); + +static void +interface_error_flush(struct interface *iface) { struct interface_error *error, *tmp; @@ -88,6 +91,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) { @@ -96,6 +110,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); @@ -111,6 +133,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]; @@ -119,7 +146,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); @@ -164,6 +191,9 @@ interface_add_data(struct interface *iface, const struct blob_attr *data) } n = calloc(1, sizeof(*n) + len); + if (!n) + return UBUS_STATUS_UNKNOWN_ERROR; + memcpy(n->data, data, len); n->node.key = blobmsg_name(n->data); avl_insert(&iface->data, &n->node); @@ -172,6 +202,25 @@ interface_add_data(struct interface *iface, const struct blob_attr *data) return 0; } +int interface_parse_data(struct interface *iface, const struct blob_attr *attr) +{ + struct blob_attr *cur; + int rem, ret; + + iface->updated = 0; + + blob_for_each_attr(cur, attr, rem) { + ret = interface_add_data(iface, cur); + if (ret) + return ret; + } + + if (iface->updated && iface->state == IFS_UP) + interface_event(iface, IFEV_UPDATE); + + return 0; +} + static void interface_event(struct interface *iface, enum interface_event ev) { @@ -186,6 +235,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: @@ -212,10 +262,12 @@ mark_interface_down(struct interface *iface) if (state == IFS_DOWN) return; + iface->link_up_event = false; iface->state = IFS_DOWN; if (state == IFS_UP) interface_event(iface, IFEV_DOWN); interface_ip_set_enabled(&iface->config_ip, false); + interface_ip_set_enabled(&iface->proto_ip, false); interface_ip_flush(&iface->proto_ip); interface_flush_state(iface); system_flush_routes(); @@ -235,9 +287,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: @@ -271,12 +320,16 @@ interface_check_state(struct interface *iface) switch (iface->state) { case IFS_UP: + case IFS_SETUP: if (!iface->enabled || !link_state) { - mark_interface_down(iface); 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; @@ -305,17 +358,22 @@ interface_set_link_state(struct interface *iface, bool new_state) 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); + + if (new_state && iface->force_link && iface->state == IFS_UP && !iface->link_up_event) { + interface_event(iface, IFEV_LINK_UP); + iface->link_up_event = true; + } } static void -interface_ext_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_cb(struct device_user *dep, enum device_event ev) +interface_main_dev_cb(struct device_user *dep, enum device_event ev) { struct interface *iface; bool new_state = false; @@ -347,6 +405,25 @@ interface_cb(struct device_user *dep, enum device_event ev) } } +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: + if (iface->proto_handler->flags & PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN) + interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false); + break; + default: + break; + } +} + void interface_set_available(struct interface *iface, bool new_state) { @@ -419,6 +496,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; @@ -451,6 +532,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); } } @@ -476,13 +559,27 @@ interface_alias_cb(struct interface_user *dep, struct interface *iface, enum int case IFEV_FREE: interface_remove_user(dep); break; - case IFEV_RELOAD: - case IFEV_UPDATE: + default: break; } } 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) { struct interface *parent; @@ -491,6 +588,8 @@ interface_claim_device(struct interface *iface) if (iface->parent_iface.iface) interface_remove_user(&iface->parent_iface); + device_lock(); + if (iface->parent_ifname) { parent = vlist_find(&interfaces, iface->parent_ifname, parent, node); iface->parent_iface.cb = interface_alias_cb; @@ -498,6 +597,7 @@ 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; } @@ -505,6 +605,8 @@ interface_claim_device(struct interface *iface) if (dev) interface_set_main_dev(iface, dev); + device_unlock(); + if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE) interface_set_available(iface, true); } @@ -579,17 +681,20 @@ 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 -interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev) +interface_proto_event_cb(struct interface_proto_state *state, enum interface_proto_event ev) { struct interface *iface = state->iface; switch (ev) { case IFPEV_UP: if (iface->state != IFS_SETUP) { - interface_event(iface, IFEV_UPDATE); + if (iface->state == IFS_UP && iface->updated) + interface_event(iface, IFEV_UPDATE); return; } @@ -597,6 +702,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve interface_set_l3_dev(iface, iface->main_dev.dev); interface_ip_set_enabled(&iface->config_ip, true); + interface_ip_set_enabled(&iface->proto_ip, true); system_flush_routes(); iface->state = IFS_UP; iface->start_time = system_get_rtime(); @@ -641,7 +747,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s if (!state) return; - state->proto_event = interface_proto_cb; + state->proto_event = interface_proto_event_cb; state->iface = iface; } @@ -665,8 +771,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->ext_dev.cb = interface_ext_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)); @@ -691,12 +798,42 @@ interface_alloc(const char *name, struct blob_attr *config) if ((cur = tb[IFACE_ATTR_DNS_SEARCH])) interface_add_dns_search_list(&iface->config_ip, cur); + if ((cur = tb[IFACE_ATTR_DNS_METRIC])) + iface->dns_metric = blobmsg_get_u32(cur); + if ((cur = tb[IFACE_ATTR_METRIC])) iface->metric = blobmsg_get_u32(cur); 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) & @@ -748,7 +885,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; @@ -779,6 +915,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev) return; interface_ip_set_enabled(&iface->config_ip, false); + interface_ip_set_enabled(&iface->proto_ip, false); interface_ip_flush(&iface->proto_ip); device_add_user(&iface->l3_dev, dev); @@ -788,6 +925,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev) return; } interface_ip_set_enabled(&iface->config_ip, enabled); + interface_ip_set_enabled(&iface->proto_ip, enabled); } } @@ -877,11 +1015,9 @@ interface_handle_link(struct interface *iface, const char *name, bool add, bool } 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, link_ext); } else { ret = interface_remove_link(iface, dev); @@ -956,10 +1092,12 @@ set_config_state(struct interface *iface, enum interface_config_state s) } void -interface_update_start(struct interface *iface) +interface_update_start(struct interface *iface, const bool keep_old) { iface->updated = 0; - interface_ip_update_start(&iface->proto_ip); + + if (!keep_old) + interface_ip_update_start(&iface->proto_ip); } void @@ -975,6 +1113,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) { @@ -992,6 +1159,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; @@ -1010,8 +1180,12 @@ 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; @@ -1019,6 +1193,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new) 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->dns_metric = if_new->dns_metric; if_old->proto_ip.no_dns = if_new->proto_ip.no_dns; interface_replace_dns(&if_old->config_ip, &if_new->config_ip); @@ -1040,10 +1215,13 @@ 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();