X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=29dd4296dd367d84b1c9e5f6470ee8b311fb59d4;hp=bd3b09ae7d2748f665ea1138d20e29edd0aab4ae;hb=f5ca090c260a74fd3576f79ffb8799e8c20e3878;hpb=c000b546d97aa97144ee2cdf396d46a039bb7f98

diff --git a/proto.c b/proto.c
index bd3b09a..29dd429 100644
--- a/proto.c
+++ b/proto.c
@@ -12,6 +12,40 @@
 
 static struct avl_tree handlers;
 
+enum {
+	OPT_IPADDR,
+	OPT_IP6ADDR,
+	OPT_NETMASK,
+	OPT_GATEWAY,
+	OPT_IP6GW,
+	OPT_DNS,
+	OPT_DNS_SEARCH,
+	__OPT_MAX,
+};
+
+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_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 = {
+	.n_params = __OPT_MAX,
+	.params = proto_ip_attributes,
+	.info = proto_ip_attr_info,
+};
+
+
 unsigned int
 parse_netmask_string(const char *str, bool v6)
 {
@@ -88,6 +122,120 @@ proto_parse_ip_addr_string(const char *str, bool v6, int mask)
 	return addr;
 }
 
+static bool
+parse_addr(struct interface *iface, const char *str, bool v6, int mask, bool ext)
+{
+	struct device_addr *addr;
+
+	addr = proto_parse_ip_addr_string(str, v6, mask);
+	if (!addr) {
+		interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
+		return false;
+	}
+
+	if (ext)
+		addr->flags |= DEVADDR_EXTERNAL;
+
+	vlist_add(&iface->proto_ip.addr, &addr->node);
+	return true;
+}
+
+static int
+parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask, bool ext)
+{
+	struct blob_attr *cur;
+	int n_addr = 0;
+	int rem;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+			return -1;
+
+		n_addr++;
+		if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext))
+			return -1;
+	}
+
+	return n_addr;
+}
+
+
+static bool
+parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
+{
+	struct device_route *route;
+	const char *str = blobmsg_data(attr);
+	int af = v6 ? AF_INET6 : AF_INET;
+
+	route = calloc(1, sizeof(*route));
+	if (!inet_pton(af, str, &route->nexthop)) {
+		interface_add_error(iface, "proto", "INVALID_GATEWAY", &str, 1);
+		free(route);
+		return false;
+	}
+
+	route->mask = 0;
+	route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+	vlist_add(&iface->proto_ip.route, &route->node);
+
+	return true;
+}
+
+int
+proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
+{
+	struct blob_attr *tb[__OPT_MAX];
+	const char *error;
+	unsigned int netmask = 32;
+	int n_v4 = 0, n_v6 = 0;
+
+	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 (netmask > 32) {
+			error = "INVALID_NETMASK";
+			goto error;
+		}
+	}
+
+	if (tb[OPT_IPADDR])
+		n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask, ext);
+
+	if (tb[OPT_IP6ADDR])
+		n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask, ext);
+
+	if (!n_v4 && !n_v6) {
+		error = "NO_ADDRESS";
+		goto error;
+	}
+
+	if (n_v4 < 0 || n_v6 < 0)
+		goto out;
+
+	if (n_v4 && tb[OPT_GATEWAY]) {
+		if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
+			goto out;
+	}
+
+	if (n_v6 && tb[OPT_IP6GW]) {
+		if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
+			goto out;
+	}
+
+	if (tb[OPT_DNS])
+		interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
+
+	if (tb[OPT_DNS_SEARCH])
+		interface_add_dns_search_list(&iface->proto_ip, tb[OPT_DNS_SEARCH]);
+
+	return 0;
+
+error:
+	interface_add_error(iface, "proto", error, NULL, 0);
+out:
+	return -1;
+}
 
 void add_proto_handler(struct proto_handler *p)
 {
@@ -160,9 +308,10 @@ proto_init_interface(struct interface *iface, struct blob_attr *attr)
 	const struct proto_handler *proto = iface->proto_handler;
 	struct interface_proto_state *state = NULL;
 
-	if (proto)
-		state = proto->attach(proto, iface, attr);
+	if (!proto)
+		proto = &no_proto;
 
+	state = proto->attach(proto, iface, attr);
 	if (!state) {
 		state = no_proto.attach(&no_proto, iface, attr);
 		state->cb = invalid_proto_handler;
@@ -175,17 +324,16 @@ proto_init_interface(struct interface *iface, struct blob_attr *attr)
 void
 proto_attach_interface(struct interface *iface, const char *proto_name)
 {
-	const struct proto_handler *proto = NULL;
-
-	if (!proto_name) {
-		interface_add_error(iface, "proto", "NO_PROTO", NULL, 0);
-		return;
+	const struct proto_handler *proto = &no_proto;
+
+	if (proto_name) {
+		proto = get_proto_handler(proto_name);
+		if (!proto) {
+			interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
+			proto = &no_proto;
+		}
 	}
 
-	proto = get_proto_handler(proto_name);
-	if (!proto)
-		interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
-
 	iface->proto_handler = proto;
 }