Implement RFC 3319 options

[odhcp6c.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 21f0b22256702243ed223b30fa098799fab65fc7..9a451d0568232896c084ed33d3138f46a35f5e59 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);
@@ -573,11 +573,16 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
 
        t1 = t2 = t3 = 86400;
 
-       size_t ia_na_len, dns_len, search_len;
+       size_t ia_na_len, dns_len, search_len, sntp_ip_len, sntp_dns_len;
+       size_t sip_ip_len, sip_fqdn_len;
        uint8_t *ia_na = odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
        uint8_t *ia_end;
        odhcp6c_get_state(STATE_DNS, &dns_len);
        odhcp6c_get_state(STATE_SEARCH, &search_len);
+       odhcp6c_get_state(STATE_SNTP_IP, &sntp_ip_len);
+       odhcp6c_get_state(STATE_SNTP_FQDN, &sntp_dns_len);
+       odhcp6c_get_state(STATE_SIP_IP, &sip_ip_len);
+       odhcp6c_get_state(STATE_SIP_FQDN, &sip_fqdn_len);
 
        // Decrease valid and preferred lifetime of prefixes
        size_t ia_pd_len;
@@ -629,6 +634,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);
 
@@ -642,9 +651,29 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
                                t3 = n;
 
                } else if (otype == DHCPV6_OPT_DNS_SERVERS) {
-                       odhcp6c_add_state(STATE_DNS, odata, olen);
+                       if (olen == 16)
+                               odhcp6c_add_state(STATE_DNS, odata, olen);
                } else if (otype == DHCPV6_OPT_DNS_DOMAIN) {
                        odhcp6c_add_state(STATE_SEARCH, odata, olen);
+               } else if (otype == DHCPV6_OPT_NTP_SERVER) {
+                       uint16_t stype, slen;
+                       uint8_t *sdata;
+                       // Test status and bail if error
+                       dhcpv6_for_each_option(odata, odata + olen,
+                                       stype, slen, sdata) {
+                               if (slen == 16 && (stype == NTP_MC_ADDR ||
+                                               stype == NTP_SRV_ADDR))
+                                       odhcp6c_add_state(STATE_SNTP_IP,
+                                                       sdata, slen);
+                               else if (slen > 0 && stype == NTP_SRV_FQDN)
+                                       odhcp6c_add_state(STATE_SNTP_FQDN,
+                                                       sdata, slen);
+                       }
+               } else if (otype == DHCPV6_OPT_SIP_SERVER_A) {
+                       if (olen == 16)
+                               odhcp6c_add_state(STATE_SIP_IP, odata, olen);
+               } else if (otype == DHCPV6_OPT_SIP_SERVER_D) {
+                       odhcp6c_add_state(STATE_SIP_FQDN, odata, olen);
                } else if (otype == DHCPV6_OPT_INFO_REFRESH && olen >= 4) {
                        uint32_t refresh = ntohl(*((uint32_t*)odata));
                        if (refresh < (uint32_t)t1)
@@ -659,6 +688,12 @@ static int dhcpv6_handle_reply(_unused enum dhcpv6_msg orig,
        if (opt) {
                have_update |= odhcp6c_commit_state(STATE_DNS, dns_len);
                have_update |= odhcp6c_commit_state(STATE_SEARCH, search_len);
+               have_update |= odhcp6c_commit_state(STATE_SNTP_IP,
+                               sntp_ip_len);
+               have_update |= odhcp6c_commit_state(STATE_SNTP_FQDN,
+                               sntp_dns_len);
+               have_update |= odhcp6c_commit_state(STATE_SIP_IP, sip_ip_len);
+               have_update |= odhcp6c_commit_state(STATE_SIP_FQDN, sip_fqdn_len);
                size_t new_ia_pd_len, new_ia_na_len;
                odhcp6c_get_state(STATE_IA_PD, &new_ia_pd_len);
                odhcp6c_get_state(STATE_IA_NA, &new_ia_na_len);