X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=1276b6f8ef6adf00d24e26c9e910ee57d5d6e313;hp=211ac1fd7a9a9b49df2d4c751c84dfab6bdc3091;hb=5dad295c283a8ab8101d58ec3d8ead49a3a62a19;hpb=2cb6b4872a1981f2acce40018107481c82a529dc

diff --git a/src/config.c b/src/config.c
index 211ac1f..1276b6f 100644
--- 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"
 
@@ -51,6 +53,7 @@ enum {
 	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,
@@ -92,6 +95,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[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 },
@@ -233,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);
 }
 
@@ -392,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);
 
@@ -413,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;
@@ -601,21 +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])) {
+		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]))