Update the no_delegation parameter on a config reload; in case prefixes are present update the prefix assignments as well according to the no_delegation status
Signed-off-by: Hans Dedecker <[email protected]> --- interface-ip.c | 14 ++++++++++++++ interface-ip.h | 1 + interface.c | 10 +++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/interface-ip.c b/interface-ip.c index 1a6c28d..83f1dfa 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -1053,6 +1053,20 @@ void interface_refresh_assignments(bool hint) refresh = hint; } +void interface_update_prefix_delegation(struct interface_ip_settings *ip) +{ + struct device_prefix *prefix; + + vlist_for_each_element(&ip->prefix, prefix, node) { + interface_update_prefix_assignments(prefix, !ip->no_delegation); + + if (ip->no_delegation) { + if (prefix->head.next) + list_del(&prefix->head); + } else + list_add(&prefix->head, &prefixes); + } +} static void interface_update_prefix(struct vlist_tree *tree, diff --git a/interface-ip.h b/interface-ip.h index ec6d7fb..21c6e9b 100644 --- a/interface-ip.h +++ b/interface-ip.h @@ -172,5 +172,6 @@ struct device_prefix* interface_ip_add_device_prefix(struct interface *iface, 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); +void interface_update_prefix_delegation(struct interface_ip_settings *ip); #endif diff --git a/interface.c b/interface.c index b21d234..b8c4ae2 100644 --- a/interface.c +++ b/interface.c @@ -1197,7 +1197,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; + bool reload = false, reload_ip = false, update_prefix_delegation = false; #define FIELD_CHANGED_STR(field) \ ((!!if_old->field != !!if_new->field) || \ @@ -1247,6 +1247,11 @@ interface_change_config(struct interface *if_old, struct interface *if_new) if_old->force_link = if_new->force_link; if_old->dns_metric = if_new->dns_metric; + if (if_old->proto_ip.no_delegation != if_new->proto_ip.no_delegation) { + if_old->proto_ip.no_delegation = if_new->proto_ip.no_delegation; + update_prefix_delegation = true; + } + if_old->proto_ip.no_dns = if_new->proto_ip.no_dns; interface_replace_dns(&if_old->config_ip, &if_new->config_ip); @@ -1276,6 +1281,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new) interface_ip_set_enabled(&if_old->config_ip, config_ip_enabled); } + if (update_prefix_delegation) + interface_update_prefix_delegation(&if_old->proto_ip); + interface_write_resolv_conf(); if (if_old->main_dev.dev) interface_check_state(if_old); -- 2.19.2 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
