dhcpv6: respect renew end point when handling reconfigure message
[project/odhcp6c.git] / src / dhcpv6.c
index c5f11f13141dfeb87c4eff4ddb82890ae49b16c2..6dc227fe6f37f77895f21473e4059fbb85bac39d 100644 (file)
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2012-2014 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2017 Hans Dedecker <dedeckeh@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -15,6 +16,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <limits.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <arpa/inet.h>
 #include <netinet/in.h>
 
 #include <net/if.h>
 #include <net/ethernet.h>
 
 #include "odhcp6c.h"
+#ifdef USE_LIBUBOX
+#include <libubox/md5.h>
+#else
 #include "md5.h"
+#endif
 
 
 #define ALL_DHCPV6_RELAYS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
@@ -72,8 +79,6 @@ static reply_handler dhcpv6_handle_rebind_reply;
 static reply_handler dhcpv6_handle_reconfigure;
 static int dhcpv6_commit_advert(void);
 
-
-
 // RFC 3315 - 5.5 Timeout and Delay values
 static struct dhcpv6_retx dhcpv6_retx[_DHCPV6_MSG_MAX] = {
        [DHCPV6_MSG_UNKNOWN] = {false, 1, 120, 0, "<POLL>",
@@ -92,7 +97,6 @@ static struct dhcpv6_retx dhcpv6_retx[_DHCPV6_MSG_MAX] = {
                        dhcpv6_handle_reply, NULL},
 };
 
-
 // Sockets
 static int sock = -1;
 static int ifindex = -1;
@@ -102,6 +106,8 @@ static int64_t t1 = 0, t2 = 0, t3 = 0;
 static int request_prefix = -1;
 static enum odhcp6c_ia_mode na_mode = IA_MODE_NONE, pd_mode = IA_MODE_NONE;
 static bool accept_reconfig = false;
+// Server unicast address
+static struct in6_addr server_addr = IN6ADDR_ANY_INIT;
 
 // Reconfigure key
 static uint8_t reconf_key[16];
@@ -109,6 +115,13 @@ static uint8_t reconf_key[16];
 // client options
 static unsigned int client_options = 0;
 
+static uint32_t ntohl_unaligned(const uint8_t *data)
+{
+       uint32_t buf;
+
+       memcpy(&buf, data, sizeof(buf));
+       return ntohl(buf);
+}
 
 int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
 {
@@ -124,6 +137,7 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
        strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
        if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0)
                return -1;
+
        ifindex = ifr.ifr_ifindex;
 
        // Create client DUID
@@ -168,6 +182,7 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
                        htons(DHCPV6_OPT_SIP_SERVER_A),
                        htons(DHCPV6_OPT_DNS_SERVERS),
                        htons(DHCPV6_OPT_DNS_DOMAIN),
+                       htons(DHCPV6_OPT_UNICAST),
                        htons(DHCPV6_OPT_SNTP_SERVERS),
                        htons(DHCPV6_OPT_NTP_SERVER),
                        htons(DHCPV6_OPT_AFTR_NAME),
@@ -193,6 +208,7 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
 
        struct sockaddr_in6 client_addr = { .sin6_family = AF_INET6,
                .sin6_port = htons(DHCPV6_CLIENT_PORT), .sin6_flowinfo = 0 };
+
        if (bind(sock, (struct sockaddr*)&client_addr, sizeof(client_addr)) < 0)
                return -1;
 
@@ -249,7 +265,6 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
        fqdn.len = htons(fqdn_len - 4);
        fqdn.flags = 0;
 
-
        // Build Client ID
        size_t cl_id_len;
        void *cl_id = odhcp6c_get_state(STATE_CLIENT_ID, &cl_id_len);
@@ -466,9 +481,8 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
                cnt = 9;
                iov[IOV_ORO_REFRESH].iov_len = sizeof(oro_refresh);
                hdr.oro_len = htons(oro_len + sizeof(oro_refresh));
-       } else if (!request_prefix) {
+       } else if (!request_prefix)
                cnt = 13;
-       }
 
        // Disable IAs if not used
        if (type != DHCPV6_MSG_SOLICIT && ia_na_len == 0)
@@ -489,18 +503,39 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs)
        struct msghdr msg = {.msg_name = &srv, .msg_namelen = sizeof(srv),
                        .msg_iov = iov, .msg_iovlen = cnt};
 
-       sendmsg(sock, &msg, 0);
-}
+       switch (type) {
+       case DHCPV6_MSG_REQUEST:
+       case DHCPV6_MSG_RENEW:
+       case DHCPV6_MSG_RELEASE:
+       case DHCPV6_MSG_DECLINE:
+               if (!IN6_IS_ADDR_UNSPECIFIED(&server_addr) &&
+                       odhcp6c_addr_in_scope(&server_addr)) {
+                       srv.sin6_addr = server_addr;
+                       if (!IN6_IS_ADDR_LINKLOCAL(&server_addr))
+                               srv.sin6_scope_id = 0;
+               }
+               break;
+       default:
+               break;
+       }
 
+       if (sendmsg(sock, &msg, 0) < 0) {
+               char in6_str[INET6_ADDRSTRLEN];
+
+               syslog(LOG_ERR, "Failed to send DHCPV6 message to %s (%s)",
+                       inet_ntop(AF_INET6, (const void *)&srv.sin6_addr,
+                               in6_str, sizeof(in6_str)), strerror(errno));
+       }
+}
 
 static int64_t dhcpv6_rand_delay(int64_t time)
 {
        int random;
        odhcp6c_random(&random, sizeof(random));
+
        return (time * ((int64_t)random % 1000LL)) / 10000LL;
 }
 
-
 int dhcpv6_request(enum dhcpv6_msg type)
 {
        uint8_t rc = 0;
@@ -510,6 +545,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
        if (retx->delay) {
                struct timespec ts = {0, 0};
                ts.tv_nsec = (dhcpv6_rand_delay((10000 * DHCPV6_REQ_DELAY) / 2) + (1000 * DHCPV6_REQ_DELAY) / 2) * 1000000;
+
                while (nanosleep(&ts, &ts) < 0 && errno == EINTR);
        }
 
@@ -523,8 +559,8 @@ int dhcpv6_request(enum dhcpv6_msg type)
        if (timeout == 0)
                return -1;
 
-       syslog(LOG_NOTICE, "Starting %s transaction (timeout %llus, max rc %d)",
-                       retx->name, (unsigned long long)timeout, retx->max_rc);
+       syslog(LOG_NOTICE, "Starting %s transaction (timeout %"PRIu64"s, max rc %d)",
+                       retx->name, timeout, retx->max_rc);
 
        uint64_t start = odhcp6c_get_milli_time(), round_start = start, elapsed;
 
@@ -532,6 +568,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
        uint8_t trid[3] = {0, 0, 0};
        if (type != DHCPV6_MSG_UNKNOWN)
                odhcp6c_random(trid, sizeof(trid));
+
        ssize_t len = -1;
        int64_t rto = 0;
 
@@ -544,8 +581,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
                                delay = dhcpv6_rand_delay(retx->init_timeo * 1000);
 
                        rto = (retx->init_timeo * 1000 + delay);
-               }
-               else
+               } else
                        rto = (2 * rto + dhcpv6_rand_delay(rto));
 
                if (retx->max_timeo && (rto >= retx->max_timeo * 1000))
@@ -565,8 +601,8 @@ int dhcpv6_request(enum dhcpv6_msg type)
                case DHCPV6_MSG_UNKNOWN:
                        break;
                default:
-                       syslog(LOG_NOTICE, "Send %s message (elapsed %llums, rc %d)",
-                                       retx->name, (unsigned long long)elapsed, rc);
+                       syslog(LOG_NOTICE, "Send %s message (elapsed %"PRIu64"ms, rc %d)",
+                                       retx->name, elapsed, rc);
                        // Fall through
                case DHCPV6_MSG_SOLICIT:
                case DHCPV6_MSG_INFO_REQ:
@@ -577,15 +613,18 @@ int dhcpv6_request(enum dhcpv6_msg type)
                // Receive rounds
                for (; len < 0 && (round_start < round_end);
                                round_start = odhcp6c_get_milli_time()) {
-                       uint8_t buf[1536], cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+                       uint8_t buf[1536];
+                       union {
+                               struct cmsghdr hdr;
+                               uint8_t buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+                       } cmsg_buf;
                        struct iovec iov = {buf, sizeof(buf)};
                        struct sockaddr_in6 addr;
                        struct msghdr msg = {.msg_name = &addr, .msg_namelen = sizeof(addr),
-                                       .msg_iov = &iov, .msg_iovlen = 1, .msg_control = cmsg_buf,
+                                       .msg_iov = &iov, .msg_iovlen = 1, .msg_control = cmsg_buf.buf,
                                        .msg_controllen = sizeof(cmsg_buf)};
                        struct in6_pktinfo *pktinfo = NULL;
 
-
                        // Check for pending signal
                        if (odhcp6c_signal_process())
                                return -1;
@@ -626,8 +665,8 @@ int dhcpv6_request(enum dhcpv6_msg type)
 
                        round_start = odhcp6c_get_milli_time();
                        elapsed = round_start - start;
-                       syslog(LOG_NOTICE, "Got a valid reply after "
-                                       "%llums", (unsigned long long)elapsed);
+                       syslog(LOG_NOTICE, "Got a valid reply after %"PRIu64"ms",
+                                       elapsed);
 
                        if (retx->handler_reply)
                                len = retx->handler_reply(type, rc, opt, opt_end, &addr);
@@ -639,7 +678,7 @@ int dhcpv6_request(enum dhcpv6_msg type)
                // Allow
                if (retx->handler_finish)
                        len = retx->handler_finish();
-       } while (len < 0 && ((timeout == UINT32_MAX) || (elapsed / 1000 < timeout)) && 
+       } while (len < 0 && ((timeout == UINT32_MAX) || (elapsed / 1000 < timeout)) &&
                        (!retx->max_rc || rc < retx->max_rc));
        return len;
 }
@@ -658,12 +697,13 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
                if (rep->msg_type != DHCPV6_MSG_ADVERT &&
                                rep->msg_type != DHCPV6_MSG_REPLY)
                        return false;
+
        } else if (type == DHCPV6_MSG_UNKNOWN) {
                if (!accept_reconfig || rep->msg_type != DHCPV6_MSG_RECONF)
                        return false;
-       } else if (rep->msg_type != DHCPV6_MSG_REPLY) {
+
+       } else if (rep->msg_type != DHCPV6_MSG_REPLY)
                return false;
-       }
 
        uint8_t *end = ((uint8_t*)buf) + len, *odata = NULL,
                rcmsg = DHCPV6_MSG_UNKNOWN;
@@ -692,7 +732,8 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
                                continue;
 
                        md5_ctx_t md5;
-                       uint8_t serverhash[16], secretbytes[64], hash[16];
+                       uint8_t serverhash[16], secretbytes[64];
+                       uint32_t hash[4];
                        memcpy(serverhash, r->key, sizeof(serverhash));
                        memset(r->key, 0, sizeof(r->key));
 
@@ -724,12 +765,10 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
                        ia_present = true;
                        if (olen < -4 + sizeof(struct dhcpv6_ia_hdr))
                                options_valid = false;
-               }
-               else if ((otype == DHCPV6_OPT_IA_ADDR) || (otype == DHCPV6_OPT_IA_PREFIX) ||
-                               (otype == DHCPV6_OPT_PD_EXCLUDE)) {
+               } else if ((otype == DHCPV6_OPT_IA_ADDR) || (otype == DHCPV6_OPT_IA_PREFIX) ||
+                               (otype == DHCPV6_OPT_PD_EXCLUDE))
                        // Options are not allowed on global level
                        options_valid = false;
-               }
        }
 
        if (!options_valid || ((odata + olen) > end))
@@ -748,33 +787,45 @@ static bool dhcpv6_response_is_valid(const void *buf, ssize_t len,
        return clientid_ok && serverid_ok;
 }
 
