dhcpv6: fix white space error

[project/odhcp6c.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 3e128bcfa151c1001d56ccd6661b3eb880bbfc77..e8f32a39ce1cf518fddcaa9d609d74a8b8616b31 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -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
@@ -27,13 +28,18 @@
 #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 LIBUBOX
+#include <libubox/md5.h>
+#else
 #include "md5.h"
+#endif
 
 
 #define ALL_DHCPV6_RELAYS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
@@ -102,6 +108,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];
@@ -176,6 +184,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),
@@ -497,7 +506,29 @@ 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));
+       }
 }
 
 
@@ -586,12 +617,14 @@ int dhcpv6_request(enum dhcpv6_msg type)
                for (; len < 0 && (round_start < round_end);
                                round_start = odhcp6c_get_milli_time()) {
                        uint8_t buf[1536];
-                       uint8_t cmsg_buf[CMSG_SPACE(sizeof(struct in6_pktinfo))]
-                               __aligned(__alignof__(struct cmsghdr));
+                       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;
 
@@ -649,7 +682,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;
 }
@@ -793,7 +826,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;
@@ -812,6 +845,8 @@ 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) {
@@ -1002,6 +1037,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;
@@ -1009,8 +1047,7 @@ 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) {
@@ -1106,7 +1143,7 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
 
        if (orig != DHCPV6_MSG_INFO_REQ) {
                // Update refresh timers if no fatal status code was received
-               if ((ret > 0) && dhcpv6_calc_refresh_timers()) {
+               if ((ret > 0) && (ret = dhcpv6_calc_refresh_timers())) {
                        switch (orig) {
                        case DHCPV6_MSG_RENEW:
                                // Send further renews if T1 is not set
@@ -1295,8 +1332,6 @@ 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);
@@ -1339,7 +1374,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: