X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=372ea6782701630f0b9b02da12e1f22b06996273;hp=195a9a420c20156c34070054a0b060faed72ec20;hb=3af23ad72888393a863d7be545d1bd5af99ca442;hpb=025572363ee84e8477581dbca321efaee3ebdddb

diff --git a/src/config.c b/src/config.c
index 195a9a4..372ea67 100644
--- a/src/config.c
+++ b/src/config.c
@@ -30,15 +30,21 @@ enum {
 	IFACE_ATTR_DHCPV4,
 	IFACE_ATTR_DHCPV6,
 	IFACE_ATTR_NDP,
+	IFACE_ATTR_ROUTER,
 	IFACE_ATTR_DNS,
 	IFACE_ATTR_DOMAIN,
+	IFACE_ATTR_FILTER_CLASS,
+	IFACE_ATTR_DHCPV6_RAW,
 	IFACE_ATTR_RA_DEFAULT,
 	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
 };
 
@@ -57,22 +63,27 @@ 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 },
+	[IFACE_ATTR_DHCPV6_RAW] = { .name = "dhcpv6_raw", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_PD_MANAGER] = { .name = "pd_manager", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_PD_CER] = { .name = "pd_cer", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_RA_DEFAULT] = { .name = "ra_default", .type = BLOBMSG_TYPE_INT32 },
 	[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 = {
@@ -87,6 +98,7 @@ enum {
 	LEASE_ATTR_MAC,
 	LEASE_ATTR_DUID,
 	LEASE_ATTR_HOSTID,
+	LEASE_ATTR_LEASETIME,
 	LEASE_ATTR_NAME,
 	LEASE_ATTR_MAX
 };
@@ -97,6 +109,7 @@ static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
 	[LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
 	[LEASE_ATTR_DUID] = { .name = "duid", .type = BLOBMSG_TYPE_STRING },
 	[LEASE_ATTR_HOSTID] = { .name = "hostid", .type = BLOBMSG_TYPE_STRING },
+	[LEASE_ATTR_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING },
 	[LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
 
@@ -143,8 +156,10 @@ 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);
+	free(iface->filter_class);
 	memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
 }
 
@@ -202,6 +217,33 @@ static void set_config(struct uci_section *s)
 	}
 }
 
+static double parse_leasetime(struct blob_attr *c) {
+	char *val = blobmsg_get_string(c), *endptr = NULL;
+	double time = strcmp(val, "infinite") ? strtod(val, &endptr) : UINT32_MAX;
+
+	if (time && endptr && endptr[0]) {
+		if (endptr[0] == 's')
+			time *= 1;
+		else if (endptr[0] == 'm')
+			time *= 60;
+		else if (endptr[0] == 'h')
+			time *= 3600;
+		else if (endptr[0] == 'd')
+			time *= 24 * 3600;
+		else if (endptr[0] == 'w')
+			time *= 7 * 24 * 3600;
+		else
+			goto err;
+	}
+
+	if (time >= 60)
+		return time;
+
+	return 0;
+
+err:
+	return -1;
+}
 
 static int set_lease(struct uci_section *s)
 {
@@ -245,10 +287,21 @@ static int set_lease(struct uci_section *s)
 		lease->duid_len = len;
 	}
 
-	if ((c = tb[LEASE_ATTR_HOSTID]))
-		if (odhcpd_unhexlify((uint8_t*)&lease->hostid, sizeof(lease->hostid),
-				blobmsg_get_string(c)) < 0)
+	if ((c = tb[LEASE_ATTR_HOSTID])) {
+		errno = 0;
+		lease->hostid = strtoul(blobmsg_get_string(c), NULL, 16);
+		if (errno)
 			goto err;
+	}
+
+	if ((c = tb[LEASE_ATTR_LEASETIME])) {
+		double time = parse_leasetime(c);
+		if (time < 0)
+			goto err;
+
+		if (time >= 60)
+			lease->dhcpv4_leasetime = time;
+	}
 
 	list_add(&lease->head, &leases);
 	return 0;
@@ -280,15 +333,16 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 			return -1;
 
 		strncpy(iface->name, name, sizeof(iface->name) - 1);