-
 int dhcpv6_poll_reconfigure(void)
 {
        int ret = dhcpv6_request(DHCPV6_MSG_UNKNOWN);
+
        if (ret != -1)
                ret = dhcpv6_request(ret);
 
        return ret;
 }
 
-
-static int dhcpv6_handle_reconfigure(_unused enum dhcpv6_msg orig, const int rc,
+static int dhcpv6_handle_reconfigure(enum dhcpv6_msg orig, const int rc,
                const void *opt, const void *end, _unused const struct sockaddr_in6 *from)
 {
        uint16_t otype, olen;
-       uint8_t *odata, msg = DHCPV6_MSG_RENEW;
-       dhcpv6_for_each_option(opt, end, otype, olen, odata)
-               if (otype == DHCPV6_OPT_RECONF_MESSAGE && olen == 1 && (
-                               odata[0] == DHCPV6_MSG_RENEW ||
-                               odata[0] == DHCPV6_MSG_INFO_REQ))
-                       msg = odata[0];
-
-       dhcpv6_handle_reply(DHCPV6_MSG_UNKNOWN, rc, NULL, NULL, NULL);
+       uint8_t *odata;
+       int msg = -1;
+
+       dhcpv6_for_each_option(opt, end, otype, olen, odata) {
+               if (otype == DHCPV6_OPT_RECONF_MESSAGE && olen == 1) {
+                       switch (odata[0]) {
+                       case DHCPV6_MSG_RENEW:
+                               if (t1 != UINT32_MAX)
+                                       t1 = 0;
+                       // Fall through
+                       case DHCPV6_MSG_INFO_REQ:
+                               msg = odata[0];
+                               break;
+
+                       default:
+                               break;
+                       }
+               }
+       }
+
+       dhcpv6_handle_reply(orig, rc, NULL, NULL, NULL);
+
        return msg;
 }
 
-
 // Collect all advertised servers
 static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
                const void *opt, const void *end, _unused const struct sockaddr_in6 *from)
@@ -782,7 +833,7 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
        uint16_t olen, otype;
        uint8_t *odata, pref = 0;
        struct dhcpv6_server_cand cand = {false, false, 0, 0, {0},
-                                       DHCPV6_SOL_MAX_RT,
+                                       IN6ADDR_ANY_INIT, DHCPV6_SOL_MAX_RT,
                                        DHCPV6_INF_MAX_RT, NULL, NULL, 0, 0};
        bool have_na = false;
        int have_pd = 0;
@@ -801,18 +852,22 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
                } else if (otype == DHCPV6_OPT_PREF && olen >= 1 &&
                                cand.preference >= 0) {
                        cand.preference = pref = odata[0];
+               } else if (otype == DHCPV6_OPT_UNICAST && olen == sizeof(cand.server_addr)) {
+                       cand.server_addr = *(struct in6_addr *)odata;
                } else if (otype == DHCPV6_OPT_RECONF_ACCEPT) {
                        cand.wants_reconfigure = true;
                } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
-                       uint32_t sol_max_rt = ntohl(*((uint32_t *)odata));
+                       uint32_t sol_max_rt = ntohl_unaligned(odata);
                        if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN &&
                                        sol_max_rt <= DHCPV6_SOL_MAX_RT_MAX)
                                cand.sol_max_rt = sol_max_rt;
+
                } else if (otype == DHCPV6_OPT_INF_MAX_RT && olen == 4) {
-                       uint32_t inf_max_rt = ntohl(*((uint32_t *)odata));
+                       uint32_t inf_max_rt = ntohl_unaligned(odata);
                        if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
                                        inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
                                cand.inf_max_rt = inf_max_rt;
+
                } else if (otype == DHCPV6_OPT_IA_PD && request_prefix &&
                                        olen >= -4 + sizeof(struct dhcpv6_ia_hdr)) {
                        struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4];
@@ -828,10 +883,12 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
                                        olen >= -4 + sizeof(struct dhcpv6_ia_hdr)) {
                        struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4];
                        uint8_t *oend = odata + olen, *d;
