X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=b8f341238a0144754a9c31457278491394d82999;hp=57da77dc0ed2676c089238b0763b8843fdcefc06;hb=8e1b0ca9e75668a9663196520af4422b837aa4a6;hpb=aa446207119b958eb51c6b9d447cd03a011927bd

diff --git a/proto-static.c b/proto-static.c
index 57da77d..b8f3412 100644
--- a/proto-static.c
+++ b/proto-static.c
@@ -17,6 +17,7 @@ enum {
 	OPT_NETMASK,
 	OPT_GATEWAY,
 	OPT_IP6GW,
+	OPT_DNS,
 	__OPT_MAX,
 };
 
@@ -26,11 +27,13 @@ static const struct blobmsg_policy static_attrs[__OPT_MAX] = {
 	[OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
 	[OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
 	[OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
+	[OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static const union config_param_info static_attr_info[__OPT_MAX] = {
 	[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
 	[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
+	[OPT_DNS] = { .type = BLOBMSG_TYPE_STRING },
 };
 
 static const struct config_param_list static_attr_list = {
@@ -46,53 +49,13 @@ struct static_proto_state {
 };
 
 static bool
-split_netmask(char *str, unsigned int *netmask)
-{
-	char *delim, *err = NULL;
-
-	delim = strchr(str, '/');
-	if (delim) {
-		*(delim++) = 0;
-
-		*netmask = strtoul(delim, &err, 10);
-		if (err && *err)
-			return false;
-	}
-	return true;
-}
-
-static int
-parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
-{
-	char *astr = alloca(strlen(str) + 1);
-
-	strcpy(astr, str);
-	if (!split_netmask(astr, netmask))
-		return 0;
-
-	if (af == AF_INET6) {
-		if (*netmask > 128)
-			return 0;
-	} else {
-		if (*netmask > 32)
-			return 0;
-	}
-
-	return inet_pton(af, str, addr);
-}
-
-static bool
 parse_addr(struct interface *iface, const char *str, bool v6, int mask)
 {
 	struct device_addr *addr;
-	int af = v6 ? AF_INET6 : AF_INET;
 
-	addr = calloc(1, sizeof(*addr));
-	addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
-	addr->mask = mask;
-	if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
+	addr = proto_parse_ip_addr_string(str, v6, mask);
+	if (!addr) {
 		interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
-		free(addr);
 		return false;
 	}
 	vlist_add(&iface->proto_addr, &addr->node);
@@ -140,20 +103,18 @@ static int
 proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__OPT_MAX];
-	struct in_addr ina;
 	const char *error;
-	int netmask = 32;
+	unsigned int netmask = 32;
 	int n_v4 = 0, n_v6 = 0;
 
 	blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
 
 	if (tb[OPT_NETMASK]) {
-		if (!inet_aton(blobmsg_data(tb[OPT_NETMASK]), &ina)) {
+		netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
+		if (netmask > 32) {
 			error = "INVALID_NETMASK";
 			goto error;
 		}
-
-		netmask = 32 - fls(~(ntohl(ina.s_addr)));
 	}
 
 	if (tb[OPT_IPADDR])
@@ -180,6 +141,9 @@ proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
 			goto out;
 	}
 
+	if (tb[OPT_DNS])
+		interface_add_dns_server_list(iface, tb[OPT_DNS]);
+
 	return 0;
 
 error: