X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=a2c3f44fb6c84b57953e58f2c58ef2b4d10f9adc;hp=036df6ca3179f0b22ade2e9bf64a9138c372999c;hb=b92d7fe66abb453619b996155b27641c5ce77276;hpb=bd996b60f742487ec3f2427ff1830cf6bf5da43c diff --git a/interface.c b/interface.c index 036df6c..a2c3f44 100644 --- a/interface.c +++ b/interface.c @@ -37,6 +37,8 @@ enum { IFACE_ATTR_DNS_SEARCH, IFACE_ATTR_METRIC, IFACE_ATTR_INTERFACE, + IFACE_ATTR_IP6ASSIGN, + IFACE_ATTR_IP6HINT, IFACE_ATTR_MAX }; @@ -50,6 +52,8 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY }, [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 }, }; static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = { @@ -79,7 +83,7 @@ void interface_add_error(struct interface *iface, const char *subsystem, struct interface_error *error; int i, len = 0; int *datalen = NULL; - char *dest; + char *dest, *d_subsys, *d_code; if (n_data) { len = n_data * sizeof(char *); @@ -90,13 +94,13 @@ void interface_add_error(struct interface *iface, const char *subsystem, } } - error = calloc(1, sizeof(*error) + sizeof(char *) + len); + error = calloc_a(sizeof(*error) + sizeof(char *) + len, + &d_subsys, subsystem ? strlen(subsystem) + 1 : 0, + &d_code, code ? strlen(code) + 1 : 0); if (!error) return; list_add_tail(&error->list, &iface->errors); - error->subsystem = subsystem; - error->code = code; dest = (char *) &error->data[n_data + 1]; for (i = 0; i < n_data; i++) { @@ -104,7 +108,13 @@ 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); + + if (code) + error->code = strcpy(d_code, code); } static void @@ -157,7 +167,7 @@ interface_event(struct interface *iface, enum interface_event ev) switch (ev) { case IFEV_UP: - adev = iface->main_dev.dev; + adev = iface->l3_dev.dev; /* fall through */ case IFEV_DOWN: alias_notify_device(iface->name, adev); @@ -170,8 +180,6 @@ interface_event(struct interface *iface, enum interface_event 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); @@ -194,8 +202,6 @@ mark_interface_down(struct interface *iface) void __interface_set_down(struct interface *iface, bool force) { - interface_clear_errors(iface); - if (iface->state == IFS_DOWN || iface->state == IFS_TEARDOWN) return; @@ -319,9 +325,21 @@ interface_claim_device(struct interface *iface) interface_set_available(iface, true); } +static void +interface_cleanup_state(struct interface *iface) +{ + interface_set_available(iface, false); + + interface_flush_state(iface); + interface_clear_errors(iface); + interface_set_proto_state(iface, NULL); + + if (iface->main_dev.dev) + interface_set_main_dev(iface, NULL); +} static void -interface_cleanup(struct interface *iface, bool reload) +interface_cleanup(struct interface *iface) { struct interface_user *dep, *tmp; @@ -332,19 +350,14 @@ interface_cleanup(struct interface *iface, bool reload) interface_remove_user(dep); interface_ip_flush(&iface->config_ip); - interface_flush_state(iface); - interface_clear_errors(iface); - - if (iface->main_dev.dev && !reload) - interface_set_main_dev(iface, NULL); - interface_set_proto_state(iface, NULL); + interface_cleanup_state(iface); } static void interface_do_free(struct interface *iface) { interface_event(iface, IFEV_FREE); - interface_cleanup(iface, false); + interface_cleanup(iface); free(iface->config); netifd_ubus_remove_interface(iface); avl_delete(&interfaces.avl, &iface->node.avl); @@ -355,7 +368,7 @@ static void interface_do_reload(struct interface *iface) { interface_event(iface, IFEV_RELOAD); - interface_cleanup(iface, true); + interface_cleanup_state(iface); proto_init_interface(iface, iface->config); interface_claim_device(iface); } @@ -395,7 +408,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve 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: @@ -404,6 +416,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name); mark_interface_down(iface); + if (iface->main_dev.dev) + device_release(&iface->main_dev); interface_handle_config_change(iface); break; case IFPEV_LINK_LOST: @@ -415,6 +429,8 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve iface->state = IFS_SETUP; break; } + + interface_write_resolv_conf(); } void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state) @@ -473,6 +489,14 @@ interface_init(struct interface *iface, const char *name, if ((cur = tb[IFACE_ATTR_METRIC])) iface->metric = blobmsg_get_u32(cur); + if ((cur = tb[IFACE_ATTR_IP6ASSIGN])) + iface->config_ip.assignment_length = blobmsg_get_u32(cur); + + iface->config_ip.assignment_hint = -1; + if ((cur = tb[IFACE_ATTR_IP6HINT])) + iface->config_ip.assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) & + ~((1 << (64 - iface->config_ip.assignment_length)) - 1); + iface->config_autostart = iface->autostart; } @@ -687,73 +711,79 @@ 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 char *old_parent_ifname = if_old->parent_ifname; - const struct proto_handler *proto = if_old->proto_handler; + bool reload = false, reload_ip = false, reload_assignment = false; + +#define FIELD_CHANGED_STR(field) \ + ((!!if_old->field != !!if_new->field) || \ + (if_old->field && \ + strcmp(if_old->field, if_new->field) != 0)) + + if (FIELD_CHANGED_STR(parent_ifname)) { + if (if_old->parent_iface.iface) + interface_remove_user(&if_old->parent_iface); + reload = true; + } + + if (FIELD_CHANGED_STR(ifname) || + if_old->proto_handler != if_new->proto_handler) + reload = true; + + if (!if_old->proto_handler->config_params) + D(INTERFACE, "No config parameters for interface '%s'\n", + if_old->name); + else if (!config_check_equal(if_old->config, if_new->config, + if_old->proto_handler->config_params)) + reload = true; + +#define UPDATE(field, __var) ({ \ + bool __changed = (if_old->field != if_new->field); \ + if_old->field = if_new->field; \ + __var |= __changed; \ + }) - 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->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; -#define FIELD_CHANGED_STR(field) \ - ((!!if_old->field != !!old_ ## field) || \ - (old_ ## field && \ - strcmp(old_ ## field, if_old->field) != 0)) + if_old->proto_ip.no_dns = if_new->proto_ip.no_dns; + interface_replace_dns(&if_old->config_ip, &if_new->config_ip); - if (FIELD_CHANGED_STR(parent_ifname)) { - if (if_old->parent_iface.iface) - interface_remove_user(&if_old->parent_iface); - goto reload; - } + UPDATE(metric, reload_ip); + UPDATE(proto_ip.no_defaultroute, reload_ip); + UPDATE(config_ip.assignment_length, reload_assignment); + UPDATE(config_ip.assignment_hint, reload_assignment); - if (FIELD_CHANGED_STR(ifname) || proto != if_new->proto_handler) { - D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n", - if_old->name); - goto reload; - } +#undef UPDATE - 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)) { + if (reload) { D(INTERFACE, "Reload interface '%s because of config changes\n", if_old->name); - goto reload; + interface_clear_errors(if_old); + set_config_state(if_old, IFC_RELOAD); + goto out; } -#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)) { + if (reload_ip) { 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); } - UPDATE(proto_ip.no_dns); - interface_replace_dns(&if_old->config_ip, &if_new->config_ip); - interface_write_resolv_conf(); + if (reload_assignment) + interface_refresh_assignments(true); -#undef UPDATE - - goto out; + interface_write_resolv_conf(); -reload: - set_config_state(if_old, IFC_RELOAD); out: if_new->config = NULL; - interface_cleanup(if_new, false); + interface_cleanup(if_new); free(old_config); free(if_new); }