-                       dhcpv6_for_each_option(&h[1], oend, otype, olen, d)
+
+                       dhcpv6_for_each_option(&h[1], oend, otype, olen, d) {
                                if (otype == DHCPV6_OPT_IA_ADDR &&
                                                olen >= -4 + sizeof(struct dhcpv6_ia_addr))
                                        have_na = true;
+                       }
                }
        }
 
@@ -868,13 +925,11 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc,
        return (rc > 1 || (pref == 255 && cand.preference > 0)) ? 1 : -1;
 }
 
-
 static int dhcpv6_commit_advert(void)
 {
        return dhcpv6_promote_server_cand();
 }
 
-
 static int dhcpv6_handle_rebind_reply(enum dhcpv6_msg orig, const int rc,
                const void *opt, const void *end, const struct sockaddr_in6 *from)
 {
@@ -885,7 +940,6 @@ static int dhcpv6_handle_rebind_reply(enum dhcpv6_msg orig, const int rc,
        return dhcpv6_handle_reply(orig, rc, opt, end, from);
 }
 
-
 static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                const void *opt, const void *end, const struct sockaddr_in6 *from)
 {
@@ -979,9 +1033,9 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                                                dhcpv6_handle_ia_status_code(orig, ia_hdr,
                                                        code, mdata, mlen, handled_status_codes, &ret);
 
-
                                                if (ret > 0)
                                                        return ret;
+
                                                break;
                                        }
                                }
@@ -991,6 +1045,9 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 
                                dhcpv6_parse_ia(ia_hdr, odata + olen);
                                passthru = false;
+                       } else if (otype == DHCPV6_OPT_UNICAST && olen == sizeof(server_addr)) {
+                               server_addr = *(struct in6_addr *)odata;
+                               passthru = false;
                        } else if (otype == DHCPV6_OPT_STATUS && olen >= 2) {
                                uint8_t *mdata = (olen > 2) ? &odata[2] : NULL;
                                uint16_t mlen = (olen > 2) ? olen - 2 : 0;
@@ -998,13 +1055,12 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 
                                dhcpv6_handle_status_code(orig, code, mdata, mlen, &ret);
                                passthru = false;
-                       }
-                       else if (otype == DHCPV6_OPT_DNS_SERVERS) {
+                       } else if (otype == DHCPV6_OPT_DNS_SERVERS) {
                                if (olen % 16 == 0)
                                        odhcp6c_add_state(STATE_DNS, odata, olen);
-                       } else if (otype == DHCPV6_OPT_DNS_DOMAIN) {
+                       } else if (otype == DHCPV6_OPT_DNS_DOMAIN)
                                odhcp6c_add_state(STATE_SEARCH, odata, olen);
-                       else if (otype == DHCPV6_OPT_SNTP_SERVERS) {
+                       else if (otype == DHCPV6_OPT_SNTP_SERVERS) {
                                if (olen % 16 == 0)
                                        odhcp6c_add_state(STATE_SNTP_IP, odata, olen);
                        } else if (otype == DHCPV6_OPT_NTP_SERVER) {
@@ -1024,10 +1080,10 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                        } 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) {
+                       } 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) {
-                               refresh = ntohl(*((uint32_t*)odata));
+                       else if (otype == DHCPV6_OPT_INFO_REFRESH && olen >= 4) {
+                               refresh = ntohl_unaligned(odata);
                                passthru = false;
                        } else if (otype == DHCPV6_OPT_AUTH) {
                                if (olen == -4 + sizeof(struct dhcpv6_auth_reconfigure)) {
@@ -1044,13 +1100,13 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                                        odhcp6c_add_state(STATE_AFTR_NAME, odata, olen);
                                passthru = false;
                        } else if (otype == DHCPV6_OPT_SOL_MAX_RT && olen == 4) {
-                               uint32_t sol_max_rt = ntohl(*((uint32_t *)odata));
+                               uint32_t sol_max_rt = ntohl_unaligned(odata);
                                if (sol_max_rt >= DHCPV6_SOL_MAX_RT_MIN &&
                                                sol_max_rt <= DHCPV6_SOL_MAX_RT_MAX)
                                        dhcpv6_retx[DHCPV6_MSG_SOLICIT].max_timeo = sol_max_rt;
                                passthru = false;
                        } else if (otype == DHCPV6_OPT_INF_MAX_RT && olen == 4) {
-                               uint32_t inf_max_rt = ntohl(*((uint32_t *)odata));
+                               uint32_t inf_max_rt = ntohl_unaligned(odata);
                                if (inf_max_rt >= DHCPV6_INF_MAX_RT_MIN &&
                                                inf_max_rt <= DHCPV6_INF_MAX_RT_MAX)
                                        dhcpv6_retx[DHCPV6_MSG_INFO_REQ].max_timeo = inf_max_rt;
@@ -1082,59 +1138,62 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
                                        otype == DHCPV6_OPT_PREF ||
                                        otype == DHCPV6_OPT_UNICAST ||
                                        otype == DHCPV6_OPT_FQDN ||
-                                       otype == DHCPV6_OPT_RECONF_ACCEPT) {
+                                       otype == DHCPV6_OPT_RECONF_ACCEPT)
                                passthru = false;
-                       } else {
+                       else
                                odhcp6c_add_state(STATE_CUSTOM_OPTS, &odata[-4], olen + 4);
-                       }
 
                        if (passthru)
                                odhcp6c_add_state(STATE_PASSTHRU, &odata[-4], olen + 4);
                }
        }
 
