dhcpv4: fix DHCPv4 hostname handling

[project/odhcpd.git] / src / dhcpv6-ia.c

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 20ef1f8..b0a0ada 100644 (file)
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2016 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
@@ -83,7 +84,7 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                                syslog(LOG_ERR, "Calloc failed for border on interface %s", iface->ifname);
                                return -1;
                        }
-                       
+
                        border->length = 64;
                        list_add(&border->head, &iface->ia_assignments);
                }
@@ -114,6 +115,8 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                        odhcpd_urandom(a->key, sizeof(a->key));
                        memcpy(a->clid_data, lease->duid, lease->duid_len);
                        memcpy(a->mac, lease->mac.ether_addr_octet, sizeof(a->mac));
+                       /* Static assignment */
+                       a->flags |= OAF_STATIC;
                        /* Infinite valid */
                        a->valid_until = 0;
 
@@ -236,7 +239,7 @@ void dhcpv6_write_statefile(void)
                        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 || c->managed_size < 0)
+                                       if (!(c->flags & OAF_BOUND) || c->managed_size < 0)
                                                continue;
 
                                        char ipbuf[INET6_ADDRSTRLEN];
@@ -282,9 +285,9 @@ void dhcpv6_write_statefile(void)
                                                        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);
+                                                       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);
@@ -302,6 +305,9 @@ void dhcpv6_write_statefile(void)
                        if (iface->dhcpv4 == RELAYD_SERVER && iface->dhcpv4_assignments.next) {
                                struct dhcpv4_assignment *c;
                                list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
+                                       if (!(c->flags & OAF_BOUND))
+                                               continue;
+
                                        char ipbuf[INET6_ADDRSTRLEN];
                                        char leasebuf[512];
                                        char duidbuf[16];
@@ -319,13 +325,13 @@ 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]) {
+                                       if (c->hostname) {
                                                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);
+                                               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);
@@ -1125,7 +1131,9 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 
                        // Was only a solicitation: mark binding for removal
                        if (assigned && hdr->msg_type == DHCPV6_MSG_SOLICIT) {
-                               if (!INFINITE_VALID(a->valid_until))
+                               a->flags &= ~OAF_BOUND;
+
+                               if (!(a->flags & OAF_STATIC))
                                        a->valid_until = now;
                        } else if (assigned && hdr->msg_type == DHCPV6_MSG_REQUEST) {
                                if (hostname_len > 0) {
@@ -1136,6 +1144,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                        }
                                }
                                a->accept_reconf = accept_reconf;
+                               a->flags |= OAF_BOUND;
                                apply_lease(iface, a, true);
                        } else if (!assigned && a && a->managed_size == 0) { // Cleanup failed assignment
                                free_dhcpv6_assignment(a);
@@ -1150,17 +1159,23 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                        } else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
                                        hdr->msg_type == DHCPV6_MSG_REBIND) {
                                ia_response_len = append_reply(buf, buflen, status, ia, a, iface, false);
-                               if (a)
+                               if (a) {
+                                       a->flags |= OAF_BOUND;
                                        apply_lease(iface, a, true);
+                               }
                        } else if (hdr->msg_type == DHCPV6_MSG_RELEASE) {
-                               if (!INFINITE_VALID(a->valid_until))
+                               if (!(a->flags & OAF_STATIC))
                                        a->valid_until = now - 1;
 
+                               a->flags &= ~OAF_BOUND;
                                apply_lease(iface, a, false);
-                       } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128 &&
-                                       !INFINITE_VALID(a->valid_until)) {
-                               a->clid_len = 0;
-                               a->valid_until = now + 3600; // Block address for 1h
+                       } else if (hdr->msg_type == DHCPV6_MSG_DECLINE && a->length == 128) {
+                               a->flags &= ~OAF_BOUND;
+
+                               if (!(a->flags & OAF_STATIC)) {
+                                       a->clid_len = 0;
+                                       a->valid_until = now + 3600; // Block address for 1h
+                               }
                        }
                } else if (hdr->msg_type == DHCPV6_MSG_CONFIRM && ia_addr_present) {
                        // Send NOTONLINK for CONFIRM with addr present so that clients restart connection