odhcpd: support multiple per-client MAC addresses

Allow the configuration of multiple per-client DHCPv4 MAC addresses. This is
for feature parity with dnsmasq.

Closes: #221
Closes: openwrt/openwrt#9598
Signed-off-by: David Härdeman <[email protected]>

diff --git a/README b/README
index 80e8a450bc4f5e25145497c67a78ce4650af9bab..0a82762c5d89f15aa0d95bbde89d263526139d1b 100644 (file)
--- a/README
+++ b/README
@@ -161,13 +161,13 @@ ntp                       list    <local address>         NTP servers to announce
 
 
 Sections of type host (static leases)
-Option         Type    Default                 Description
-ip             string                          IP-Address to lease
-mac            string                          MAC-address
-duid           string                          DUID in base16
-hostid         string                          IPv6 host identifier
-name           string                          Hostname
-leasetime      string                          DHCPv4/v6 leasetime
+Option         Type            Default                 Description
+ip             string          (none)                  IPv4 host address
+mac            list|string     (none)                  Hexadecimal MAC address(es)
+duid           string          (none)                  Hexadecimal DUID
+hostid         string          (none)                  IPv6 host identifier
+name           string          (none)                  Hostname
+leasetime      string          (none)                  DHCPv4/v6 leasetime
 
 Sections of type boot6
 Option         Type    Required                Description

diff --git a/src/config.c b/src/config.c
index 1a2d392b2a33c117c0bef6fb8385d5e96387b062..79928820bab8bae3c76d0c86e5f3667aca27381f 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -181,7 +181,7 @@ const struct uci_blob_param_list interface_attr_list = {
 
 const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
        [LEASE_ATTR_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING },
-       [LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
+       [LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_ARRAY },
        [LEASE_ATTR_DUID] = { .name = "duid", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_HOSTID] = { .name = "hostid", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING },
@@ -433,30 +433,51 @@ err:
 
 static void free_lease(struct lease *l)
 {
+       if (!l)
+               return;
+
        free(l->hostname);
        free(l);
 }
 
-
 int set_lease_from_blobmsg(struct blob_attr *ba)
 {
        struct blob_attr *tb[LEASE_ATTR_MAX], *c;
-       struct lease *l;
+       struct lease *l = NULL;
+       int mac_count = 0;
+       struct ether_addr *macs;
        size_t duidlen = 0;
        uint8_t *duid;
 
        blobmsg_parse(lease_attrs, LEASE_ATTR_MAX, tb, blob_data(ba), blob_len(ba));
 
+       if ((c = tb[LEASE_ATTR_MAC])) {
+               mac_count = blobmsg_check_array_len(c, BLOBMSG_TYPE_STRING, blob_raw_len(c));
+               if (mac_count < 0)
+                       goto err;
+       }
+
        if ((c = tb[LEASE_ATTR_DUID]))
                duidlen = (blobmsg_data_len(c) - 1) / 2;
 
-       l = calloc_a(sizeof(*l), &duid, duidlen);
+       l = calloc_a(sizeof(*l),
+                    &macs, mac_count * sizeof(*macs),
+                    &duid, duidlen);
        if (!l)
                goto err;
 
-       if ((c = tb[LEASE_ATTR_MAC]))
-               if (!ether_aton_r(blobmsg_get_string(c), &l->mac))
-                       goto err;
+       if ((c = tb[LEASE_ATTR_MAC])) {
+               struct blob_attr *cur;
+               size_t rem;
+               int i = 0;
+
+               l->mac_count = mac_count;
+               l->macs = macs;
+
+               blobmsg_for_each_attr(cur, c, rem)
+                       if (!ether_aton_r(blobmsg_get_string(cur), &l->macs[i++]))
+                               goto err;
+       }
 
        if ((c = tb[LEASE_ATTR_DUID])) {
                ssize_t len;
@@ -503,9 +524,7 @@ int set_lease_from_blobmsg(struct blob_attr *ba)
        return 0;
 
 err:
-       if (l)
-               free_lease(l);
-
+       free_lease(l);
        return -1;
 }
 
@@ -1508,8 +1527,18 @@ static int lease_cmp(const void *k1, const void *k2, _unused void *ptr)
        if (cmp)
                return cmp;
 
-       return memcmp(l1->mac.ether_addr_octet, l2->mac.ether_addr_octet,
-                               sizeof(l1->mac.ether_addr_octet));
+       if (l1->mac_count != l2->mac_count)
+               return l1->mac_count - l2->mac_count;
+
+       for (size_t i = 0; i < l1->mac_count; i++) {
+               cmp = memcmp(l1->macs[i].ether_addr_octet,
+                            l2->macs[i].ether_addr_octet,
+                            sizeof(l1->macs[i].ether_addr_octet));
+               if (cmp)
+                       return cmp;
+       }
+
+       return 0;
 }
 
 static void lease_change_config(struct lease *l_old, struct lease *l_new)
@@ -1587,9 +1616,11 @@ struct lease *config_find_lease_by_mac(const uint8_t *mac)
        struct lease *l;
 
        vlist_for_each_element(&leases, l, node) {
-               if (!memcmp(l->mac.ether_addr_octet, mac,
-                               sizeof(l->mac.ether_addr_octet)))
-                       return l;
+               for (size_t i = 0; i < l->mac_count; i++) {
+                       if (!memcmp(l->macs[i].ether_addr_octet, mac,
+                                   sizeof(l->macs[i].ether_addr_octet)))
+                               return l;
+               }
        }
 
        return NULL;

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 779f50f84a58262bac1fd5e7897dce2123314728..0c8b671284d337e3ea1e22ecf7a582de1c0df041 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -178,7 +178,8 @@ struct lease {
        struct list_head assignments;
        uint32_t ipaddr;
        uint64_t hostid;
-       struct ether_addr mac;
+       size_t mac_count;
+       struct ether_addr *macs;
        uint16_t duid_len;
        uint8_t *duid;
        uint32_t leasetime;