Do not send undesired preferences for valid and / or preferred times

[odhcp6c.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 4bca6e78e6f85b34383215335c825d8426d17232..8be70af19797ffde5ed2ddf73646a13a90463280 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -44,7 +44,7 @@
 static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
                const uint8_t transaction[3], enum dhcpv6_msg type);
 
-static time_t dhcpv6_parse_ia(void *opt, void *end);
+static uint32_t dhcpv6_parse_ia(void *opt, void *end);
 
 static reply_handler dhcpv6_handle_reply;
 static reply_handler dhcpv6_handle_advert;
@@ -76,7 +76,7 @@ static struct dhcpv6_retx dhcpv6_retx[_DHCPV6_MSG_MAX] = {
 // Sockets
 static int sock = -1;
 static int ifindex = -1;
-static time_t t1 = 0, t2 = 0, t3 = 0;
+static int64_t t1 = 0, t2 = 0, t3 = 0;
 
 // IA states
 static int request_prefix = -1;
@@ -207,8 +207,8 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
        for (size_t i = 0; i < ia_pd_entries; ++i) {
                p[i].type = htons(DHCPV6_OPT_IA_PREFIX);
                p[i].len = htons(sizeof(p[i]) - 4U);
-               p[i].preferred = htonl(e[i].preferred);
-               p[i].valid = htonl(e[i].valid);
+               p[i].preferred = 0;
+               p[i].valid = 0;
                p[i].prefix = e[i].length;
                p[i].addr = e[i].target;
        }
@@ -241,8 +241,8 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
                pa[i].type = htons(DHCPV6_OPT_IA_ADDR);
                pa[i].len = htons(sizeof(pa[i]) - 4U);
                pa[i].addr = e[i].target;
-               pa[i].preferred = htonl(e[i].preferred);
-               pa[i].valid = htonl(e[i].valid);
+               pa[i].preferred = 0;
+               pa[i].valid = 0;
        }
 
        ia_na = pa;
@@ -640,8 +640,8 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
                if ((otype == DHCPV6_OPT_IA_PD || otype == DHCPV6_OPT_IA_NA)
                                && olen > sizeof(struct dhcpv6_ia_hdr)) {
                        struct dhcpv6_ia_hdr *ia_hdr = (void*)(&odata[-4]);
-                       time_t l_t1 = ntohl(ia_hdr->t1);
-                       time_t l_t2 = ntohl(ia_hdr->t2);
+                       uint32_t l_t1 = ntohl(ia_hdr->t1);
+                       uint32_t l_t2 = ntohl(ia_hdr->t2);
 
                        // Test ID and T1-T2 validity
                        if (ia_hdr->iaid != 1 || l_t2 < l_t1)
@@ -663,7 +663,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
                        if (l_t2 > 0 && t2 > l_t2)
                                t2 = l_t2;
 
-                       time_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
+                       uint32_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);
 
                        if (n < t1)
                                t1 = n;
@@ -713,7 +713,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig,
 }
 
 
-static time_t dhcpv6_parse_ia(void *opt, void *end)
+static uint32_t dhcpv6_parse_ia(void *opt, void *end)
 {
        uint32_t timeout = UINT32_MAX; // Minimum timeout
        uint16_t otype, olen;