X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=246d78e3b2d5694cee73c262ee616f85ea58744b;hp=81469f99b6f43db6f356ad91ae6a96ff5ecaf957;hb=257bfc6392bf8a1c215f0bd6889db4694a405c1d;hpb=05c0ded29cf9dd7716528e61029886550ba1f7ab

diff --git a/proto.c b/proto.c
index 81469f9..246d78e 100644
--- a/proto.c
+++ b/proto.c
@@ -16,6 +16,7 @@ enum {
 	OPT_IPADDR,
 	OPT_IP6ADDR,
 	OPT_NETMASK,
+	OPT_BROADCAST,
 	OPT_GATEWAY,
 	OPT_IP6GW,
 	OPT_DNS,
@@ -27,6 +28,7 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
 	[OPT_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
 	[OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
 	[OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
+	[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 },
@@ -123,7 +125,8 @@ proto_parse_ip_addr_string(const char *str, bool v6, int mask)
 }
 
 static bool
-parse_addr(struct interface *iface, const char *str, bool v6, int mask, bool ext)
+parse_addr(struct interface *iface, const char *str, bool v6, int mask,
+	   bool ext, uint32_t broadcast)
 {
 	struct device_addr *addr;
 
@@ -133,15 +136,19 @@ parse_addr(struct interface *iface, const char *str, bool v6, int mask, bool ext
 		return false;
 	}
 
+	if (broadcast)
+		addr->broadcast = broadcast;
+
 	if (ext)
 		addr->flags |= DEVADDR_EXTERNAL;
 
-	vlist_add(&iface->proto_ip.addr, &addr->node);
+	vlist_add(&iface->proto_ip.addr, &addr->node, &addr->mask);
 	return true;
 }
 
 static int
-parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask, bool ext)
+parse_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;
@@ -152,7 +159,8 @@ parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, i
 			return -1;
 
 		n_addr++;
-		if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext))
+		if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
+				broadcast))
 			return -1;
 	}
 
@@ -175,8 +183,8 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
 	}
 
 	route->mask = 0;
-	route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
-	vlist_add(&iface->proto_ip.route, &route->node);
+	route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+	vlist_add(&iface->proto_ip.route, &route->node, &route->mask);
 
 	return true;
 }
@@ -185,25 +193,36 @@ int
 proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
 {
 	struct blob_attr *tb[__OPT_MAX];
+	struct blob_attr *cur;
 	const char *error;
 	unsigned int netmask = 32;
 	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 (tb[OPT_NETMASK]) {
-		netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
+	if ((cur = tb[OPT_NETMASK])) {
+		netmask = parse_netmask_string(blobmsg_data(cur), false);
 		if (netmask > 32) {
 			error = "INVALID_NETMASK";
 			goto error;
 		}
 	}
 
-	if (tb[OPT_IPADDR])
-		n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask, ext);
+	if ((cur = tb[OPT_BROADCAST])) {
+		if (!inet_pton(AF_INET, blobmsg_data(cur), &bcast)) {
+			error = "INVALID_BROADCAST";
+			goto error;
+		}
+	}
+
+	if ((cur = tb[OPT_IPADDR]))
+		n_v4 = parse_address_option(iface, cur, false,
+			netmask, ext, bcast.s_addr);
 
-	if (tb[OPT_IP6ADDR])
-		n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask, ext);
+	if ((cur = tb[OPT_IP6ADDR]))
+		n_v6 = parse_address_option(iface, cur, true,
+			netmask, ext, 0);
 
 	if (!n_v4 && !n_v6) {
 		error = "NO_ADDRESS";
@@ -213,21 +232,21 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex
 	if (n_v4 < 0 || n_v6 < 0)
 		goto out;
 
-	if (n_v4 && tb[OPT_GATEWAY]) {
-		if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
+	if ((cur = tb[OPT_GATEWAY])) {
+		if (n_v4 && !parse_gateway_option(iface, cur, false))
 			goto out;
 	}
 
-	if (n_v6 && tb[OPT_IP6GW]) {
-		if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
+	if ((cur = tb[OPT_IP6GW])) {
+		if (n_v6 && !parse_gateway_option(iface, cur, true))
 			goto out;
 	}
 
-	if (tb[OPT_DNS])
-		interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
+	if ((cur = tb[OPT_DNS]))
+		interface_add_dns_server_list(&iface->proto_ip, cur);
 
-	if (tb[OPT_DNS_SEARCH])
-		interface_add_dns_search_list(&iface->proto_ip, tb[OPT_DNS_SEARCH]);
+	if ((cur = tb[OPT_DNS_SEARCH]))
+		interface_add_dns_search_list(&iface->proto_ip, cur);
 
 	return 0;