Merge pull request #20 from mehlis/implement-dhcp4-router-config

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

diff --git a/src/config.c b/src/config.c
index db5ca3b..835db13 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -30,6 +30,7 @@ enum {
        IFACE_ATTR_DHCPV4,
        IFACE_ATTR_DHCPV6,
        IFACE_ATTR_NDP,
+       IFACE_ATTR_ROUTER,
        IFACE_ATTR_DNS,
        IFACE_ATTR_DOMAIN,
        IFACE_ATTR_FILTER_CLASS,
@@ -61,6 +62,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_DHCPV4] = { .name = "dhcpv4", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DHCPV6] = { .name = "dhcpv6", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_NDP] = { .name = "ndp", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_ROUTER] = { .name = "router", .type = BLOBMSG_TYPE_ARRAY },
        [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
        [IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY },
        [IFACE_ATTR_FILTER_CLASS] = { .name = "filter_class", .type = BLOBMSG_TYPE_STRING },
@@ -152,6 +154,7 @@ static void clean_interface(struct interface *iface)
        free(iface->search);
        free(iface->upstream);
        free(iface->static_ndp);
+       free(iface->dhcpv4_router);
        free(iface->dhcpv4_dns);
        free(iface->dhcpv6_raw);
        free(iface->filter_class);
@@ -255,10 +258,12 @@ static int set_lease(struct uci_section *s)
                lease->duid_len = len;
        }
 
-       if ((c = tb[LEASE_ATTR_HOSTID]))
-               if (odhcpd_unhexlify((uint8_t*)&lease->hostid, sizeof(lease->hostid),
-                               blobmsg_get_string(c)) < 0)
+       if ((c = tb[LEASE_ATTR_HOSTID])) {
+               errno = 0;
+               lease->hostid = strtoul(blobmsg_get_string(c), NULL, 16);
+               if (errno)
                        goto err;
+       }
 
        list_add(&lease->head, &leases);
        return 0;
@@ -407,6 +412,28 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        goto err;
        }
 
+       if ((c = tb[IFACE_ATTR_ROUTER])) {
+               struct blob_attr *cur;
+               unsigned rem;
+
+               blobmsg_for_each_attr(cur, c, rem) {
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+                               continue;
+
+                       struct in_addr addr4;
+                       if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) {
+                               iface->dhcpv4_router = realloc(iface->dhcpv4_router,
+                                               (++iface->dhcpv4_router_cnt) * sizeof(*iface->dhcpv4_router));
+                               if (!iface->dhcpv4_router)
+                                       goto err;
+
+                               iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
+                       } else {
+                               goto err;
+                       }
+               }
+       }
+
        if ((c = tb[IFACE_ATTR_DNS])) {
                struct blob_attr *cur;
                unsigned rem;
@@ -447,7 +474,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                continue;
 
                        uint8_t buf[256];
-                       int len = dn_comp(blobmsg_get_string(cur), buf, sizeof(buf), NULL, NULL);
+                       char *domain = blobmsg_get_string(cur);
+                       size_t domainlen = strlen(domain);
+                       if (domainlen > 0 && domain[domainlen - 1] == '.')
+                               domain[domainlen - 1] = 0;
+
+                       int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL);
+                       free(domain);
                        if (len <= 0)
                                goto err;