X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=35d8af7d23f7970d2a7aa10cbf653091a01a6e33;hp=6dd52bba70b6bdb7ade2fadb59c465f5cf6e14d8;hb=d2b74369ddd2eaeef7d36baed53f709c98c490b0;hpb=87b974a21add279ce7f7be31f7b22f7ea97949c3;ds=sidebyside

diff --git a/src/config.c b/src/config.c
index 6dd52bb..35d8af7 100644
--- a/src/config.c
+++ b/src/config.c
@@ -32,6 +32,7 @@ enum {
 	IFACE_ATTR_NDP,
 	IFACE_ATTR_DNS,
 	IFACE_ATTR_DOMAIN,
+	IFACE_ATTR_FILTER_CLASS,
 	IFACE_ATTR_DHCPV6_RAW,
 	IFACE_ATTR_RA_DEFAULT,
 	IFACE_ATTR_RA_MANAGEMENT,
@@ -41,7 +42,6 @@ enum {
 	IFACE_ATTR_PD_CER,
 	IFACE_ATTR_NDPROXY_ROUTING,
 	IFACE_ATTR_NDPROXY_SLAVE,
-	IFACE_ATTR_NDPROXY_STATIC,
 	IFACE_ATTR_MAX
 };
 
@@ -62,6 +62,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_NDP] = { .name = "ndp", .type = BLOBMSG_TYPE_STRING },
 	[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 },
@@ -71,14 +72,12 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_RA_PREFERENCE] = { .name = "ra_preference", .type = BLOBMSG_TYPE_STRING },
 	[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 = {
@@ -149,9 +148,9 @@ static void clean_interface(struct interface *iface)
 	free(iface->dns);
 	free(iface->search);
 	free(iface->upstream);
-	free(iface->static_ndp);
 	free(iface->dhcpv4_dns);
 	free(iface->dhcpv6_raw);
+	free(iface->filter_class);
 	memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
 }
 
@@ -252,10 +251,12 @@ 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;
+	}
 
 	list_add(&lease->head, &leases);
 	return 0;
@@ -444,7 +445,13 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 				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);
+			free(domain);
 			if (len <= 0)
 				goto err;
 
@@ -457,6 +464,11 @@ 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);
@@ -503,27 +515,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: