X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=ca39b7c8edf86271c8c72226c88cebacad59cf6c;hp=6b4cc237f406634c7c5974a65841e69a2b3be2af;hb=6803aef644a5112f331e6de4d37d78718b76a9bf;hpb=dca8c7133b1db463f6ae71ccc6d34cd12735daef

diff --git a/proto-static.c b/proto-static.c
index 6b4cc23..ca39b7c 100644
--- a/proto-static.c
+++ b/proto-static.c
@@ -7,155 +7,121 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "system.h"
 
-struct static_proto_state {
-	struct interface_proto_state proto;
-
-	struct uci_section *section;
-	struct interface *iface;
+enum {
+	OPT_IPADDR,
+	OPT_IP6ADDR,
+	OPT_NETMASK,
+	OPT_GATEWAY,
+	OPT_IP6GW,
+	OPT_DNS,
+	__OPT_MAX,
 };
 
-static bool
-split_netmask(char *str, unsigned int *netmask)
-{
-	char *delim, *err = NULL;
+static const struct blobmsg_policy static_attrs[__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 },
+};
 
-	delim = strchr(str, '/');
-	if (delim) {
-		*(delim++) = 0;
+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 },
+};
 
-		*netmask = strtoul(delim, &err, 10);
-		if (err && *err)
-			return false;
-	}
-	return true;
-}
+static const struct config_param_list static_attr_list = {
+	.n_params = __OPT_MAX,
+	.params = static_attrs,
+	.info = static_attr_info,
+};
 
-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;
-	}
+struct static_proto_state {
+	struct interface_proto_state proto;
 
-	return inet_pton(af, str, addr);
-}
+	struct blob_attr *config;
+};
 
 static bool
-parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask)
+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->ctx = state;
-	addr->mask = mask;
-	if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
-		interface_add_error(state->iface, "proto-static", "INVALID_ADDRESS", &str, 1);
-		free(addr);
+	addr = proto_parse_ip_addr_string(str, v6, mask);
+	if (!addr) {
+		interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
 		return false;
 	}
-	interface_add_address(state->iface, addr);
+	vlist_add(&iface->proto_ip.addr, &addr->node);
 	return true;
 }
 
 static int
-parse_address_option(struct static_proto_state *state, struct uci_option *o, bool v6, int netmask)
+parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask)
 {
-	struct uci_element *e;
+	struct blob_attr *cur;
 	int n_addr = 0;
+	int rem;
 
-	if (o->type == UCI_TYPE_STRING) {
+	blobmsg_for_each_attr(cur, attr, rem) {
 		n_addr++;
-		if (!parse_addr(state, o->v.string, v6, netmask))
+		if (!parse_addr(iface, blobmsg_data(cur), v6, netmask))
 			return -1;
-	} else {
-		uci_foreach_element(&o->v.list, e) {
-			n_addr++;
-			if (!parse_addr(state, e->name, v6, netmask))
-				return -1;
-		}
 	}
 
 	return n_addr;
 }
 
 static bool
-parse_gateway_option(struct static_proto_state *state, struct uci_option *o, bool v6)
+parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
 {
 	struct device_route *route;
-	const char *str = o->v.string;
+	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(state->iface, "proto-static",
+		interface_add_error(iface, "proto-static",
 				"INVALID_GATEWAY", &str, 1);
 		free(route);
 		return false;
 	}
 	route->mask = 0;
 	route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
-	interface_add_route(state->iface, route);
+	vlist_add(&iface->proto_ip.route, &route->node);
 
 	return true;
 }
 
-enum {
-	OPT_IPADDR,
-	OPT_IP6ADDR,
-	OPT_NETMASK,
-	OPT_GATEWAY,
-	OPT_IP6GW,
-	__OPT_MAX,
-};
-
-static const struct uci_parse_option opts[__OPT_MAX] = {
-	[OPT_IPADDR] = { .name = "ipaddr" },
-	[OPT_IP6ADDR] = { .name = "ip6addr" },
-	[OPT_NETMASK] = { .name = "netmask", .type = UCI_TYPE_STRING },
-	[OPT_GATEWAY] = { .name = "gateway", .type = UCI_TYPE_STRING },
-	[OPT_IP6GW] = { .name = "ip6gw", .type = UCI_TYPE_STRING },
-};
-
-static bool
-static_proto_setup(struct static_proto_state *state)
+static int
+proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
 {
-	struct uci_option *tb[__OPT_MAX];
-	struct in_addr ina;
+	struct blob_attr *tb[__OPT_MAX];
 	const char *error;
-	int netmask = 32;
+	unsigned int netmask = 32;
 	int n_v4 = 0, n_v6 = 0;
 
-	uci_parse_section(state->section, opts, __OPT_MAX, tb);
+	blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
 
 	if (tb[OPT_NETMASK]) {
-		if (!inet_aton(tb[OPT_NETMASK]->v.string, &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])
-		n_v4 = parse_address_option(state, tb[OPT_IPADDR], false, netmask);
+		n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask);
 
 	if (tb[OPT_IP6ADDR])
-		n_v6 = parse_address_option(state, tb[OPT_IP6ADDR], true, netmask);
+		n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask);
 
 	if (!n_v4 && !n_v6) {
 		error = "NO_ADDRESS";
@@ -166,21 +132,30 @@ static_proto_setup(struct static_proto_state *state)
 		goto out;
 
 	if (n_v4 && tb[OPT_GATEWAY]) {
-		if (!parse_gateway_option(state, tb[OPT_GATEWAY], false))
+		if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
 			goto out;
 	}
 
 	if (n_v6 && tb[OPT_IP6GW]) {
-		if (!parse_gateway_option(state, tb[OPT_IP6GW], true))
+		if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
 			goto out;
 	}
 
-	return true;
+	if (tb[OPT_DNS])
+		interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
+
+	return 0;
 
 error:
-	interface_add_error(state->iface, "proto-static", error, NULL, 0);
+	interface_add_error(iface, "proto-static", error, NULL, 0);
 out:
-	return false;
+	return -1;
+}
+
+static bool
+static_proto_setup(struct static_proto_state *state)
+{
+	return proto_apply_static_settings(state->proto.iface, state->config) == 0;
 }
 
 static int
@@ -194,12 +169,11 @@ static_handler(struct interface_proto_state *proto,
 
 	switch (cmd) {
 	case PROTO_CMD_SETUP:
-		if (static_proto_setup(state))
-			break;
+		if (!static_proto_setup(state))
+			return -1;
 
-		/* fall through */
+		break;
 	case PROTO_CMD_TEARDOWN:
-		interface_del_ctx_addr(state->iface, state);
 		break;
 	}
 	return ret;
@@ -211,27 +185,39 @@ static_free(struct interface_proto_state *proto)
 	struct static_proto_state *state;
 
 	state = container_of(proto, struct static_proto_state, proto);
+	free(state->config);
 	free(state);
 }
 
-struct interface_proto_state *
+static struct interface_proto_state *
 static_attach(const struct proto_handler *h, struct interface *iface,
-	      struct uci_section *s)
+	      struct blob_attr *attr)
 {
 	struct static_proto_state *state;
 
 	state = calloc(1, sizeof(*state));
-	state->iface = iface;
-	state->section = s;
+	if (!state)
+		return NULL;
+
+	state->config = malloc(blob_pad_len(attr));
+	if (!state->config)
+		goto error;
+
+	memcpy(state->config, attr, blob_pad_len(attr));
 	state->proto.free = static_free;
-	state->proto.handler = static_handler;
-	state->proto.flags = PROTO_FLAG_IMMEDIATE;
+	state->proto.cb = static_handler;
 
 	return &state->proto;
+
+error:
+	free(state);
+	return NULL;
 }
 
 static struct proto_handler static_proto = {
 	.name = "static",
+	.flags = PROTO_FLAG_IMMEDIATE,
+	.config_params = &static_attr_list,
 	.attach = static_attach,
 };