projects / project / odhcpd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
config: Fix RA interface config being overwritten
[project/odhcpd.git] / src / config.c
diff --git a/src/config.c b/src/config.c
index 835db13..372ea67 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -39,11 +39,12 @@ enum {
        IFACE_ATTR_RA_MANAGEMENT,
        IFACE_ATTR_RA_OFFLINK,
        IFACE_ATTR_RA_PREFERENCE,
        IFACE_ATTR_RA_MANAGEMENT,
        IFACE_ATTR_RA_OFFLINK,
        IFACE_ATTR_RA_PREFERENCE,
+       IFACE_ATTR_RA_ADVROUTER,
+       IFACE_ATTR_RA_MAXINTERVAL,
        IFACE_ATTR_PD_MANAGER,
        IFACE_ATTR_PD_CER,
        IFACE_ATTR_NDPROXY_ROUTING,
        IFACE_ATTR_NDPROXY_SLAVE,
        IFACE_ATTR_PD_MANAGER,
        IFACE_ATTR_PD_CER,
        IFACE_ATTR_NDPROXY_ROUTING,
        IFACE_ATTR_NDPROXY_SLAVE,
-       IFACE_ATTR_NDPROXY_STATIC,
        IFACE_ATTR_MAX
 };
 
        IFACE_ATTR_MAX
 };
 
@@ -73,16 +74,16 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_RA_MANAGEMENT] = { .name = "ra_management", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_RA_OFFLINK] = { .name = "ra_offlink", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_RA_PREFERENCE] = { .name = "ra_preference", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_RA_MANAGEMENT] = { .name = "ra_management", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_RA_OFFLINK] = { .name = "ra_offlink", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_RA_PREFERENCE] = { .name = "ra_preference", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_RA_ADVROUTER] = { .name = "ra_advrouter", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_RA_MAXINTERVAL] = { .name = "ra_maxinterval", .type = BLOBMSG_TYPE_INT32 },
        [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_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 },
 };
 
 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 = {
 };
 
 const struct uci_blob_param_list interface_attr_list = {
@@ -97,6 +98,7 @@ enum {
        LEASE_ATTR_MAC,
        LEASE_ATTR_DUID,
        LEASE_ATTR_HOSTID,
        LEASE_ATTR_MAC,
        LEASE_ATTR_DUID,
        LEASE_ATTR_HOSTID,
+       LEASE_ATTR_LEASETIME,
        LEASE_ATTR_NAME,
        LEASE_ATTR_MAX
 };
        LEASE_ATTR_NAME,
        LEASE_ATTR_MAX
 };
@@ -107,6 +109,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_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_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
 
        [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
 
@@ -153,7 +156,6 @@ static void clean_interface(struct interface *iface)
        free(iface->dns);
        free(iface->search);
        free(iface->upstream);
        free(iface->dns);
        free(iface->search);
        free(iface->upstream);
-       free(iface->static_ndp);
        free(iface->dhcpv4_router);
        free(iface->dhcpv4_dns);
        free(iface->dhcpv6_raw);
        free(iface->dhcpv4_router);
        free(iface->dhcpv4_dns);
        free(iface->dhcpv6_raw);
@@ -215,6 +217,33 @@ static void set_config(struct uci_section *s)
        }
 }
 
        }
 }
 
+static double parse_leasetime(struct blob_attr *c) {
+       char *val = blobmsg_get_string(c), *endptr = NULL;
+       double time = strcmp(val, "infinite") ? strtod(val, &endptr) : UINT32_MAX;
+
+       if (time && endptr && endptr[0]) {
+               if (endptr[0] == 's')
+                       time *= 1;
+               else if (endptr[0] == 'm')
+                       time *= 60;
+               else if (endptr[0] == 'h')
+                       time *= 3600;
+               else if (endptr[0] == 'd')
+                       time *= 24 * 3600;
+               else if (endptr[0] == 'w')
+                       time *= 7 * 24 * 3600;
+               else
+                       goto err;
+       }
+
+       if (time >= 60)
+               return time;
+
+       return 0;
+
+err:
+       return -1;
+}
 
 static int set_lease(struct uci_section *s)
 {
 
 static int set_lease(struct uci_section *s)
 {
@@ -265,6 +294,15 @@ static int set_lease(struct uci_section *s)
                        goto err;
        }
 
                        goto err;
        }
 
