Fix typo in ubus integration

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

diff --git a/src/config.c b/src/config.c
index db5ca3b..35d8af7 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -42,7 +42,6 @@ enum {
        IFACE_ATTR_PD_CER,
        IFACE_ATTR_NDPROXY_ROUTING,
        IFACE_ATTR_NDPROXY_SLAVE,
-       IFACE_ATTR_NDPROXY_STATIC,
        IFACE_ATTR_MAX
 };
 
@@ -73,14 +72,12 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_RA_PREFERENCE] = { .name = "ra_preference", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL },
-       [IFACE_ATTR_NDPROXY_STATIC] = { .name = "ndproxy_static", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_UPSTREAM] = { .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DOMAIN] = { .type = BLOBMSG_TYPE_STRING },
-       [IFACE_ATTR_NDPROXY_STATIC] = { .type = BLOBMSG_TYPE_STRING },
 };
 
 const struct uci_blob_param_list interface_attr_list = {
@@ -151,7 +148,6 @@ static void clean_interface(struct interface *iface)
        free(iface->dns);
        free(iface->search);
        free(iface->upstream);
-       free(iface->static_ndp);
        free(iface->dhcpv4_dns);
        free(iface->dhcpv6_raw);
        free(iface->filter_class);
@@ -255,10 +251,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;
@@ -447,7 +445,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;
 
@@ -511,27 +515,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE]))
                iface->external = blobmsg_get_bool(c);
 
-       if ((c = tb[IFACE_ATTR_NDPROXY_STATIC])) {
-               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;
-
-                       int len = blobmsg_data_len(cur);
-                       iface->static_ndp = realloc(iface->static_ndp, iface->static_ndp_len + len);
-                       if (!iface->static_ndp)
-                               goto err;
-
-                       if (iface->static_ndp_len)
-                               iface->static_ndp[iface->static_ndp_len - 1] = ' ';
-
-                       memcpy(&iface->static_ndp[iface->static_ndp_len], blobmsg_get_string(cur), len);
-                       iface->static_ndp_len += len;
-               }
-       }
-
        return 0;
 
 err: