Fix wrong address pool being advertised
[project/odhcpd.git] / src / dhcpv6-ia.c
index bdaa3da..b1931ef 100644 (file)
 static void update(struct interface *iface);
 static void reconf_timer(struct uloop_timeout *event);
 static struct uloop_timeout reconf_event = {.cb = reconf_timer};
-static int socket_fd = -1;
 static uint32_t serial = 0;
+static uint8_t statemd5[16];
 
 
-int dhcpv6_ia_init(int dhcpv6_socket)
+int dhcpv6_ia_init(void)
 {
-       socket_fd = dhcpv6_socket;
        uloop_timeout_set(&reconf_event, 2000);
        return 0;
 }
@@ -87,7 +86,12 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
 
                        a->clid_len = lease->duid_len;
                        a->length = 128;
-                       a->assigned = lease->hostid;
+                       if (lease->hostid) {
+                               a->assigned = lease->hostid;
+                       } else {
+                               uint32_t i4a = ntohl(lease->ipaddr.s_addr) & 0xff;
+                               a->assigned = ((i4a / 100) << 8) | (((i4a % 100) / 10) << 4) | (i4a % 10);
+                       }
                        odhcpd_urandom(a->key, sizeof(a->key));
                        memcpy(a->clid_data, lease->duid, a->clid_len);
                        memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