+       if ((c = tb[LEASE_ATTR_LEASETIME])) {
+               double time = parse_leasetime(c);
+               if (time < 0)
+                       goto err;
+
+               if (time >= 60)
+                       lease->dhcpv4_leasetime = time;
+       }
+
        list_add(&lease->head, &leases);
        return 0;
 
        list_add(&lease->head, &leases);
        return 0;
 
@@ -295,16 +333,16 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        return -1;
 
                strncpy(iface->name, name, sizeof(iface->name) - 1);
                        return -1;
 
                strncpy(iface->name, name, sizeof(iface->name) - 1);
+
+               /* Default settings */
+               iface->managed = 1;
+               iface->learn_routes = true;
+
                list_add(&iface->head, &interfaces);
                overwrite = true;
        }
 
        const char *ifname = NULL;
                list_add(&iface->head, &interfaces);
                overwrite = true;
        }
 
        const char *ifname = NULL;
-#ifdef WITH_UBUS
-       if (overwrite || !iface->ifname[0])
-               ifname = ubus_get_ifname(name);
-#endif
-
        if (overwrite) {
                if ((c = tb[IFACE_ATTR_IFNAME]))
                        ifname = blobmsg_get_string(c);
        if (overwrite) {
                if ((c = tb[IFACE_ATTR_IFNAME]))
                        ifname = blobmsg_get_string(c);
@@ -312,14 +350,19 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        ifname = blobmsg_get_string(c);
        }
 
                        ifname = blobmsg_get_string(c);
        }
 
+#ifdef WITH_UBUS
+       if (overwrite || !iface->ifname[0])
+               ifname = ubus_get_ifname(name);
+#endif
+
        if (!iface->ifname[0] && !ifname)
        if (!iface->ifname[0] && !ifname)
-               return -1;
+               goto err;
 
        if (ifname)
                strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
        if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
 
        if (ifname)
                strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
        if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
-               return -1;
+               goto err;
 
        iface->inuse = true;
 
 
        iface->inuse = true;
 
@@ -330,22 +373,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                iface->ignore = blobmsg_get_bool(c);
 
        if ((c = tb[IFACE_ATTR_LEASETIME])) {
                iface->ignore = blobmsg_get_bool(c);
 
        if ((c = tb[IFACE_ATTR_LEASETIME])) {
-               char *val = blobmsg_get_string(c), *endptr;
-               double time = strtod(val, &endptr);
-               if (time && endptr[0]) {
-                       if (endptr[0] == 's')
-                               time *= 1;
-                       else if (endptr[0] == 'm')
-                               time *= 60;
-                       else if (endptr[0] == 'h')
-                               time *= 3600;
-                       else if (endptr[0] == 'd')
-                               time *= 24 * 3600;
-                       else if (endptr[0] == 'w')
-                               time *= 7 * 24 * 3600;
-                       else
-                               goto err;
-               }
+               double time = parse_leasetime(c);
+               if (time < 0)
+                       goto err;
 
                if (time >= 60)
                        iface->dhcpv4_leasetime = time;
 
                if (time >= 60)
                        iface->dhcpv4_leasetime = time;
@@ -370,7 +400,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
-                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
                                continue;
 
                        iface->upstream = realloc(iface->upstream,
                                continue;
 
                        iface->upstream = realloc(iface->upstream,
@@ -417,7 +447,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
-                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
                                continue;
 
                        struct in_addr addr4;
                                continue;
 
                        struct in_addr addr4;
@@ -440,7 +470,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                iface->always_rewrite_dns = true;
                blobmsg_for_each_attr(cur, c, rem) {
 
                iface->always_rewrite_dns = true;
                blobmsg_for_each_attr(cur, c, rem) {
-                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
                                continue;
 
                        struct in_addr addr4;
                                continue;
 
                        struct in_addr addr4;
@@ -470,7 +500,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
-                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
                                continue;
 
                        uint8_t buf[256];
                                continue;
 
                        uint8_t buf[256];
@@ -480,7 +510,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                domain[domainlen - 1] = 0;
 
                        int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL);
                                domain[domainlen - 1] = 0;
 
                        int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL);
-                       free(domain);
                        if (len <= 0)
                                goto err;
 
                        if (len <= 0)
                                goto err;
 
@@ -509,12 +538,16 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
                iface->managed = blobmsg_get_u32(c);
 
        if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
                iface->managed = blobmsg_get_u32(c);
-       else if (overwrite)
-               iface->managed = 1;
 
        if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
                iface->ra_not_onlink = blobmsg_get_bool(c);
 
 
        if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
                iface->ra_not_onlink = blobmsg_get_bool(c);
 
+       if ((c = tb[IFACE_ATTR_RA_ADVROUTER]))
+               iface->ra_advrouter = blobmsg_get_bool(c);
+
+       if ((c = tb[IFACE_ATTR_RA_MAXINTERVAL]))
+               iface->ra_maxinterval = blobmsg_get_u32(c);
+
        if ((c = tb[IFACE_ATTR_RA_PREFERENCE])) {
                const char *prio = blobmsg_get_string(c);
 
        if ((c = tb[IFACE_ATTR_RA_PREFERENCE])) {
                const char *prio = blobmsg_get_string(c);
 
@@ -538,33 +571,10 @@ 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);
 
        if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING]))
                iface->learn_routes = blobmsg_get_bool(c);
-       else if (overwrite)
-               iface->learn_routes = true;
 
        if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE]))
                iface->external = blobmsg_get_bool(c);
 
 
        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:
        return 0;
 
 err:
