config: Fix RA interface config being overwritten

[project/odhcpd.git] / src / dhcpv6-ia.c

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 597bc74..20ef1f8 100644 (file)
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -114,6 +114,8 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                        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));
+                       /* Infinite valid */
+                       a->valid_until = 0;
 
                        // Assign to all interfaces
                        struct dhcpv6_assignment *c;
@@ -243,11 +245,12 @@ void dhcpv6_write_statefile(void)
                                        odhcpd_hexlify(duidbuf, c->clid_data, c->clid_len);
 
                                        // iface DUID iaid hostname lifetime assigned length [addrs...]
-                                       int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s %x %s %u %x %u ",
+                                       int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s %x %s %ld %x %u ",
                                                        iface->ifname, duidbuf, ntohl(c->iaid),
                                                        (c->hostname ? c->hostname : "-"),
-                                                       (unsigned)(c->valid_until > now ?
-                                                                       (c->valid_until - now + wall_time) : 0),
+                                                       (c->valid_until > now ?
+                                                               (c->valid_until - now + wall_time) :
+                                                               (INFINITE_VALID(c->valid_until) ? -1 : 0)),
                                                        c->assigned, (unsigned)c->length);
 
                                        struct in6_addr addr;
@@ -305,11 +308,12 @@ void dhcpv6_write_statefile(void)
                                        odhcpd_hexlify(duidbuf, c->hwaddr, sizeof(c->hwaddr));
 
                                        // iface DUID iaid hostname lifetime assigned length [addrs...]
-                                       int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s ipv4 %s %u %x 32 ",
+                                       int l = snprintf(leasebuf, sizeof(leasebuf), "# %s %s ipv4 %s %ld %x 32 ",
                                                        iface->ifname, duidbuf,
                                                        (c->hostname ? c->hostname : "-"),
-                                                       (unsigned)(c->valid_until > now ?
-                                                                       (c->valid_until - now + wall_time) : 0),
+                                                       (c->valid_until > now ?
+                                                               (c->valid_until - now + wall_time) :
+                                                               (INFINITE_VALID(c->valid_until) ? -1 : 0)),
                                                        c->addr);
 
                                        struct in_addr addr = {htonl(c->addr)};
@@ -769,8 +773,10 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                                }
                        }
 
-                       /* UINT32_MAX is considered as infinite leasetime */
-                       a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
+                       if (!INFINITE_VALID(a->valid_until))
+                               /* UINT32_MAX is considered as infinite leasetime */
+                               a->valid_until = (valid == UINT32_MAX) ? 0 : valid + now;
+
                        out.t1 = htonl((pref == UINT32_MAX) ? pref : pref * 5 / 10);
                        out.t2 = htonl((pref == UINT32_MAX) ? pref : pref * 8 / 10);
 
@@ -1033,7 +1039,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                        if (((c->clid_len == clid_len && !memcmp(c->clid_data, clid_data, clid_len)) ||
                                        (c->clid_len >= clid_len && !c->clid_data[0] && !c->clid_data[1]
                                                && !memcmp(c->mac, mac, sizeof(mac)))) &&
-                                       (c->iaid == ia->iaid || (!INFINITE_VALID(c->valid_until) && c->valid_until < now)) &&
+                                       (c->iaid == ia->iaid || INFINITE_VALID(c->valid_until) || now < c->valid_until) &&
                                        ((is_pd && c->length <= 64) || (is_na && c->length == 128))) {
                                a = c;
 
@@ -1064,6 +1070,9 @@ 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
+                                       a->valid_until = now;
 
                                        if (first)
                                                memcpy(a->key, first->key, sizeof(a->key));
@@ -1116,7 +1125,8 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
                        // Was only a solicitation: mark binding for removal
                        if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
-                               a->valid_until = now;
+                               if (!INFINITE_VALID(a->valid_until))
+                                       a->valid_until = now;
                        } else if (assigned && hdr->msg_type == DHCPV6_MSG_REQUEST) {
                                if (hostname_len > 0) {
                                        a->hostname = realloc(a->hostname, hostname_len + 1);
@@ -1143,9 +1153,12 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                if (a)
                                        apply_lease(iface, a, true);
                        } else if (hdr->msg_type == DHCPV6_MSG_RELEASE) {
-                               a->valid_until = now - 1;
+                               if (!INFINITE_VALID(a->valid_until))
+                                       a->valid_until = now - 1;
+
                                apply_lease(iface, a, false);
-                       } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
+                       } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128 &&
+                                       !INFINITE_VALID(a->valid_until)) {
                                a->clid_len = 0;
                                a->valid_until = now + 3600; // Block address for 1h
                        }