router: use enum to specify order and index of iov struct

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

diff --git a/src/config.c b/src/config.c
index 9348985..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"
 
@@ -235,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);
 }
 
@@ -394,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);
 
@@ -415,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;
@@ -603,24 +614,35 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                iface->managed = blobmsg_get_u32(c);
 
        if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) {
-               iface->ra_reachabletime = blobmsg_get_u32(c);
-               if (iface->ra_reachabletime > 3600000)
+               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]))
-               iface->ra_retranstime = blobmsg_get_u32(c);
+       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])) {
-               iface->ra_hoplimit = blobmsg_get_u32(c);
-               if (iface->ra_hoplimit > 255)
+               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])) {
-               iface->ra_mtu = blobmsg_get_u32(c);
-               if (iface->ra_mtu < 1280)
+               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]))