dhcpv6-ia: update valid_until only for non static DHCPv6 leases
[project/odhcpd.git] / src / dhcpv6-ia.c
index 35c6ae3..c8786c3 100644 (file)
@@ -71,10 +71,10 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                        list_add(&border->head, &iface->ia_assignments);
                }
 
-               // Parse static entries
+               /* Parse static entries */
                struct lease *lease;
                list_for_each_entry(lease, &leases, head) {
-                       // Construct entry
+                       /* Construct entry */
                        size_t duid_len = lease->duid_len ? lease->duid_len : 14;
                        struct dhcpv6_assignment *a = calloc(1, sizeof(*a) + duid_len);
                        if (!a) {
@@ -94,6 +94,7 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                                uint32_t i4a = ntohl(lease->ipaddr.s_addr) & 0xff;
                                a->assigned = ((i4a / 100) << 8) | (((i4a % 100) / 10) << 4) | (i4a % 10);
                        }
+
                        odhcpd_urandom(a->key, sizeof(a->key));
                        memcpy(a->clid_data, lease->duid, lease->duid_len);
                        memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
@@ -108,10 +109,9 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                                if (c->length != 128 || c->assigned > a->assigned) {
                                        list_add_tail(&a->head, &c->head);
                                        break;
-                               } else if (c->assigned == a->assigned) {
-                                       // Already an assignment with that number
+                               } else if (c->assigned == a->assigned)
+                                       /* Already an assignment with that number */
                                        break;
-                               }
                        }
 
                        if (a->head.next) {
@@ -119,10 +119,8 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                                        free(a->hostname);
                                        a->hostname = strdup(lease->hostname);
                                }
-                       } else {
-                               free(a->hostname);
-                               free(a);
-                       }
+                       } else
+                               free_dhcpv6_assignment(a);
                }
        }
        return 0;
@@ -143,6 +141,25 @@ static void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
        free(c);
 }
 
+static inline bool valid_addr(const struct odhcpd_ipaddr *addr, time_t now)
+{
+       return (addr->prefix <= 96 && addr->preferred > (uint32_t)now);
+}
+
+static size_t elect_addr(const struct odhcpd_ipaddr *addrs, const size_t addrlen)
+{
+       size_t i, m;
+
+       for (i = 0, m = 0; i < addrlen; ++i) {
+               if (addrs[i].preferred > addrs[m].preferred ||
+                       (addrs[i].preferred == addrs[m].preferred &&
+                        memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
+                       m = i;
+       }
+
+       return m;
+}
+
 static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign)
 {
        struct {
@@ -254,18 +271,12 @@ void dhcpv6_write_statefile(void)
                                        struct in6_addr addr;
                                        struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->ia_addr;
                                        size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->ia_addr_len;
-                                       size_t m = 0;
-
-                                       for (size_t i = 0; i < addrlen; ++i)
-                                               if (addrs[i].preferred > addrs[m].preferred ||
-                                                               (addrs[i].preferred == addrs[m].preferred &&
-                                                                               memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
-                                                       m = i;
+                                       size_t m = elect_addr(addrs, addrlen);
 
                                        for (size_t i = 0; i < addrlen; ++i) {
-                                               if (addrs[i].prefix > 96 || (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
+                                               if (!valid_addr(&addrs[i], now) || (!INFINITE_VALID(c->valid_until) && c->valid_until <= now) ||
                                                                (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m &&
-                                                                               addrs[i].prefix == 64))
+                                                                               addrs[i].prefix <= 64))
                                                        continue;
 
                                                addr = addrs[i].addr;
@@ -439,17 +450,21 @@ static void managed_handle_pd_data(struct ustream *s, _unused int bytes_new)
 
        if (first && c->managed_size == 0)
                free_dhcpv6_assignment(c);
-       else if (first)
+       else if (first & !(c->flags & OAF_STATIC))
                c->valid_until = now + 150;
 }
 
 
-// TCP transmission has ended, either because of success or timeout or other error
+/* TCP transmission has ended, either because of success or timeout or other error */
 static void managed_handle_pd_done(struct ustream *s)
 {
        struct dhcpv6_assignment *c = container_of(s, struct dhcpv6_assignment, managed_sock);
-       c->valid_until = odhcpd_time() + 15;
+
+       if (!(c->flags & OAF_STATIC))
+               c->valid_until = odhcpd_time() + 15;
+
        c->managed_size = 0;
+
        if (c->accept_reconf)
                c->reconf_cnt = 1;
 }
@@ -471,10 +486,13 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
                                        iaidbuf, assign->iaid, assign->length);
                        ustream_write_pending(&assign->managed_sock.stream);
                        assign->managed_size = -1;
-                       assign->valid_until = odhcpd_time() + 15;
+
+                       if (!(assign->flags & OAF_STATIC))
+                               assign->valid_until = odhcpd_time() + 15;
+
                        list_add(&assign->head, &iface->ia_assignments);
 
-                       // Wait initial period of up to 250ms for immediate assignment
+                       /* Wait initial period of up to 250ms for immediate assignment */
                        struct pollfd pfd = { .fd = fd, .events = POLLIN };
                        poll(&pfd, 1, 250);
                        managed_handle_pd_data(&assign->managed_sock.stream, 0);
@@ -484,11 +502,10 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
                }
 
                return false;
-       } else if (iface->ia_addr_len < 1) {
+       } else if (iface->ia_addr_len < 1)
                return false;
-       }
 
-       // Try honoring the hint first
+       /* Try honoring the hint first */
        uint32_t current = 1, asize = (1 << (64 - assign->length)) - 1;
        if (assign->assigned) {
                list_for_each_entry(c, &iface->ia_assignments, head) {
@@ -506,7 +523,7 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
                }
        }
 
-       // Fallback to a variable assignment
+       /* Fallback to a variable assignment */
        current = 1;
        list_for_each_entry(c, &iface->ia_assignments, head) {
                if (c->length == 128 || c->length == 0)
@@ -529,13 +546,13 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
 
 static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
 {
-       // Seed RNG with checksum of DUID
+       /* Seed RNG with checksum of DUID */
        uint32_t seed = 0;
        for (size_t i = 0; i < assign->clid_len; ++i)
                seed += assign->clid_data[i];
        srand(seed);
 
-       // Try to assign up to 100x
+       /* Try to assign up to 100x */
        for (size_t i = 0; i < 100; ++i) {
                uint32_t try;
                do try = ((uint32_t)rand()) % 0x0fff; while (try < 0x100);
@@ -549,9 +566,8 @@ static bool assign_na(struct interface *iface, struct dhcpv6_assignment *assign)
                                assign->assigned = try;
                                list_add_tail(&assign->head, &c->head);
                                return true;
-                       } else if (c->assigned == try) {
+                       } else if (c->assigned == try)
                                break;
-                       }
                }
        }
 
@@ -565,6 +581,7 @@ void dhcpv6_ia_preupdate(struct interface *iface)
 
        struct dhcpv6_assignment *c, *border = list_last_entry(
                        &iface->ia_assignments, struct dhcpv6_assignment, head);
+
        list_for_each_entry(c, &iface->ia_assignments, head)
                if (c != border && !iface->managed)
                        apply_lease(iface, c, false);
@@ -585,6 +602,7 @@ void dhcpv6_ia_postupdate(struct interface *iface, time_t now)
 
        struct dhcpv6_assignment *border = list_last_entry(
                        &iface->ia_assignments, struct dhcpv6_assignment, head);
+
        if (minprefix > 32 && minprefix <= 64)
                border->assigned = 1U << (64 - minprefix);
        else
@@ -607,7 +625,7 @@ void dhcpv6_ia_postupdate(struct interface *iface, time_t now)
                        c->reconf_sent = now;
                        send_reconf(iface, c);
 
