X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=c72a00572cc4c8de44d6f9995be42d4e6d1267da;hp=44bd42d4223d8d352d5d9b48cbbc8f9788c6b64f;hb=6094417533d97662f693d134ab04595a292de30c;hpb=68880012767f47598b77db01d4e4bf86d018670f

diff --git a/proto.c b/proto.c
index 44bd42d..c72a005 100644
--- a/proto.c
+++ b/proto.c
@@ -32,8 +32,6 @@ enum {
 	OPT_BROADCAST,
 	OPT_GATEWAY,
 	OPT_IP6GW,
-	OPT_DNS,
-	OPT_DNS_SEARCH,
 	__OPT_MAX,
 };
 
@@ -44,14 +42,11 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
 	[OPT_BROADCAST] = { .name = "broadcast", .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 },
-	[OPT_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static const union config_param_info proto_ip_attr_info[__OPT_MAX] = {
 	[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
 	[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
-	[OPT_DNS] = { .type = BLOBMSG_TYPE_STRING },
 };
 
 const struct config_param_list proto_ip_attr = {
@@ -60,80 +55,31 @@ const struct config_param_list proto_ip_attr = {
 	.info = proto_ip_attr_info,
 };
 
+enum {
+	ADDR_IPADDR,
+	ADDR_MASK,
+	ADDR_BROADCAST,
+	ADDR_PTP,
+	__ADDR_MAX
+};
 
-unsigned int
-parse_netmask_string(const char *str, bool v6)
-{
-	struct in_addr addr;
-	unsigned int ret;
-	char *err = NULL;
-
-	if (!strchr(str, '.')) {
-		ret = strtoul(str, &err, 0);
-		if (err && *err)
-			goto error;
-
-		return ret;
-	}
-
-	if (v6)
-		goto error;
-
-	if (inet_aton(str, &addr) != 1)
-		goto error;
-
-	return 32 - fls(~(ntohl(addr.s_addr)));
-
-error:
-	return ~0;
-}
-
-static bool
-split_netmask(char *str, unsigned int *netmask, bool v6)
-{
-	char *delim = strchr(str, '/');
-
-	if (delim) {
-		*(delim++) = 0;
-
-		*netmask = parse_netmask_string(delim, v6);
-	}
-	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, af == AF_INET6))
-		return 0;
-
-	if (af == AF_INET6) {
-		if (*netmask > 128)
-			return 0;
-	} else {
-		if (*netmask > 32)
-			return 0;
-	}
-
-	return inet_pton(af, astr, addr);
-}
+static const struct blobmsg_policy proto_ip_addr[__ADDR_MAX] = {
+	[ADDR_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_STRING },
+	[ADDR_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_STRING },
+	[ADDR_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
+	[ADDR_PTP] = { .name = "ptp", .type = BLOBMSG_TYPE_STRING },
+};
 
 static struct device_addr *
-proto_parse_ip_addr_string(const char *str, bool v6, int mask)
+alloc_device_addr(bool v6, bool ext)
 {
 	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)) {
-		free(addr);
-		return NULL;
-	}
+	if (ext)
+		addr->flags |= DEVADDR_EXTERNAL;
+
 	return addr;
 }
 
@@ -142,26 +88,29 @@ parse_addr(struct interface *iface, const char *str, bool v6, int mask,
 	   bool ext, uint32_t broadcast)
 {
 	struct device_addr *addr;
+	int af = v6 ? AF_INET6 : AF_INET;
+
+	addr = alloc_device_addr(v6, ext);
+	if (!addr)
+		return false;
 
-	addr = proto_parse_ip_addr_string(str, v6, mask);
-	if (!addr) {
+	addr->mask = mask;
+	if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
 		interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
+		free(addr);
 		return false;
 	}
 
 	if (broadcast)
 		addr->broadcast = broadcast;
 
-	if (ext)
-		addr->flags |= DEVADDR_EXTERNAL;
-
 	vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
 	return true;
 }
 
 static int
-parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6,
-		     int netmask, bool ext, uint32_t broadcast)
+parse_static_address_option(struct interface *iface, struct blob_attr *attr,
+			    bool v6, int netmask, bool ext, uint32_t broadcast)
 {
 	struct blob_attr *cur;
 	int n_addr = 0;
@@ -180,6 +129,76 @@ parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6,
 	return n_addr;
 }
 
