diff options
| -rw-r--r-- | interface-ip.c | 35 | ||||
| -rw-r--r-- | interface-ip.h | 4 | ||||
| -rw-r--r-- | interface.c | 96 | ||||
| -rw-r--r-- | interface.h | 13 | ||||
| -rw-r--r-- | proto.c | 5 | ||||
| -rw-r--r-- | ubus.c | 2 |
6 files changed, 133 insertions, 22 deletions
diff --git a/interface-ip.c b/interface-ip.c index b720eff..15a91af 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -665,14 +665,30 @@ static void interface_update_prefix_assignments(struct device_prefix *prefix, bo bool assigned_any = false; struct list_head assign_later = LIST_HEAD_INIT(assign_later); vlist_for_each_element(&interfaces, iface, node) { - if (iface->config_ip.assignment_length < 48 || - iface->config_ip.assignment_length > 64) + if (iface->assignment_length < 48 || + iface->assignment_length > 64) continue; + // Test whether there is a matching class + if (!list_empty(&iface->assignment_classes)) { + bool found = false; + + struct interface_assignment_class *c; + list_for_each_entry(c, &iface->assignment_classes, head) { + if (!strcmp(c->name, prefix->pclass)) { + found = true; + break; + } + } + + if (!found) + continue; + } + size_t namelen = strlen(iface->name) + 1; c = malloc(sizeof(*c) + namelen); - c->length = iface->config_ip.assignment_length; - c->assigned = iface->config_ip.assignment_hint; + c->length = iface->assignment_length; + c->assigned = iface->assignment_hint; c->enabled = false; memcpy(c->name, iface->name, namelen); @@ -790,9 +806,12 @@ interface_update_prefix(struct vlist_tree *tree, struct device_prefix* interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until, - struct in6_addr *excl_addr, uint8_t excl_length) + struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass) { - struct device_prefix *prefix = calloc(1, sizeof(*prefix)); + if (!pclass) + pclass = (iface) ? iface->name : "local"; + + struct device_prefix *prefix = calloc(1, sizeof(*prefix) + strlen(pclass) + 1); prefix->length = length; prefix->addr = *addr; prefix->preferred_until = preferred_until; @@ -805,6 +824,8 @@ interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr, prefix->excl_length = excl_length; } + strcpy(prefix->pclass, pclass); + if (iface) vlist_add(&iface->proto_ip.prefix, &prefix->node, &prefix->addr); else @@ -841,7 +862,7 @@ interface_ip_set_ula_prefix(const char *prefix) interface_update_prefix(NULL, NULL, &ula_prefix->node); ula_prefix = interface_ip_add_device_prefix(NULL, &addr, length, - 0, 0, NULL, 0); + 0, 0, NULL, 0, NULL); } } diff --git a/interface-ip.h b/interface-ip.h index 4be97f2..442830b 100644 --- a/interface-ip.h +++ b/interface-ip.h @@ -70,6 +70,8 @@ struct device_prefix { uint8_t length; uint8_t excl_length; + + char pclass[]; }; struct device_addr { @@ -141,7 +143,7 @@ struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6, st struct device_prefix* interface_ip_add_device_prefix(struct interface *iface, struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until, - struct in6_addr *excl_addr, uint8_t excl_length); + struct in6_addr *excl_addr, uint8_t excl_length, const char *pclass); void interface_ip_set_ula_prefix(const char *prefix); void interface_refresh_assignments(bool hint); diff --git a/interface.c b/interface.c index 2e7a96f..76f8c70 100644 --- a/interface.c +++ b/interface.c @@ -42,6 +42,7 @@ enum { IFACE_ATTR_IP6HINT, IFACE_ATTR_IP4TABLE, IFACE_ATTR_IP6TABLE, + IFACE_ATTR_IP6CLASS, IFACE_ATTR_MAX }; @@ -59,10 +60,12 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_IP4TABLE] = { .name = "ip4table", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_IP6TABLE] = { .name = "ip6table", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY }, }; static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = { [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING }, }; const struct config_param_list interface_attr_list = { @@ -280,6 +283,77 @@ interface_remove_user(struct interface_user *dep) } static void +interface_add_assignment_classes(struct interface *iface, struct blob_attr *list) +{ + struct blob_attr *cur; + int rem; + + blobmsg_for_each_attr(cur, list, rem) { + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) + continue; + + if (!blobmsg_check_attr(cur, NULL)) + continue; + + struct interface_assignment_class *c = malloc(sizeof(*c) + blobmsg_data_len(cur)); + memcpy(c->name, blobmsg_data(cur), blobmsg_data_len(cur)); + list_add(&c->head, &iface->assignment_classes); + } +} + +static void +interface_clear_assignment_classes(struct interface *iface) +{ + while (!list_empty(&iface->assignment_classes)) { + struct interface_assignment_class *c = list_first_entry(&iface->assignment_classes, + struct interface_assignment_class, head); + list_del(&c->head); + free(c); + } +} + +static void +interface_merge_assignment_data(struct interface *old, struct interface *new) +{ + bool changed = (old->assignment_hint != new->assignment_hint || + old->assignment_length != new->assignment_length || + list_empty(&old->assignment_classes) != list_empty(&new->assignment_classes)); + + struct interface_assignment_class *c; + list_for_each_entry(c, &new->assignment_classes, head) { + // Compare list entries one-by-one to see if there was a change + if (list_empty(&old->assignment_classes)) // The new list is longer + changed = true; + + if (changed) + break; + + struct interface_assignment_class *c_old = list_first_entry(&old->assignment_classes, + struct interface_assignment_class, head); + + if (strcmp(c_old->name, c->name)) // An entry didn't match + break; + + list_del(&c_old->head); + free(c_old); + } + + // The old list was longer than the new one or the last entry didn't match + if (!list_empty(&old->assignment_classes)) { + interface_clear_assignment_classes(old); + changed = true; + } + + list_splice_init(&new->assignment_classes, &old->assignment_classes); + + if (changed) { + old->assignment_hint = new->assignment_hint; + old->assignment_length = new->assignment_length; + interface_refresh_assignments(true); + } +} + +static void interface_alias_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev) { struct interface *alias = container_of(dep, struct interface, parent_iface); @@ -354,6 +428,7 @@ interface_cleanup(struct interface *iface) list_for_each_entry_safe(dep, tmp, &iface->users, list) interface_remove_user(dep); + interface_clear_assignment_classes(iface); interface_ip_flush(&iface->config_ip); interface_cleanup_state(iface); } @@ -465,6 +540,7 @@ interface_init(struct interface *iface, const char *name, INIT_LIST_HEAD(&iface->errors); INIT_LIST_HEAD(&iface->users); INIT_LIST_HEAD(&iface->hotplug_list); + INIT_LIST_HEAD(&iface->assignment_classes); interface_ip_init(iface); avl_init(&iface->data, avl_strcmp, false, NULL); iface->config_ip.enabled = false; @@ -495,12 +571,16 @@ interface_init(struct interface *iface, const char *name, iface->metric = blobmsg_get_u32(cur); if ((cur = tb[IFACE_ATTR_IP6ASSIGN])) - iface->config_ip.assignment_length = blobmsg_get_u32(cur); + iface->assignment_length = blobmsg_get_u32(cur); - iface->config_ip.assignment_hint = -1; + iface->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->assignment_hint = strtol(blobmsg_get_string(cur), NULL, 16) & + ~((1 << (64 - iface->assignment_length)) - 1); + + if ((cur = tb[IFACE_ATTR_IP6CLASS])) + interface_add_assignment_classes(iface, cur); + if ((cur = tb[IFACE_ATTR_IP4TABLE])) { if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip4table)) @@ -729,7 +809,7 @@ static void interface_change_config(struct interface *if_old, struct interface *if_new) { struct blob_attr *old_config = if_old->config; - bool reload = false, reload_ip = false, reload_assignment = false; + bool reload = false, reload_ip = false; #define FIELD_CHANGED_STR(field) \ ((!!if_old->field != !!if_new->field) || \ @@ -774,8 +854,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new) 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); + interface_merge_assignment_data(if_old, if_new); #undef UPDATE @@ -794,9 +873,6 @@ interface_change_config(struct interface *if_old, struct interface *if_new) interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled); } - if (reload_assignment) - interface_refresh_assignments(true); - interface_write_resolv_conf(); out: diff --git a/interface.h b/interface.h index d186903..13761f8 100644 --- a/interface.h +++ b/interface.h @@ -60,9 +60,6 @@ struct interface_ip_settings { bool no_defaultroute; bool no_dns; - uint8_t assignment_length; - int32_t assignment_hint; - struct vlist_tree addr; struct vlist_tree route; struct vlist_tree prefix; @@ -76,6 +73,11 @@ struct interface_data { struct blob_attr data[]; }; +struct interface_assignment_class { + struct list_head head; + char name[]; +}; + /* * interface configuration */ @@ -121,6 +123,11 @@ struct interface { unsigned int ip4table; unsigned int ip6table; + /* IPv6 assignment parameters */ + uint8_t assignment_length; + int32_t assignment_hint; + struct list_head assignment_classes; + /* errors/warnings while trying to bring up the interface */ struct list_head errors; @@ -285,6 +285,7 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) char *prefstr = strtok_r(NULL, ",", &saveptr); char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr); char *addstr = (!validstr) ? NULL : strtok_r(NULL, ",", &saveptr); + const char *pclass = NULL; int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10); int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10); @@ -315,6 +316,8 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) return false; excludedp = &excluded; + } else if (!strcmp(key, "class")) { + pclass = val; } } @@ -333,7 +336,7 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) interface_ip_add_device_prefix(iface, &addr, length, valid_until, preferred_until, - excludedp, excl_length); + excludedp, excl_length, pclass); return true; } @@ -463,6 +463,8 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip) if (prefix->valid_until) blobmsg_add_u32(&b, "valid", prefix->valid_until - now); + blobmsg_add_string(&b, "class", prefix->pclass); + c = blobmsg_open_table(&b, "assigned"); struct device_prefix_assignment *assign; list_for_each_entry(assign, &prefix->assignments, head) { |