Add a missing cast for some platforms

[odhcp6c.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 9b664ed473a4430f0ab81e01bab637fba1fb05f5..f1122bddabbc44333961736a8480fcffb4dfb853 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -313,7 +313,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
        syslog(LOG_NOTICE, "Sending %s (timeout %us)", retx->name, timeout);
 
-       uint64_t start = adhc6c_get_milli_time(), round_start = start, elapsed;
+       uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
 
        // Generate transaction ID
        uint8_t trid[3];
@@ -344,7 +344,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
                // Receive rounds
                for (; len < 0 && round_start < round_end;
-                               round_start = adhc6c_get_milli_time()) {
+                               round_start = odhcp6c_get_milli_time()) {
                        // Check for pending signal
                        if (odhcp6c_signal_is_pending())
                                return -1;
@@ -365,7 +365,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
                                uint8_t *opt = &buf[4];
                                uint8_t *opt_end = opt + len - 4;
 
-                               round_start = adhc6c_get_milli_time();
+                               round_start = odhcp6c_get_milli_time();
                                elapsed = round_start - start;
                                syslog(LOG_NOTICE, "Got a valid reply after "
                                                "%ums", (unsigned)elapsed);
@@ -476,21 +476,23 @@ static int dhcpv6_handle_advert(_unused enum dhcpv6_msg orig,
                if (otype == DHCPV6_OPT_SERVERID && olen <= 130) {
                        memcpy(cand.duid, odata, olen);
                        cand.duid_len = olen;
-               } else if (otype == DHCPV6_OPT_STATUS && olen >= 2 &&
-                               !odata[0] && odata[1] == DHCPV6_NoAddrsAvail) {
+               } else if (otype == DHCPV6_OPT_STATUS && olen >= 2 && !odata[0]
+                               && odata[1] == DHCPV6_NoAddrsAvail) {
                        if (na_mode == IA_MODE_FORCE) {
                                return -1;
                        } else {
                                cand.has_noaddravail = true;
                                cand.preference -= 1000;
                        }
+               } else if (otype == DHCPV6_OPT_STATUS && olen >= 2 && !odata[0]
+                               && odata[1] == DHCPV6_NoPrefixAvail) {
+                       cand.preference -= 2000;
                } else if (otype == DHCPV6_OPT_PREF && olen >= 1 &&
                                cand.preference >= 0) {
                        cand.preference = odata[1];
                } else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
                        cand.wants_reconfigure = true;
-               }
-               else if (otype == DHCPV6_OPT_IA_PD && request_prefix) {
+               } else if (otype == DHCPV6_OPT_IA_PD && request_prefix) {
                        struct dhcpv6_ia_hdr *h = (void*)odata;
                        uint8_t *oend = odata + olen, *d;
                        dhcpv6_for_each_option(&h[1], oend, otype, olen, d) {
@@ -499,7 +501,7 @@ static int dhcpv6_handle_advert(_unused enum dhcpv6_msg orig,
                                else if (otype == DHCPV6_OPT_STATUS &&
                                                olen >= 2 && d[0] == 0 &&
                                                d[1] == DHCPV6_NoPrefixAvail)
-                                       return -1;
+                                       cand.preference -= 2000;
                        }
                }
        }
@@ -627,6 +629,10 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
                        if (l_t2 > 0 && t2 > l_t2)
                                t2 = l_t2;
 
+                       // Always report update in case we have IA_PDs so that
+                       // the state-script is called with updated times
+                       if (otype == DHCPV6_OPT_IA_PD && request_prefix)
+                               have_update = true;
 
                        time_t n = dhcpv6_parse_ia(&ia_hdr[1], odata + olen);