IPv6 prefixes: conform to RFC 6204 requirement L13

[project/netifd.git] / interface-ip.c

diff --git a/interface-ip.c b/interface-ip.c
index 892631d..56f8bd9 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -456,8 +456,13 @@ interface_set_prefix_address(struct interface *iface, bool add,
        addr.valid_until = assignment->prefix->valid_until;
 
        if (!add) {
-               if (assignment->enabled)
-                       system_del_address(l3_downlink, &addr);
+               if (assignment->enabled) {
+                       time_t now = system_get_rtime();
+                       addr.preferred_until = now;
+                       if (addr.valid_until - now > 7200)
+                               addr.valid_until = now + 7200;
+                       system_add_address(l3_downlink, &addr);
+               }
        } else {
                system_add_address(l3_downlink, &addr);
 
@@ -634,12 +639,18 @@ void
 interface_ip_set_ula_prefix(const char *prefix)
 {
        char buf[INET6_ADDRSTRLEN + 4] = {0}, *saveptr;
-       strncpy(buf, prefix, sizeof(buf) - 1);
+       if (prefix)
+               strncpy(buf, prefix, sizeof(buf) - 1);
        char *prefixaddr = strtok_r(buf, "/", &saveptr);
 
        struct in6_addr addr;
-       if (!prefixaddr || inet_pton(AF_INET6, prefixaddr, &addr) < 1)
+       if (!prefixaddr || inet_pton(AF_INET6, prefixaddr, &addr) < 1) {
+               if (ula_prefix) {
+                       interface_update_prefix(NULL, NULL, &ula_prefix->node);
+                       ula_prefix = NULL;
+               }
                return;
+       }
 
        int length;
        char *prefixlen = strtok_r(NULL, ",", &saveptr);