derive ipv6 static lease from ipv4 if no hostid is given

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

diff --git a/src/config.c b/src/config.c
index 38a3e7a..65b3551 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -87,7 +87,7 @@ enum {
        LEASE_ATTR_MAC,
        LEASE_ATTR_DUID,
        LEASE_ATTR_HOSTID,
-       LEASE_ATTR_HOSTNAME,
+       LEASE_ATTR_NAME,
        LEASE_ATTR_MAX
 };
 
@@ -97,7 +97,7 @@ static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
        [LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_DUID] = { .name = "duid", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_HOSTID] = { .name = "hostid", .type = BLOBMSG_TYPE_STRING },
-       [LEASE_ATTR_HOSTNAME] = { .name = "hostname", .type = BLOBMSG_TYPE_STRING },
+       [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
 
 
@@ -212,7 +212,7 @@ static int set_lease(struct uci_section *s)
        blobmsg_parse(lease_attrs, LEASE_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));
 
        size_t hostlen = 1;
-       if ((c = tb[LEASE_ATTR_HOSTNAME]))
+       if ((c = tb[LEASE_ATTR_NAME]))
                hostlen = blobmsg_data_len(c);
 
        struct lease *lease = calloc(1, sizeof(*lease) + hostlen);
@@ -470,6 +470,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING]))
                iface->learn_routes = blobmsg_get_bool(c);
+       else
+               iface->learn_routes = true;
 
        if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE]))
                iface->external = blobmsg_get_bool(c);
@@ -531,7 +533,7 @@ void odhcpd_reload(void)
                struct uci_element *e;
                uci_foreach_element(&dhcp->sections, e) {
                        struct uci_section *s = uci_to_section(e);
-                       if (!strcmp(s->type, "lease"))
+                       if (!strcmp(s->type, "host"))
                                set_lease(s);
                        else if (!strcmp(s->type, "odhcpd"))
                                set_config(s);