Merge pull request #17 from mar-kolya/master

[project/odhcpd.git] / src / dhcpv4.c

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 4b69467..1fac8a1 100644 (file)
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -20,6 +20,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <resolv.h>
+#include <limits.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/ip.h>
@@ -155,17 +156,22 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                        a->addr = ntohl(lease->ipaddr.s_addr);
                        memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
                        memcpy(a->hostname, lease->hostname, hostlen);
+                       a->valid_until = LONG_MAX;
 
                        // Assign to all interfaces
                        struct dhcpv4_assignment *c;
                        list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
                                if (c->addr > a->addr) {
                                        list_add_tail(&a->head, &c->head);
+                                       break;
                                } else if (c->addr == a->addr) {
                                        // Already an assignment with that number
                                        break;
                                }
                        }
+                       if (&c->head == &iface->dhcpv4_assignments) {
+                               list_add(&a->head, &iface->dhcpv4_assignments);
+                       }
 
                        if (!a->head.next)
                                free(a);
@@ -175,7 +181,7 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                struct dhcpv4_assignment *a, *n;
                list_for_each_entry_safe(a, n, &iface->dhcpv4_assignments, head) {
                        if ((htonl(a->addr) & smask->sin_addr.s_addr) !=
-                                       (saddr->sin_addr.s_addr & smask->sin_addr.s_addr)) {
+                                       (iface->dhcpv4_start.s_addr & smask->sin_addr.s_addr)) {
                                list_del(&a->head);
                                free(a);
                        }
@@ -362,14 +368,16 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                dhcpv4_put(&reply, &cookie, DHCPV4_OPT_MTU, 2, &mtu);
        }
 
-       if (iface->search) {
-               char b[256];
-               if (dn_expand(iface->search, iface->search + iface->search_len,
-                               iface->search, b, sizeof(b)) > 0)
-                       dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DOMAIN, strlen(b), b);
+       if (iface->search && iface->search_len <= 255) {
+               dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SEARCH_DOMAIN,
+                               iface->search_len, iface->search);
        } else if (!res_init() && _res.dnsrch[0] && _res.dnsrch[0][0]) {
-               dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DOMAIN,
-                               strlen(_res.dnsrch[0]), _res.dnsrch[0]);
+               uint8_t search_buf[256];
+               int len = dn_comp(_res.dnsrch[0], search_buf,
+                                               sizeof(search_buf), NULL, NULL);
+               if (len > 0)
+                       dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SEARCH_DOMAIN,
+                                       len, search_buf);
        }
 
        dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
@@ -469,9 +477,10 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 
        struct dhcpv4_assignment *c, *n, *a = NULL;
        list_for_each_entry_safe(c, n, &iface->dhcpv4_assignments, head) {
-               if (c->addr == raddr && !memcmp(c->hwaddr, mac, 6)) {
+               if (!memcmp(c->hwaddr, mac, 6)) {
                        a = c;
-                       break;
+                       if (c->addr == raddr)
+                               break;
                } else if (c->valid_until < now) {
                        list_del(&c->head);
                        free(c);
@@ -517,6 +526,9 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                        a = NULL;
                }
 
+               if (a)
+                       update_state = true;
+
                if (assigned && a)
                        lease = a;
        } else if (msg == DHCPV4_MSG_RELEASE) {