config: limit ra_mtu to 65535

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

diff --git a/src/config.c b/src/config.c
index 2c0bc90..fd334ef 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -3,6 +3,10 @@
 #include <signal.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <signal.h>
 #include <arpa/inet.h>
 #include <unistd.h>

+#include <libgen.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <syslog.h>

 
 #include <uci.h>
 #include <uci_blob.h>
 
 #include <uci.h>
 #include <uci_blob.h>


@@ -13,7 +17,9 @@ static struct blob_buf b;
 static int reload_pipe[2];
 struct list_head leases = LIST_HEAD_INIT(leases);
 struct list_head interfaces = LIST_HEAD_INIT(interfaces);
 static int reload_pipe[2];
 struct list_head leases = LIST_HEAD_INIT(leases);
 struct list_head interfaces = LIST_HEAD_INIT(interfaces);

-struct config config = {false, NULL, NULL};
+struct config config = {.legacy = false, .main_dhcpv4 = false,
+                       .dhcp_cb = NULL, .dhcp_statefile = NULL,
+                       .log_level = LOG_INFO};

 
 enum {
        IFACE_ATTR_INTERFACE,
 
 enum {
        IFACE_ATTR_INTERFACE,


@@ -39,11 +45,19 @@ 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_MININTERVAL,
+       IFACE_ATTR_RA_MAXINTERVAL,
+       IFACE_ATTR_RA_LIFETIME,
+       IFACE_ATTR_RA_USELEASETIME,
+       IFACE_ATTR_RA_REACHABLETIME,
+       IFACE_ATTR_RA_RETRANSTIME,
+       IFACE_ATTR_RA_HOPLIMIT,
+       IFACE_ATTR_RA_MTU,

        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 +87,23 @@ 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_MININTERVAL] = { .name = "ra_mininterval", .type = BLOBMSG_TYPE_INT32 },
+       [IFACE_ATTR_RA_MAXINTERVAL] = { .name = "ra_maxinterval", .type = BLOBMSG_TYPE_INT32 },
+       [IFACE_ATTR_RA_LIFETIME] = { .name = "ra_lifetime", .type = BLOBMSG_TYPE_INT32 },
+       [IFACE_ATTR_RA_USELEASETIME] = { .name = "ra_useleasetime", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_RA_REACHABLETIME] = { .name = "ra_reachabletime", .type = BLOBMSG_TYPE_INT32 },
+       [IFACE_ATTR_RA_RETRANSTIME] = { .name = "ra_retranstime", .type = BLOBMSG_TYPE_INT32 },
+       [IFACE_ATTR_RA_HOPLIMIT] = { .name = "ra_hoplimit", .type = BLOBMSG_TYPE_INT32 },
+       [IFACE_ATTR_RA_MTU] = { .name = "ra_mtu", .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 = {


@@ -91,52 +112,85 @@ const struct uci_blob_param_list interface_attr_list = {
        .info = iface_attr_info,
 };
 
        .info = iface_attr_info,
 };
 

-

 enum {
        LEASE_ATTR_IP,
        LEASE_ATTR_MAC,
        LEASE_ATTR_DUID,
        LEASE_ATTR_HOSTID,
 enum {
        LEASE_ATTR_IP,
        LEASE_ATTR_MAC,
        LEASE_ATTR_DUID,
        LEASE_ATTR_HOSTID,

+       LEASE_ATTR_LEASETIME,

        LEASE_ATTR_NAME,
        LEASE_ATTR_MAX
 };
 
        LEASE_ATTR_NAME,
        LEASE_ATTR_MAX
 };
 

-

 static 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_DUID] = { .name = "duid", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_HOSTID] = { .name = "hostid", .type = BLOBMSG_TYPE_STRING },
 static 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_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 },
 };
 

-

 const struct uci_blob_param_list lease_attr_list = {
        .n_params = LEASE_ATTR_MAX,
        .params = lease_attrs,
 };
 
 const struct uci_blob_param_list lease_attr_list = {
        .n_params = LEASE_ATTR_MAX,
        .params = lease_attrs,
 };
 

-

 enum {
 enum {

+       ODHCPD_ATTR_LEGACY,

        ODHCPD_ATTR_MAINDHCP,
        ODHCPD_ATTR_LEASEFILE,
        ODHCPD_ATTR_LEASETRIGGER,
        ODHCPD_ATTR_MAINDHCP,
        ODHCPD_ATTR_LEASEFILE,
        ODHCPD_ATTR_LEASETRIGGER,

+       ODHCPD_ATTR_LOGLEVEL,

        ODHCPD_ATTR_MAX
 };
 
        ODHCPD_ATTR_MAX
 };
 

-

 static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
 static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {

+       [ODHCPD_ATTR_LEGACY] = { .name = "legacy", .type = BLOBMSG_TYPE_BOOL },

        [ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
        [ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
        [ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },
        [ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
        [ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
        [ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },

+       [ODHCPD_ATTR_LOGLEVEL] = { .name = "loglevel", .type = BLOBMSG_TYPE_INT32 },

 };
 
 };
 

-

 const struct uci_blob_param_list odhcpd_attr_list = {
        .n_params = ODHCPD_ATTR_MAX,
        .params = odhcpd_attrs,
 };
 
 const struct uci_blob_param_list odhcpd_attr_list = {
        .n_params = ODHCPD_ATTR_MAX,
        .params = odhcpd_attrs,
 };
 

+static int mkdir_p(char *dir, mode_t mask)
+{
+       char *l = strrchr(dir, '/');
+       int ret;
+
+       if (!l)
+               return 0;
+
+       *l = '\0';
+
+       if (mkdir_p(dir, mask))
+               return -1;
+
+       *l = '/';
+
+       ret = mkdir(dir, mask);
+       if (ret && errno == EEXIST)
+               return 0;
+
+       if (ret)
+               syslog(LOG_ERR, "mkdir(%s, %d) failed: %s\n", dir, mask, strerror(errno));
+
+       return ret;
+}
+
+static void free_lease(struct lease *l)
+{
+       if (l->head.next)
+               list_del(&l->head);
+
+       free(l->duid);
+       free(l);
+}

 
 static struct interface* get_interface(const char *name)
 {
 
 static struct interface* get_interface(const char *name)
 {


@@ -147,21 +201,29 @@ static struct interface* get_interface(const char *name)
        return NULL;
 }
 
        return NULL;
 }
 

+static void set_interface_defaults(struct interface *iface)
+{
+       iface->managed = 1;
+       iface->learn_routes = 1;
+       iface->dhcpv4_leasetime = 43200;
+       iface->ra_maxinterval = 600;
+       iface->ra_mininterval = iface->ra_maxinterval/3;
+       iface->ra_lifetime = -1;
+}

 
 static void clean_interface(struct interface *iface)
 {
        free(iface->dns);
        free(iface->search);
        free(iface->upstream);
 
 static void clean_interface(struct interface *iface)
 {
        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->filter_class);
        memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
        free(iface->dhcpv4_router);
        free(iface->dhcpv4_dns);
        free(iface->dhcpv6_raw);
        free(iface->filter_class);
        memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));

+       set_interface_defaults(iface);

 }
 
 }
 

-

 static void close_interface(struct interface *iface)
 {
        if (iface->head.next)
 static void close_interface(struct interface *iface)
 {
        if (iface->head.next)


@@ -176,23 +238,20 @@ static void close_interface(struct interface *iface)
        free(iface);
 }
 
        free(iface);
 }
 

-

 static int parse_mode(const char *mode)
 {
 static int parse_mode(const char *mode)
 {

-       if (!strcmp(mode, "disabled")) {
+       if (!strcmp(mode, "disabled"))

                return RELAYD_DISABLED;
                return RELAYD_DISABLED;

-       } else if (!strcmp(mode, "server")) {
+       else if (!strcmp(mode, "server"))

                return RELAYD_SERVER;
                return RELAYD_SERVER;

-       } else if (!strcmp(mode, "relay")) {
+       else if (!strcmp(mode, "relay"))

                return RELAYD_RELAY;
                return RELAYD_RELAY;

-       } else if (!strcmp(mode, "hybrid")) {
+       else if (!strcmp(mode, "hybrid"))

                return RELAYD_HYBRID;
                return RELAYD_HYBRID;

-       } else {
+       else

                return -1;
                return -1;

-       }

 }
 
 }
 

-

 static void set_config(struct uci_section *s)
 {
        struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;
 static void set_config(struct uci_section *s)
 {
        struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;


@@ -201,9 +260,12 @@ static void set_config(struct uci_section *s)
        uci_to_blob(&b, s, &odhcpd_attr_list);
        blobmsg_parse(odhcpd_attrs, ODHCPD_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));
 
        uci_to_blob(&b, s, &odhcpd_attr_list);
        blobmsg_parse(odhcpd_attrs, ODHCPD_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));
 