-       if (orig != DHCPV6_MSG_INFO_REQ) {
+       switch (orig) {
+       case DHCPV6_MSG_REQUEST:
+       case DHCPV6_MSG_REBIND:
+       case DHCPV6_MSG_RENEW:
                // Update refresh timers if no fatal status code was received
-               if ((ret > 0) && dhcpv6_calc_refresh_timers()) {
-                       switch (orig) {
-                       case DHCPV6_MSG_RENEW:
+               if ((ret > 0) && (ret = dhcpv6_calc_refresh_timers())) {
+                       if (orig == DHCPV6_MSG_REQUEST) {
+                               // All server candidates can be cleared if not yet bound
+                               if (!odhcp6c_is_bound())
+                                       dhcpv6_clear_all_server_cand();
+
+                               odhcp6c_clear_state(STATE_SERVER_ADDR);
+                               odhcp6c_add_state(STATE_SERVER_ADDR, &from->sin6_addr, 16);
+                       } else if (orig == DHCPV6_MSG_RENEW) {
                                // Send further renews if T1 is not set
                                if (!t1)
                                        ret = -1;
-                               break;
-                       case DHCPV6_MSG_REBIND:
+
+                       } else if (orig == DHCPV6_MSG_REBIND) {
                                // Send further rebinds if T1 and T2 is not set
                                if (!t1 && !t2)
                                        ret = -1;
-                               break;
-
-                       case DHCPV6_MSG_REQUEST:
-                               // All server candidates can be cleared if not yet bound
-                               if (!odhcp6c_is_bound())
-                                       dhcpv6_clear_all_server_cand();
-
-                       default :
-                               break;
-                       }
 
-                       if (orig == DHCPV6_MSG_REBIND || orig == DHCPV6_MSG_REQUEST) {
                                odhcp6c_clear_state(STATE_SERVER_ADDR);
                                odhcp6c_add_state(STATE_SERVER_ADDR, &from->sin6_addr, 16);
                        }
                }
-       }
-       else if (ret > 0) {
-               // All server candidates can be cleared if not yet bound
-               if (!odhcp6c_is_bound())
-                       dhcpv6_clear_all_server_cand();
+               break;
+
+       case DHCPV6_MSG_INFO_REQ:
+               if (ret > 0) {
+                       // All server candidates can be cleared if not yet bound
+                       if (!odhcp6c_is_bound())
+                               dhcpv6_clear_all_server_cand();
+
+                       t1 = refresh;
+               }
+               break;
 
-               t1 = refresh;
+       default:
+               break;
        }
 
        return ret;
 }
 
-
 static int dhcpv6_parse_ia(void *opt, void *end)
 {
        struct dhcpv6_ia_hdr *ia_hdr = (struct dhcpv6_ia_hdr *)opt;
@@ -1193,7 +1252,6 @@ static int dhcpv6_parse_ia(void *opt, void *end)
                                        continue;
                                }
 
-
                                uint8_t bytes = ((elen - entry.length - 1) / 8) + 1;
                                if (slen <= bytes) {
                                        ok = false;
@@ -1247,7 +1305,6 @@ static int dhcpv6_parse_ia(void *opt, void *end)
        return parsed_ia;
 }
 
-
 static int dhcpv6_calc_refresh_timers(void)
 {
        struct odhcp6c_entry *e;
@@ -1256,6 +1313,7 @@ static int dhcpv6_calc_refresh_timers(void)
 
        e = odhcp6c_get_state(STATE_IA_NA, &ia_na_entries);
        ia_na_entries /= sizeof(*e);
+
        for (i = 0; i < ia_na_entries; i++) {
                if (e[i].t1 < l_t1)
                        l_t1 = e[i].t1;
@@ -1269,6 +1327,7 @@ static int dhcpv6_calc_refresh_timers(void)
 
        e = odhcp6c_get_state(STATE_IA_PD, &ia_pd_entries);
        ia_pd_entries /= sizeof(*e);
+
        for (i = 0; i < ia_pd_entries; i++) {
                if (e[i].t1 < l_t1)
                        l_t1 = e[i].t1;
@@ -1284,14 +1343,11 @@ static int dhcpv6_calc_refresh_timers(void)
                t1 = l_t1;
                t2 = l_t2;
                t3 = l_t3;
-       } else {
-               t1 = 600;
        }
 
        return (int)(ia_pd_entries + ia_na_entries);
 }
 
-
 static void dhcpv6_log_status_code(const uint16_t code, const char *scope,
                const void *status_msg, int len)
 {
@@ -1308,13 +1364,13 @@ static void dhcpv6_log_status_code(const uint16_t code, const char *scope,
                }
                *dst++ = ')';
        }
+
        *dst = 0;
 
        syslog(LOG_WARNING, "Server returned %s status %i %s",
                scope, code, buf);
 }
 
-
 static void dhcpv6_handle_status_code(const enum dhcpv6_msg orig,
                const uint16_t code, const void *status_msg, const int len,
                int *ret)
@@ -1328,7 +1384,18 @@ static void dhcpv6_handle_status_code(const enum dhcpv6_msg orig,
                break;
 
        case DHCPV6_UseMulticast:
-               // TODO handle multicast status code
+               switch(orig) {
+               case DHCPV6_MSG_REQUEST:
+               case DHCPV6_MSG_RENEW:
+               case DHCPV6_MSG_RELEASE:
+               case DHCPV6_MSG_DECLINE:
+                       // Message needs to be retransmitted according to RFC3315 chapter 18.1.8
+                       server_addr = in6addr_any;
+                       *ret = 0;
+                       break;
+               default:
+                       break;
+               }
                break;
 
        case DHCPV6_NoAddrsAvail:
@@ -1342,7 +1409,6 @@ static void dhcpv6_handle_status_code(const enum dhcpv6_msg orig,
        }
 }
 
-
 static void dhcpv6_handle_ia_status_code(const enum dhcpv6_msg orig,
                const struct dhcpv6_ia_hdr *ia_hdr, const uint16_t code,
                const void *status_msg, const int len,
@@ -1442,12 +1508,14 @@ int dhcpv6_promote_server_cand(void)
        odhcp6c_add_state(STATE_SERVER_ID, hdr, sizeof(hdr));
        odhcp6c_add_state(STATE_SERVER_ID, cand->duid, cand->duid_len);
        accept_reconfig = cand->wants_reconfigure;
+
        if (cand->ia_na_len) {
                odhcp6c_add_state(STATE_IA_NA, cand->ia_na, cand->ia_na_len);
                free(cand->ia_na);
                if (na_mode != IA_MODE_NONE)
                        ret = DHCPV6_STATEFUL;
        }
+
        if (cand->ia_pd_len) {
                odhcp6c_add_state(STATE_IA_PD, cand->ia_pd, cand->ia_pd_len);
                free(cand->ia_pd);