proto-shell: refactor code to allow specifying per-address broadcast option for ipv4

2 files changed, 134 insertions, 27 deletions

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 7426581..99ad11e 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -104,8 +104,9 @@ proto_add_dns_search() {
 proto_add_ipv4_address() {
 	local address="$1"
 	local mask="$2"
+	local broadcast="$3"
 
-	jshn_append PROTO_IPADDR "$address/$mask"
+	jshn_append PROTO_IPADDR "$address/$mask/$broadcast"
 }
 
 proto_add_ipv6_address() {
@@ -131,7 +132,38 @@ proto_add_ipv6_route() {
 	jshn_append PROTO_ROUTE6 "$target/$mask/$gw"
 }
 
-_proto_push_ip() {
+_proto_push_ipv4_addr() {
+	local str="$1"
+	local address mask broadcast
+
+	address="${str%%/*}"
+	str="${str#*/}"
+	mask="${str%%/*}"
+	str="${str#*/}"
+	broadcast="$str"
+
+	json_add_object ""
+	json_add_string ipaddr "$address"
+	[ -n "$mask" ] && json_add_string mask "$mask"
+	[ -n "$broadcast" ] && json_add_string broadcast "$broadcast"
+	json_close_object
+}
+
+_proto_push_ipv6_addr() {
+	local str="$1"
+	local address mask
+
+	address="${str%%/*}"
+	str="${str#*/}"
+	mask="$str"
+
+	json_add_object ""
+	json_add_string ipaddr "$address"
+	[ -n "$mask" ] && json_add_string mask "$mask"
+	json_close_object
+}
+
+_proto_push_string() {
 	json_add_string "" "$1"
 }
 
@@ -173,12 +205,12 @@ proto_send_update() {
 
 	proto_close_nested
 	json_add_boolean keep "$PROTO_KEEP"
-	_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
-	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
+	_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ipv4_addr
+	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ipv6_addr
 	_proto_push_array "routes" "$PROTO_ROUTE" _proto_push_route
 	_proto_push_array "routes6" "$PROTO_ROUTE6" _proto_push_route
-	_proto_push_array "dns" "$PROTO_DNS" _proto_push_ip
-	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_ip
+	_proto_push_array "dns" "$PROTO_DNS" _proto_push_string
+	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_string
 	_proto_notify "$interface"
 }
 
diff --git a/proto.c b/proto.c
index 44bd42d..ed0a008 100644
--- a/proto.c
+++ b/proto.c
@@ -60,6 +60,18 @@ const struct config_param_list proto_ip_attr = {
 	.info = proto_ip_attr_info,
 };
 
+enum {
+	ADDR_IPADDR,
+	ADDR_MASK,
+	ADDR_BROADCAST,
+	__ADDR_MAX
+};
+
+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 },
+};
 
 unsigned int
 parse_netmask_string(const char *str, bool v6)
@@ -122,18 +134,15 @@ parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
 }
 
 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 +151,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 +192,72 @@ 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 && (cur = tb[ADDR_BROADCAST])) {
+		if (!inet_pton(AF_INET, blobmsg_data(cur), &addr->broadcast))
+			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 +308,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) {
@@ -276,17 +354,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";