-       if ((c = tb[ODHCPD_ATTR_MAINDHCP]))
+       if ((c = tb[ODHCPD_ATTR_LEGACY]))

                config.legacy = blobmsg_get_bool(c);
 
                config.legacy = blobmsg_get_bool(c);
 

+       if ((c = tb[ODHCPD_ATTR_MAINDHCP]))
+               config.main_dhcpv4 = blobmsg_get_bool(c);
+

        if ((c = tb[ODHCPD_ATTR_LEASEFILE])) {
                free(config.dhcp_statefile);
                config.dhcp_statefile = strdup(blobmsg_get_string(c));
        if ((c = tb[ODHCPD_ATTR_LEASEFILE])) {
                free(config.dhcp_statefile);
                config.dhcp_statefile = strdup(blobmsg_get_string(c));


@@ -213,8 +275,44 @@ static void set_config(struct uci_section *s)
                free(config.dhcp_cb);
                config.dhcp_cb = strdup(blobmsg_get_string(c));
        }
                free(config.dhcp_cb);
                config.dhcp_cb = strdup(blobmsg_get_string(c));
        }

+
+       if ((c = tb[ODHCPD_ATTR_LOGLEVEL])) {
+               int log_level = (blobmsg_get_u32(c) & LOG_PRIMASK);
+
+               if (config.log_level != log_level) {
+                       config.log_level = log_level;
+                       setlogmask(LOG_UPTO(config.log_level));
+               }
+       }

 }
 
 }
 

+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)
+               time = 60;
+
+       return time;
+
+err:
+       return -1;
+}

 
 static int set_lease(struct uci_section *s)
 {
 
 static int set_lease(struct uci_section *s)
 {


@@ -265,18 +363,24 @@ 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;
+
+               lease->dhcpv4_leasetime = time;
+       }
+

        list_add(&lease->head, &leases);
        return 0;
 
 err:
        list_add(&lease->head, &leases);
        return 0;
 
 err:

-       if (lease) {
-               free(lease->duid);
-               free(lease);
-       }
+       if (lease)
+               free_lease(lease);
+

        return -1;
 }
 
        return -1;
 }
 

-

 int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX], *c;
 int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX], *c;


@@ -295,16 +399,14 @@ 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);

+
+               set_interface_defaults(iface);
+

                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 +414,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,31 +437,17 @@ 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;
+               iface->dhcpv4_leasetime = time;

        }
 
        if ((c = tb[IFACE_ATTR_START])) {
                iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c));
 
        }
 
        if ((c = tb[IFACE_ATTR_START])) {
                iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c));
 

-               if (config.legacy)
+               if (config.main_dhcpv4 && config.legacy)

                        iface->dhcpv4 = RELAYD_SERVER;
        }
 
                        iface->dhcpv4 = RELAYD_SERVER;
        }
 


@@ -370,7 +463,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,


@@ -392,8 +485,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        }
 
        if ((c = tb[IFACE_ATTR_DHCPV4])) {
        }
 
        if ((c = tb[IFACE_ATTR_DHCPV4])) {

-               if ((mode = parse_mode(blobmsg_get_string(c))) >= 0)
-                       iface->dhcpv4 = mode;
+               if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) {
+                       if (config.main_dhcpv4)
+                               iface->dhcpv4 = mode;
+               }

                else
                        goto err;
        }
                else
                        goto err;
        }


@@ -417,7 +512,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;


@@ -428,9 +523,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                        goto err;
 
                                iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
                                        goto err;
 
                                iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;

-                       } else {
+                       } else

                                goto err;
                                goto err;

-                       }

                }
        }
 
                }
        }
 


@@ -440,7 +534,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;


@@ -459,9 +553,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                        goto err;
 
                                iface->dns[iface->dns_cnt - 1] = addr6;
                                        goto err;
 
                                iface->dns[iface->dns_cnt - 1] = addr6;

-                       } else {
+                       } else

                                goto err;
                                goto err;

-                       }

                }
        }
 
                }
        }
 


@@ -470,7 +563,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];


@@ -508,12 +601,51 @@ 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_REACHABLETIME])) {
+               iface->ra_reachabletime = blobmsg_get_u32(c);
+               if (iface->ra_reachabletime > 3600000)
+                       goto err;
+       }
+
+       if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) {
+               iface->ra_retranstime = blobmsg_get_u32(c);
+               if (iface->ra_retranstime > 60000)
+                       goto err;
+       }
+
+       if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {
+               iface->ra_hoplimit = blobmsg_get_u32(c);
+               if (iface->ra_hoplimit > 255)
+                       goto err;
+       }
+
+       if ((c = tb[IFACE_ATTR_RA_MTU])) {
+               uint32_t ra_mtu = blobmsg_get_u32(c);
+               if (ra_mtu < 1280 || ra_mtu > 65535)
+                       goto err;
+
+               iface->ra_mtu = ra_mtu;
+       }

 
        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_MININTERVAL]))
+               iface->ra_mininterval =  blobmsg_get_u32(c);
+
+       if ((c = tb[IFACE_ATTR_RA_MAXINTERVAL]))
+               iface->ra_maxinterval = blobmsg_get_u32(c);
+
+       if ((c = tb[IFACE_ATTR_RA_LIFETIME]))
+               iface->ra_lifetime = blobmsg_get_u32(c);
+
+       if ((c = tb[IFACE_ATTR_RA_USELEASETIME]))
+               iface->ra_useleasetime = blobmsg_get_bool(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);
 


@@ -537,33 +669,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:


@@ -575,19 +684,16 @@ static int set_interface(struct uci_section *s)
 {
        blob_buf_init(&b, 0);
        uci_to_blob(&b, s, &interface_attr_list);
 {
        blob_buf_init(&b, 0);
        uci_to_blob(&b, s, &interface_attr_list);

+

        return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
 }
 
        return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
 }
 

-

 void odhcpd_reload(void)
 {
        struct uci_context *uci = uci_alloc_context();
 void odhcpd_reload(void)
 {
        struct uci_context *uci = uci_alloc_context();

-       while (!list_empty(&leases)) {
-               struct lease *l = list_first_entry(&leases, struct lease, head);
-               list_del(&l->head);
-               free(l->duid);
-               free(l);
-       }
+
+       while (!list_empty(&leases))
+               free_lease(list_first_entry(&leases, struct lease, head));

 
        struct interface *master = NULL, *i, *n;
 
 
        struct interface *master = NULL, *i, *n;
 


@@ -615,6 +721,12 @@ void odhcpd_reload(void)
                }
        }
 
                }
        }
 

+       if (config.dhcp_statefile) {
+               char *path = strdup(config.dhcp_statefile);
+
+               mkdir_p(dirname(path), 0755);
+               free(path);
+       }

 
 #ifdef WITH_UBUS
        ubus_apply_network();
 
 #ifdef WITH_UBUS
        ubus_apply_network();


@@ -622,7 +734,7 @@ void odhcpd_reload(void)
 
        bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
 
 
        bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
 

-       // Test for
+       /* Test for */

        list_for_each_entry(i, &interfaces, head) {
                if (i->master)
                        continue;
        list_for_each_entry(i, &interfaces, head) {
                if (i->master)
                        continue;


@@ -637,7 +749,7 @@ void odhcpd_reload(void)
                        any_ndp_slave = true;
        }
 
                        any_ndp_slave = true;
        }
 

-       // Evaluate hybrid mode for master
+       /* Evaluate hybrid mode for master */

        list_for_each_entry(i, &interfaces, head) {
                if (!i->master)
                        continue;
        list_for_each_entry(i, &interfaces, head) {
                if (!i->master)
                        continue;


@@ -673,7 +785,7 @@ void odhcpd_reload(void)
 
        list_for_each_entry_safe(i, n, &interfaces, head) {
                if (i->inuse) {
 
        list_for_each_entry_safe(i, n, &interfaces, head) {
                if (i->inuse) {

-                       // Resolve hybrid mode
+                       /* Resolve hybrid mode */

                        if (i->dhcpv6 == RELAYD_HYBRID)
                                i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_SERVER;
                        if (i->dhcpv6 == RELAYD_HYBRID)
                                i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_SERVER;


@@ -686,35 +798,34 @@ 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);
-               } else {
+                       setup_router_interface(i, !i->ignore || i->ra != RELAYD_DISABLED);
+                       setup_dhcpv6_interface(i, !i->ignore || i->dhcpv6 != RELAYD_DISABLED);
+                       setup_ndp_interface(i, !i->ignore || i->ndp != RELAYD_DISABLED);
+                       setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != RELAYD_DISABLED);
+               } else

                        close_interface(i);
                        close_interface(i);

-               }

        }
 
        }
 

+       ndp_handle_addr6_dump();

        uci_unload(uci, dhcp);
        uci_free_context(uci);
 }
 
        uci_unload(uci, dhcp);
        uci_free_context(uci);
 }
 

-

 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();
 }
 

-
-

 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();
 }
 


@@ -722,7 +833,8 @@ 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);
 


@@ -737,5 +849,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));

 }
 
 }