+
+		/* Default settings */
+		iface->managed = 1;
+		iface->learn_routes = true;
+
 		list_add(&iface->head, &interfaces);
+		overwrite = true;
 	}
 
 	const char *ifname = NULL;
-#ifdef WITH_UBUS
-	if (overwrite || !iface->ifname[0])
-		ifname = ubus_get_ifname(name);
-#endif
-
 	if (overwrite) {
 		if ((c = tb[IFACE_ATTR_IFNAME]))
 			ifname = blobmsg_get_string(c);
@@ -296,14 +350,19 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 			ifname = blobmsg_get_string(c);
 	}
 
+#ifdef WITH_UBUS
+	if (overwrite || !iface->ifname[0])
+		ifname = ubus_get_ifname(name);
+#endif
+
 	if (!iface->ifname[0] && !ifname)
-		return -1;
+		goto err;
 
 	if (ifname)
 		strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
 	if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
-		return -1;
+		goto err;
 
 	iface->inuse = true;
 
@@ -314,22 +373,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 		iface->ignore = blobmsg_get_bool(c);
 
 	if ((c = tb[IFACE_ATTR_LEASETIME])) {
-		char *val = blobmsg_get_string(c), *endptr;
-		double time = strtod(val, &endptr);
-		if (time && endptr[0]) {
-			if (endptr[0] == 's')
-				time *= 1;
-			else if (endptr[0] == 'm')
-				time *= 60;
-			else if (endptr[0] == 'h')
-				time *= 3600;
-			else if (endptr[0] == 'd')
-				time *= 24 * 3600;
-			else if (endptr[0] == 'w')
-				time *= 7 * 24 * 3600;
-			else
-				goto err;
-		}
+		double time = parse_leasetime(c);
+		if (time < 0)
+			goto err;
 
 		if (time >= 60)
 			iface->dhcpv4_leasetime = time;
@@ -354,7 +400,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 		unsigned rem;
 
 		blobmsg_for_each_attr(cur, c, rem) {
-			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
 				continue;
 
 			iface->upstream = realloc(iface->upstream,
@@ -396,13 +442,35 @@ 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, false))
+				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;
 
 		iface->always_rewrite_dns = true;
 		blobmsg_for_each_attr(cur, c, rem) {
-			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
 				continue;
 
 			struct in_addr addr4;
@@ -432,11 +500,16 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 		unsigned rem;
 
 		blobmsg_for_each_attr(cur, c, rem) {
-			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
+			if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
 				continue;
 
 			uint8_t buf[256];
-			int len = dn_comp(blobmsg_get_string(cur), buf, sizeof(buf), NULL, NULL);
+			char *domain = blobmsg_get_string(cur);
+			size_t domainlen = strlen(domain);
+			if (domainlen > 0 && domain[domainlen - 1] == '.')
+				domain[domainlen - 1] = 0;
+
+			int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL);
 			if (len <= 0)
 				goto err;
 
@@ -449,17 +522,32 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 		}
 	}
 
+	if ((c = tb[IFACE_ATTR_FILTER_CLASS])) {
+		iface->filter_class = realloc(iface->filter_class, blobmsg_data_len(c) + 1);
+		memcpy(iface->filter_class, blobmsg_get_string(c), blobmsg_data_len(c) + 1);
+	}
+
+	if ((c = tb[IFACE_ATTR_DHCPV6_RAW])) {
+		iface->dhcpv6_raw_len = blobmsg_data_len(c) / 2;
+		iface->dhcpv6_raw = realloc(iface->dhcpv6_raw, iface->dhcpv6_raw_len);
+		odhcpd_unhexlify(iface->dhcpv6_raw, iface->dhcpv6_raw_len, blobmsg_get_string(c));
+	}
+
 	if ((c = tb[IFACE_ATTR_RA_DEFAULT]))
 		iface->default_router = blobmsg_get_u32(c);
 
 	if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
 		iface->managed = blobmsg_get_u32(c);
-	else
-		iface->managed = 1;
 
 	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);
 
@@ -473,32 +561,20 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 			goto err;
 	}
 
+	if ((c = tb[IFACE_ATTR_PD_MANAGER]))
+		strncpy(iface->dhcpv6_pd_manager, blobmsg_get_string(c),
+				sizeof(iface->dhcpv6_pd_manager) - 1);
+
+	if ((c = tb[IFACE_ATTR_PD_CER]) &&
+			inet_pton(AF_INET6, blobmsg_get_string(c), &iface->dhcpv6_pd_cer) < 1)
+		goto err;
+
 	if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING]))
 		iface->learn_routes = blobmsg_get_bool(c);
-	else
-		iface->learn_routes = true;
 
 	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;
-
-			memcpy(&iface->static_ndp[iface->static_ndp_len], blobmsg_get_string(cur), len);
-			iface->static_ndp_len += len;
-		}
-	}
-
 	return 0;
 
 err:
@@ -517,8 +593,8 @@ static int set_interface(struct uci_section *s)
 void odhcpd_reload(void)
 {
 	struct uci_context *uci = uci_alloc_context();
-	struct lease *l;
-	list_for_each_entry(l, &leases, head) {
+	while (!list_empty(&leases)) {
+		struct lease *l = list_first_entry(&leases, struct lease, head);
 		list_del(&l->head);
 		free(l->duid);
 		free(l);
@@ -555,6 +631,23 @@ void odhcpd_reload(void)
 	ubus_apply_network();
 #endif
 
+	bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
+
+	// Test for
+	list_for_each_entry(i, &interfaces, head) {
+		if (i->master)
+			continue;
+
+		if (i->dhcpv6 == RELAYD_HYBRID || i->dhcpv6 == RELAYD_RELAY)
+			any_dhcpv6_slave = true;
+
+		if (i->ra == RELAYD_HYBRID || i->ra == RELAYD_RELAY)
+			any_ra_slave = true;
+
+		if (i->ndp == RELAYD_HYBRID || i->ndp == RELAYD_RELAY)
+			any_ndp_slave = true;
+	}
+
 	// Evaluate hybrid mode for master
 	list_for_each_entry(i, &interfaces, head) {
 		if (!i->master)
@@ -569,12 +662,21 @@ void odhcpd_reload(void)
 		if (i->dhcpv6 == RELAYD_HYBRID)
 			i->dhcpv6 = hybrid_mode;
 
+		if (i->dhcpv6 == RELAYD_RELAY && !any_dhcpv6_slave)
+			i->dhcpv6 = RELAYD_DISABLED;
+
 		if (i->ra == RELAYD_HYBRID)
 			i->ra = hybrid_mode;
 
+		if (i->ra == RELAYD_RELAY && !any_ra_slave)
+			i->ra = RELAYD_DISABLED;
+
 		if (i->ndp == RELAYD_HYBRID)
 			i->ndp = hybrid_mode;
 
+		if (i->ndp == RELAYD_RELAY && !any_ndp_slave)
+			i->ndp = RELAYD_DISABLED;
+
 		if (i->dhcpv6 == RELAYD_RELAY || i->ra == RELAYD_RELAY || i->ndp == RELAYD_RELAY)
 			master = i;
 	}
@@ -593,12 +695,12 @@ void odhcpd_reload(void)
 
 			if (i->ndp == RELAYD_HYBRID)
 				i->ndp = (master && master->ndp == RELAYD_RELAY) ?
-						RELAYD_RELAY : RELAYD_SERVER;
+						RELAYD_RELAY : RELAYD_DISABLED;
 
-			setup_router_interface(i, true);
-			setup_dhcpv6_interface(i, true);
-			setup_ndp_interface(i, true);
-			setup_dhcpv4_interface(i, true);
+			setup_router_interface(i, !i->ignore);
+			setup_dhcpv6_interface(i, !i->ignore);
+			setup_ndp_interface(i, !i->ignore);
+			setup_dhcpv4_interface(i, !i->ignore);
 		} else {
 			close_interface(i);
 		}
@@ -612,9 +714,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();
 }
 
@@ -623,7 +726,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();
 }
 
@@ -631,7 +734,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);
 
@@ -646,5 +749,8 @@ void odhcpd_run(void)
 
 	odhcpd_reload();
 	uloop_run();
+
+	while (!list_empty(&interfaces))
+		close_interface(list_first_entry(&interfaces, struct interface, head));
 }