+static struct device_addr *
+parse_address_item(struct blob_attr *attr, bool v6, bool ext)
+{
+	struct device_addr *addr;
+	struct blob_attr *tb[__ADDR_MAX];
+	struct blob_attr *cur;
+
+	if (blobmsg_type(attr) != BLOBMSG_TYPE_TABLE)
+		return NULL;
+
+	addr = alloc_device_addr(v6, ext);
+	if (!addr)
+		return NULL;
+
+	blobmsg_parse(proto_ip_addr, __ADDR_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
+
+	addr->mask = v6 ? 128 : 32;
+	if ((cur = tb[ADDR_MASK])) {
+		unsigned int new_mask;
+
+		new_mask = parse_netmask_string(blobmsg_data(cur), v6);
+		if (new_mask > addr->mask)
+			goto error;
+
+		addr->mask = new_mask;
+	}
+
+	cur = tb[ADDR_IPADDR];
+	if (!cur)
+		goto error;
+
+	if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(cur), &addr->addr))
+		goto error;
+
+	if (!v6) {
+		if ((cur = tb[ADDR_BROADCAST]) &&
+		    !inet_pton(AF_INET, blobmsg_data(cur), &addr->broadcast))
+			goto error;
+		if ((cur = tb[ADDR_PTP]) &&
+		    !inet_pton(AF_INET, blobmsg_data(cur), &addr->point_to_point))
+			goto error;
+	}
+
+	return addr;
+
+error:
+	free(addr);
+	return NULL;
+}
+
+static int
+parse_address_list(struct interface *iface, struct blob_attr *attr, bool v6,
+		   bool ext)
+{
+	struct device_addr *addr;
+	struct blob_attr *cur;
+	int n_addr = 0;
+	int rem;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		addr = parse_address_item(cur, v6, ext);
+		if (!addr)
+			return -1;
+
+		n_addr++;
+		vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
+	}
+
+	return n_addr;
+}
 
 static bool
 parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
@@ -230,11 +249,11 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
 	}
 
 	if ((cur = tb[OPT_IPADDR]))
-		n_v4 = parse_address_option(iface, cur, false,
+		n_v4 = parse_static_address_option(iface, cur, false,
 			netmask, false, bcast.s_addr);
 
 	if ((cur = tb[OPT_IP6ADDR]))
-		n_v6 = parse_address_option(iface, cur, true,
+		n_v6 = parse_static_address_option(iface, cur, true,
 			netmask, false, 0);
 
 	if (!n_v4 && !n_v6) {
@@ -255,12 +274,6 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
 			goto out;
 	}
 
-	if ((cur = tb[OPT_DNS]))
-		interface_add_dns_server_list(&iface->proto_ip, cur);
-
-	if ((cur = tb[OPT_DNS_SEARCH]))
-		interface_add_dns_search_list(&iface->proto_ip, cur);
-
 	return 0;
 
 error:
@@ -276,17 +289,14 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex
 	struct blob_attr *cur;
 	const char *error;
 	int n_v4 = 0, n_v6 = 0;
-	struct in_addr bcast = {};
 
 	blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
 
 	if ((cur = tb[OPT_IPADDR]))
-		n_v4 = parse_address_option(iface, cur, false,
-			32, ext, bcast.s_addr);
+		n_v4 = parse_address_list(iface, cur, false, ext);
 
 	if ((cur = tb[OPT_IP6ADDR]))
-		n_v6 = parse_address_option(iface, cur, true,
-			128, ext, 0);
+		n_v6 = parse_address_list(iface, cur, true, ext);
 
 	if (!n_v4 && !n_v6) {
 		error = "NO_ADDRESS";
@@ -306,12 +316,6 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex
 			goto out;
 	}
 
-	if ((cur = tb[OPT_DNS]))
-		interface_add_dns_server_list(&iface->proto_ip, cur);
-
-	if ((cur = tb[OPT_DNS_SEARCH]))
-		interface_add_dns_search_list(&iface->proto_ip, cur);
-
 	return 0;
 
 error:
@@ -386,6 +390,19 @@ get_proto_handler(const char *name)
 }
 
 void
+proto_dump_handlers(struct blob_buf *b)
+{
+	struct proto_handler *p;
+	void *c;
+
+	avl_for_each_element(&handlers, p, avl) {
+		c = blobmsg_open_table(b, p->name);
+		blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
+		blobmsg_close_table(b, c);
+	}
+}
+
+void
 proto_init_interface(struct interface *iface, struct blob_attr *attr)
 {
 	const struct proto_handler *proto = iface->proto_handler;