X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=7d870f129b27047a8eb8bb57c805908aee3f842f;hp=835db13a7e5e09763bfe87660d8ef2936135b7d0;hb=053ca41a841aa4a1b1ce86ce6ee9f4304cba7027;hpb=de90ff1b27ef8e41c819d40d80f0fd6d8be86ded

diff --git a/src/config.c b/src/config.c
index 835db13..7d870f1 100644
--- 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_ADVROUTER,
+	IFACE_ATTR_RA_MAXINTERVAL,
 	IFACE_ATTR_PD_MANAGER,
 	IFACE_ATTR_PD_CER,
 	IFACE_ATTR_NDPROXY_ROUTING,
 	IFACE_ATTR_NDPROXY_SLAVE,
-	IFACE_ATTR_NDPROXY_STATIC,
 	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_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_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 },
-	[IFACE_ATTR_NDPROXY_STATIC] = { .type = BLOBMSG_TYPE_STRING },
 };
 
 const struct uci_blob_param_list interface_attr_list = {
@@ -153,7 +154,6 @@ 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);
@@ -480,7 +480,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);
-			free(domain);
 			if (len <= 0)
 				goto err;
 
@@ -515,6 +514,12 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	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);
 
@@ -544,27 +549,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	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:
@@ -704,9 +688,10 @@ void odhcpd_reload(void)
 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();
 }
 
@@ -715,7 +700,7 @@ static void handle_signal(int signal)
 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();
 }
 
@@ -723,7 +708,7 @@ static struct uloop_fd reload_fd = { .cb = reload_cb };
 
 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);
 
@@ -738,5 +723,8 @@ void odhcpd_run(void)
 
 	odhcpd_reload();
 	uloop_run();
+
+	while (!list_empty(&interfaces))
+		close_interface(list_first_entry(&interfaces, struct interface, head));
 }