@@ -687,10 +697,10 @@ void odhcpd_reload(void)
                                i->ndp = (master && master->ndp == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_DISABLED;
 
                                i->ndp = (master && master->ndp == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_DISABLED;
 
-                       setup_router_interface(i, true);
-                       setup_dhcpv6_interface(i, true);
-                       setup_ndp_interface(i, true);
-                       setup_dhcpv4_interface(i, true);
+                       setup_router_interface(i, !i->ignore);
+                       setup_dhcpv6_interface(i, !i->ignore);
+                       setup_ndp_interface(i, !i->ignore);
+                       setup_dhcpv4_interface(i, !i->ignore);
                } else {
                        close_interface(i);
                }
                } else {
                        close_interface(i);
                }
@@ -704,9 +714,10 @@ void odhcpd_reload(void)
 static void handle_signal(int signal)
 {
        char b[1] = {0};
 static void handle_signal(int signal)
 {
        char b[1] = {0};
-       if (signal == SIGHUP)
-               write(reload_pipe[1], b, sizeof(b));
-       else
+
+       if (signal == SIGHUP) {
+               if (write(reload_pipe[1], b, sizeof(b)) < 0) {}
+       } else
                uloop_end();
 }
 
                uloop_end();
 }
 
@@ -715,7 +726,7 @@ static void handle_signal(int signal)
 static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
 {
        char b[512];
 static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
 {
        char b[512];
-       read(u->fd, b, sizeof(b));
+       if (read(u->fd, b, sizeof(b)) < 0) {}
        odhcpd_reload();
 }
 
        odhcpd_reload();
 }
 
@@ -723,7 +734,7 @@ static struct uloop_fd reload_fd = { .cb = reload_cb };
 
 void odhcpd_run(void)
 {
 
 void odhcpd_run(void)
 {
-       pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC);
+       if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {}
        reload_fd.fd = reload_pipe[0];
        uloop_fd_add(&reload_fd, ULOOP_READ);
 
        reload_fd.fd = reload_pipe[0];
        uloop_fd_add(&reload_fd, ULOOP_READ);
 
@@ -738,5 +749,8 @@ void odhcpd_run(void)
 
        odhcpd_reload();
        uloop_run();
 
        odhcpd_reload();
        uloop_run();
+
+       while (!list_empty(&interfaces))
+               close_interface(list_first_entry(&interfaces, struct interface, head));
 }
 
 }
 
OpenWrt DHCP Server