@@ -97,6 +101,7 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                        list_for_each_entry(c, &iface->ia_assignments, head) {
                                if (c->length != 128 || c->assigned > a->assigned) {
                                        list_add_tail(&a->head, &c->head);
+                                       break;
                                } else if (c->assigned == a->assigned) {
                                        // Already an assignment with that number
                                        break;
@@ -178,12 +183,15 @@ static int send_reconf(struct interface *iface, struct dhcpv6_assignment *assign
        md5_hash(reconf_msg.auth.key, 16, &md5);
        md5_end(reconf_msg.auth.key, &md5);
 
-       return odhcpd_send(socket_fd, &assign->peer, &iov, 1, iface);
+       return odhcpd_send(iface->dhcpv6_event.uloop.fd, &assign->peer, &iov, 1, iface);
 }
 
 
 void dhcpv6_write_statefile(void)
 {
+       md5_ctx_t md5;
+       md5_begin(&md5);
+
        if (config.dhcp_statefile) {
                time_t now = odhcpd_time(), wall_time = time(NULL);
                int fd = open(config.dhcp_statefile, O_CREAT | O_WRONLY | O_CLOEXEC, 0644);
@@ -204,7 +212,7 @@ void dhcpv6_write_statefile(void)
                        if (iface->dhcpv6 != RELAYD_SERVER && iface->dhcpv4 != RELAYD_SERVER)
                                continue;
 
-                       if (iface->dhcpv6 == RELAYD_SERVER) {
+                       if (iface->dhcpv6 == RELAYD_SERVER && iface->ia_assignments.next) {
                                struct dhcpv6_assignment *c;
                                list_for_each_entry(c, &iface->ia_assignments, head) {
                                        if (c->clid_len == 0)
@@ -225,7 +233,7 @@ void dhcpv6_write_statefile(void)
 
                                        struct in6_addr addr;
                                        for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-                                               if (iface->ia_addr[i].prefix > 64)
+                                               if (iface->ia_addr[i].prefix > 96)
                                                        continue;
 
                                                addr = iface->ia_addr[i].addr;
@@ -235,8 +243,18 @@ void dhcpv6_write_statefile(void)
                                                        addr.s6_addr32[1] |= htonl(c->assigned);
                                                inet_ntop(AF_INET6, &addr, ipbuf, sizeof(ipbuf) - 1);
 
-                                               if (c->length == 128 && c->hostname && i == 0)
-                                                       fprintf(fp, "%s\t%s\n", ipbuf, c->hostname);
+                                               if (c->length == 128 && c->hostname && i == 0) {
+                                                       fputs(ipbuf, fp);
+
+                                                       char b[256];
+                                                       if (dn_expand(iface->search, iface->search + iface->search_len,
+                                                                       iface->search, b, sizeof(b)) > 0)
+                                                               fprintf(fp, "\t%s.%s", c->hostname, b);
+
+                                                       fprintf(fp, "\t%s\n", c->hostname);
+                                                       md5_hash(ipbuf, strlen(ipbuf), &md5);
+                                                       md5_hash(c->hostname, strlen(c->hostname), &md5);
+                                               }
 
                                                l += snprintf(leasebuf + l, sizeof(leasebuf) - l, "%s/%hhu ", ipbuf, c->length);
                                        }
@@ -245,7 +263,7 @@ void dhcpv6_write_statefile(void)
                                }
                        }
 
-                       if (iface->dhcpv4 == RELAYD_SERVER) {
+                       if (iface->dhcpv4 == RELAYD_SERVER && iface->dhcpv4_assignments.next) {
                                struct dhcpv4_assignment *c;
                                list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
                                        char ipbuf[INET6_ADDRSTRLEN];
@@ -264,8 +282,18 @@ void dhcpv6_write_statefile(void)
                                        struct in_addr addr = {htonl(c->addr)};
                                        inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1);
 
-                                       if (c->hostname[0])
-                                               fprintf(fp, "%s\t%s\n", ipbuf, c->hostname);
+                                       if (c->hostname[0]) {
+                                               fputs(ipbuf, fp);
+
+                                               char b[256];
+                                               if (dn_expand(iface->search, iface->search + iface->search_len,
+                                                               iface->search, b, sizeof(b)) > 0)
+                                                       fprintf(fp, "\t%s.%s", c->hostname, b);
+
+                                               fprintf(fp, "\t%s\n", c->hostname);
+                                               md5_hash(ipbuf, strlen(ipbuf), &md5);
+                                               md5_hash(c->hostname, strlen(c->hostname), &md5);
+                                       }
 
                                        l += snprintf(leasebuf + l, sizeof(leasebuf) - l, "%s/32 ", ipbuf);
                                        leasebuf[l - 1] = '\n';
@@ -277,7 +305,11 @@ void dhcpv6_write_statefile(void)
                fclose(fp);
        }
 
-       if (config.dhcp_cb) {
+       uint8_t newmd5[16];
+       md5_end(newmd5, &md5);
+
+       if (config.dhcp_cb && memcmp(newmd5, statemd5, sizeof(newmd5))) {
+               memcpy(statemd5, newmd5, sizeof(statemd5));
                char *argv[2] = {config.dhcp_cb, NULL};
                if (!vfork()) {
                        execv(argv[0], argv);
@@ -419,7 +451,6 @@ static void update(struct interface *iface)
                if (addr[i].prefix > minprefix)
                        minprefix = addr[i].prefix;
 
-               addr[i].addr.s6_addr32[2] = 0;
                addr[i].addr.s6_addr32[3] = 0;
 
                if (addr[i].preferred < UINT32_MAX - now)
@@ -552,10 +583,6 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                if (a) {
                        uint32_t pref = 3600;
                        uint32_t valid = 3600;
-                       bool have_non_ula = false;
-                       for (size_t i = 0; i < iface->ia_addr_len; ++i)
-                               if ((iface->ia_addr[i].addr.s6_addr[0] & 0xfe) != 0xfc)
-                                       have_non_ula = true;
 
                        for (size_t i = 0; i < iface->ia_addr_len; ++i) {
                                bool match = true;
@@ -576,16 +603,10 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                                uint32_t prefix_pref = iface->ia_addr[i].preferred - now;
                                uint32_t prefix_valid = iface->ia_addr[i].valid - now;
 
-                               if (iface->ia_addr[i].prefix > 64 ||
+                               if (iface->ia_addr[i].prefix > 96 ||
                                                iface->ia_addr[i].preferred <= (uint32_t)now)
                                        continue;
 
-                               // ULA-deprecation compatibility workaround
-                               if ((iface->ia_addr[i].addr.s6_addr[0] & 0xfe) == 0xfc &&
-                                               a->length == 128 && have_non_ula &&
-                                               iface->deprecate_ula_if_public_avail)
-                                       continue;
-
                                if (prefix_pref > 86400)
                                        prefix_pref = 86400;
 
@@ -690,7 +711,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                                bool found = false;
                                if (a) {
                                        for (size_t i = 0; i < iface->ia_addr_len; ++i) {
-                                               if (iface->ia_addr[i].prefix > 64 ||
+                                               if (iface->ia_addr[i].prefix > 96 ||
                                                                iface->ia_addr[i].preferred <= (uint32_t)now)
                                                        continue;
 
@@ -698,13 +719,13 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
                                                if (ia->type == htons(DHCPV6_OPT_IA_PD)) {
                                                        addr.s6_addr32[1] |= htonl(a->assigned);
 
-                                                       if (IN6_ARE_ADDR_EQUAL(&p->addr, &addr) &&
+                                                       if (!memcmp(&p->addr, &addr, sizeof(addr)) &&
                                                                        p->prefix == a->length)
                                                                found = true;
                                                } else {
                                                        addr.s6_addr32[3] = htonl(a->assigned);
 
-                                                       if (IN6_ARE_ADDR_EQUAL(&n->addr, &addr))
+                                                       if (!memcmp(&n->addr, &addr, sizeof(addr)))
                                                                found = true;
                                                }
                                        }