X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=7d870f129b27047a8eb8bb57c805908aee3f842f;hp=35d8af7d23f7970d2a7aa10cbf653091a01a6e33;hb=a3d1f5148222174f12ea8df0c20a554fc5eaabab;hpb=3462b32b6e0e864acbe79e5c91b2c6a50742013f

diff --git a/src/config.c b/src/config.c
index 35d8af7..7d870f1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -30,6 +30,7 @@ enum {
 	IFACE_ATTR_DHCPV4,
 	IFACE_ATTR_DHCPV6,
 	IFACE_ATTR_NDP,
+	IFACE_ATTR_ROUTER,
 	IFACE_ATTR_DNS,
 	IFACE_ATTR_DOMAIN,
 	IFACE_ATTR_FILTER_CLASS,
@@ -38,6 +39,8 @@ 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,
@@ -60,6 +63,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_DHCPV4] = { .name = "dhcpv4", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_DHCPV6] = { .name = "dhcpv6", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_NDP] = { .name = "ndp", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_ROUTER] = { .name = "router", .type = BLOBMSG_TYPE_ARRAY },
 	[IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
 	[IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY },
 	[IFACE_ATTR_FILTER_CLASS] = { .name = "filter_class", .type = BLOBMSG_TYPE_STRING },
@@ -70,6 +74,8 @@ 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 },
 };
@@ -148,6 +154,7 @@ static void clean_interface(struct interface *iface)
 	free(iface->dns);
 	free(iface->search);
 	free(iface->upstream);
+	free(iface->dhcpv4_router);
 	free(iface->dhcpv4_dns);
 	free(iface->dhcpv6_raw);
 	free(iface->filter_class);
@@ -405,6 +412,28 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 			goto err;
 	}
 
+	if ((c = tb[IFACE_ATTR_ROUTER])) {
+		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;
+
+			struct in_addr addr4;
+			if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) {
+				iface->dhcpv4_router = realloc(iface->dhcpv4_router,
+						(++iface->dhcpv4_router_cnt) * sizeof(*iface->dhcpv4_router));
+				if (!iface->dhcpv4_router)
+					goto err;
+
+				iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
+			} else {
+				goto err;
+			}
+		}
+	}
+
 	if ((c = tb[IFACE_ATTR_DNS])) {
 		struct blob_attr *cur;
 		unsigned rem;
@@ -451,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;
 
@@ -486,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);
 
@@ -654,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();
 }
 
@@ -665,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();
 }
 
@@ -673,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);
 
@@ -688,5 +723,8 @@ void odhcpd_run(void)
 
 	odhcpd_reload();
 	uloop_run();
+
+	while (!list_empty(&interfaces))
+		close_interface(list_first_entry(&interfaces, struct interface, head));
 }