-                       // Leave all other assignments of that client alone
+                       /* Leave all other assignments of that client alone */
                        struct dhcpv6_assignment *a;
                        list_for_each_entry(a, &iface->ia_assignments, head)
                                if (a != c && a->clid_len == c->clid_len &&
@@ -640,10 +658,9 @@ static void reconf_timer(struct uloop_timeout *event)
                list_for_each_entry_safe(a, n, &iface->ia_assignments, head) {
                        if (!INFINITE_VALID(a->valid_until) && a->valid_until < now) {
                                if ((a->length < 128 && a->clid_len > 0) ||
-                                               (a->length == 128 && a->clid_len == 0)) {
-                                       list_del(&a->head);
+                                               (a->length == 128 && a->clid_len == 0))
                                        free_dhcpv6_assignment(a);
-                               }
+
                        } else if (a->reconf_cnt > 0 && a->reconf_cnt < 8 &&
                                        now > a->reconf_sent + (1 << a->reconf_cnt)) {
                                ++a->reconf_cnt;
@@ -679,11 +696,11 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
        } else {
                if (a) {
                        uint32_t leasetime;
-                       if (a->leasetime > 0) {
+                       if (a->leasetime > 0)
                                leasetime = a->leasetime;
-                       } else {
+                       else
                                leasetime = iface->dhcpv4_leasetime;
-                       }
+
                        if (leasetime == 0)
                                leasetime = 3600;
                        else if (leasetime < 60)
@@ -694,20 +711,13 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 
                        struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
                        size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
-                       size_t m = 0;
-
-                       for (size_t i = 0; i < addrlen; ++i)
-                               if (addrs[i].preferred > addrs[m].preferred ||
-                                               (addrs[i].preferred == addrs[m].preferred &&
-                                                               memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
-                                       m = i;
+                       size_t m = elect_addr(addrs, addrlen);
 
                        for (size_t i = 0; i < addrlen; ++i) {
                                uint32_t prefix_pref = addrs[i].preferred;
                                uint32_t prefix_valid = addrs[i].valid;
 
-                               if (addrs[i].prefix > 96 ||
-                                               addrs[i].preferred <= (uint32_t)now)
+                               if (!valid_addr(&addrs[i], now))
                                        continue;
 
                                if (prefix_pref != UINT32_MAX)
@@ -758,7 +768,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                                        datalen += entrlen + 4;
                                }
 
-                               // Calculate T1 / T2 based on non-deprecated addresses
+                               /* Calculate T1 / T2 based on non-deprecated addresses */
                                if (prefix_pref > 0) {
                                        if (prefix_pref < pref)
                                                pref = prefix_pref;
@@ -798,8 +808,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                                        size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
 
                                        for (size_t i = 0; i < addrlen; ++i) {
-                                               if (addrs[i].prefix > 96 ||
-                                                               addrs[i].preferred <= (uint32_t)now)
+                                               if (!valid_addr(&addrs[i], now))
                                                        continue;
 
                                                struct in6_addr addr = addrs[i].addr;
@@ -919,7 +928,7 @@ static void dhcpv6_log(uint8_t msgtype, struct interface *iface, time_t now,
                char addrbuf[INET6_ADDRSTRLEN];
 
                for (size_t i = 0; i < addrlen; ++i) {
-                       if (addrs[i].prefix > 96 || addrs[i].preferred <= (uint32_t)now)
+                       if (!valid_addr(&addrs[i], now))
                                continue;
 
                        struct in6_addr addr = addrs[i].addr;
@@ -946,8 +955,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
        const struct dhcpv6_client_header *hdr = data;
        uint8_t *start = (uint8_t*)&hdr[1], *odata;
        uint16_t otype, olen;
-
-       // Find and parse client-id and hostname
+       /* Find and parse client-id and hostname */
        bool accept_reconf = false;
        uint8_t *clid_data = NULL, clid_len = 0, mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
        char hostname[256];
@@ -974,9 +982,8 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
                        if (dn_expand(&fqdn_buf[1], &fqdn_buf[olen], &fqdn_buf[1], hostname, sizeof(hostname)) > 0)
                                hostname_len = strcspn(hostname, ".");
-               } else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
+               } else if (otype == DHCPV6_OPT_RECONF_ACCEPT)
                        accept_reconf = true;
-               }
        }
 
        if (!clid_data || !clid_len || clid_len > 130)
@@ -995,7 +1002,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                uint8_t reqlen = (is_pd) ? 62 : 128;
                uint32_t reqhint = 0;
 
-               // Parse request hint for IA-PD
+               /* Parse request hint for IA-PD */
                if (is_pd) {
                        uint8_t *sdata;
                        uint16_t stype, slen;
@@ -1025,7 +1032,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                        }
                }
 
-               // Find assignment
+               /* Find assignment */
                struct dhcpv6_assignment *c, *a = NULL;
                list_for_each_entry(c, &iface->ia_assignments, head) {
                        if (((c->clid_len == clid_len && !memcmp(c->clid_data, clid_data, clid_len)) ||
@@ -1047,14 +1054,16 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                        }
                }
 
-               // Generic message handling
+               /* Generic message handling */
                uint16_t status = DHCPV6_STATUS_OK;
-               if (a && a->managed_size < 0) {
+               if (a && a->managed_size < 0)
                        return -1;
-               } else if (hdr->msg_type == DHCPV6_MSG_SOLICIT || hdr->msg_type == DHCPV6_MSG_REQUEST) {
+
+               if (hdr->msg_type == DHCPV6_MSG_SOLICIT || hdr->msg_type == DHCPV6_MSG_REQUEST) {
                        bool assigned = !!a;
 
-                       if (!a && !iface->no_dynamic_dhcp) { // Create new binding
+                       if (!a && !iface->no_dynamic_dhcp) {
+                               /* Create new binding */
                                a = calloc(1, sizeof(*a) + clid_len);
                                if (a) {
                                        a->clid_len = clid_len;
@@ -1062,8 +1071,8 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                        a->length = reqlen;
                                        a->peer = *addr;
                                        a->assigned = reqhint;
-                                       // Set valid time to current time indicating
-                                       // assignment is not having infinite lifetime
+                                       /* Set valid time to current time indicating  */
+                                       /* assignment is not having infinite lifetime */
                                        a->valid_until = now;
 
                                        if (first)
@@ -1083,9 +1092,10 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                }
                        }
 
-                       if (!assigned || iface->ia_addr_len == 0) { // Set error status
+                       if (!assigned || iface->ia_addr_len == 0)
+                               /* Set error status */
                                status = (is_pd) ? DHCPV6_STATUS_NOPREFIXAVAIL : DHCPV6_STATUS_NOADDRSAVAIL;
-                       } else if (assigned && !first) { //
+                       else if (assigned && !first) {
                                size_t handshake_len = 4;
                                buf[0] = 0;
                                buf[1] = DHCPV6_OPT_RECONF_ACCEPT;
@@ -1115,7 +1125,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
                        ia_response_len = append_reply(buf, buflen, status, ia, a, iface, true);
 
-                       // Was only a solicitation: mark binding for removal
+                       /* Was only a solicitation: mark binding for removal */
                        if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
                                a->flags &= ~OAF_BOUND;
 
@@ -1132,9 +1142,10 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                a->accept_reconf = accept_reconf;
                                a->flags |= OAF_BOUND;
                                apply_lease(iface, a, true);
-                       } else if (!assigned && a && a->managed_size == 0) { // Cleanup failed assignment
+                       } else if (!assigned && a && a->managed_size == 0)
+                               /* Cleanup failed assignment */
                                free_dhcpv6_assignment(a);
-                       }
+
                } else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
                                hdr->msg_type == DHCPV6_MSG_RELEASE ||
                                hdr->msg_type == DHCPV6_MSG_REBIND ||
@@ -1160,11 +1171,11 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
                                if (!(a->flags & OAF_STATIC)) {
                                        a->clid_len = 0;
-                                       a->valid_until = now + 3600; // Block address for 1h
+                                       a->valid_until = now + 3600; /* Block address for 1h */
                                }
                        }
                } else if (hdr->msg_type == DHCPV6_MSG_CONFIRM && ia_addr_present) {
-                       // Send NOTONLINK for CONFIRM with addr present so that clients restart connection
+                       /* Send NOTONLINK for CONFIRM with addr present so that clients restart connection */
                        status = DHCPV6_STATUS_NOTONLINK;
                        ia_response_len = append_reply(buf, buflen, status, ia, a, iface, true);
                        notonlink = true;