treewide: rework code to get rid of fixed IPv6 address arrays

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

diff --git a/src/config.c b/src/config.c
index df0cbc4..1276b6f 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -4,12 +4,14 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <libgen.h>
+#include <net/if.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <syslog.h>
 
 #include <uci.h>
 #include <uci_blob.h>
+#include <libubox/utils.h>
 
 #include "odhcpd.h"
 
@@ -17,8 +19,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);
-struct config config = {.legacy = false, .dhcp_cb = NULL,
-                       .dhcp_statefile = NULL, .log_level = LOG_INFO};
+struct config config = {.legacy = false, .main_dhcpv4 = false,
+                       .dhcp_cb = NULL, .dhcp_statefile = NULL,
+                       .log_level = LOG_INFO};
 
 enum {
        IFACE_ATTR_INTERFACE,
@@ -48,6 +51,11 @@ enum {
        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,
@@ -85,6 +93,11 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [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 },
 };
@@ -126,6 +139,7 @@ const struct uci_blob_param_list lease_attr_list = {
 };
 
 enum {
+       ODHCPD_ATTR_LEGACY,
        ODHCPD_ATTR_MAINDHCP,
        ODHCPD_ATTR_LEASEFILE,
        ODHCPD_ATTR_LEASETRIGGER,
@@ -134,6 +148,7 @@ enum {
 };
 
 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 },
@@ -222,6 +237,8 @@ static void close_interface(struct interface *iface)
        setup_dhcpv4_interface(iface, false);
 
        clean_interface(iface);
+       free(iface->ia_addr);
+       free(iface->ifname);
        free(iface);
 }
 
@@ -247,9 +264,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));
 
-       if ((c = tb[ODHCPD_ATTR_MAINDHCP]))
+       if ((c = tb[ODHCPD_ATTR_LEGACY]))
                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));
@@ -378,11 +398,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        struct interface *iface = get_interface(name);
        if (!iface) {
-               iface = calloc(1, sizeof(*iface));
+               char *iface_name;
+
+               iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1);
                if (!iface)
                        return -1;
 
-               strncpy(iface->name, name, sizeof(iface->name) - 1);
+               iface->name = strcpy(iface_name, name);
 
                set_interface_defaults(iface);
 
@@ -399,15 +421,20 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        }
 
 #ifdef WITH_UBUS
-       if (overwrite || !iface->ifname[0])
+       if (overwrite || !iface->ifname)
                ifname = ubus_get_ifname(name);
 #endif
 
-       if (!iface->ifname[0] && !ifname)
+       if (!iface->ifname && !ifname)
                goto err;
 
-       if (ifname)
-               strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
+       if (ifname) {
+               free(iface->ifname);
+               iface->ifname = strdup(ifname);
+
+               if (!iface->ifname)
+                       goto err;
+       }
 
        if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
                goto err;
@@ -431,7 +458,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        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;
        }
 
@@ -469,8 +496,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        }
 
        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;
        }
@@ -584,6 +613,38 @@ 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_REACHABLETIME])) {
+               uint32_t ra_reachabletime = blobmsg_get_u32(c);
+               if (ra_reachabletime > 3600000)
+                       goto err;
+
+               iface->ra_reachabletime = ra_reachabletime;
+       }
+
+       if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) {
+               uint32_t ra_retranstime = blobmsg_get_u32(c);
+               if (ra_retranstime > 60000)
+                       goto err;
+
+               iface->ra_retranstime = ra_retranstime;
+       }
+
+       if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {
+               uint32_t ra_hoplimit = blobmsg_get_u32(c);
+               if (ra_hoplimit > 255)
+                       goto err;
+
+               iface->ra_hoplimit = ra_hoplimit;
+       }
+
+       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);
 
@@ -599,6 +660,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        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);
 
@@ -755,11 +819,11 @@ void odhcpd_reload(void)
                        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 {
+               } else
                        close_interface(i);
-               }
        }
 
+       ndp_handle_addr6_dump();
        uci_unload(uci, dhcp);
        uci_free_context(uci);
 }