X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=a4938f41a23e8ffcb6248658f18d7960298ba98d;hp=53e0ec8eeeaa49cb6859acc9e569bf52764c2f16;hb=df13b3ade3f366446033214b3a85228005c014ea;hpb=273550337f70b8b2175875e0c4f0bbd483cfe326

diff --git a/proto-static.c b/proto-static.c
index 53e0ec8..a4938f4 100644
--- a/proto-static.c
+++ b/proto-static.c
@@ -7,13 +7,42 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "system.h"
 
+enum {
+	OPT_IPADDR,
+	OPT_IP6ADDR,
+	OPT_NETMASK,
+	OPT_GATEWAY,
+	OPT_IP6GW,
+	__OPT_MAX,
+};
+
+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 },
+};
+
+static const union config_param_info static_attr_info[__OPT_MAX] = {
+	[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
+	[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
+};
+
+static const struct config_param_list static_attr_list = {
+	.n_params = __OPT_MAX,
+	.params = static_attrs,
+	.info = static_attr_info,
+};
+
 struct static_proto_state {
 	struct interface_proto_state proto;
 
-	struct uci_section *section;
+	struct blob_attr *config;
 	struct interface *iface;
 };
 
@@ -73,56 +102,56 @@ parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask)
 }
 
 static int
-parse_address_option(struct static_proto_state *state, struct uci_option *o, bool v6, int netmask)
+parse_address_option(struct static_proto_state *state, 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(state, 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;
 }
 
-enum {
-	OPT_IPADDR,
-	OPT_IP6ADDR,
-	OPT_NETMASK,
-	OPT_GATEWAY,
-	OPT_IP6GW,
-	__OPT_MAX,
-};
+static bool
+parse_gateway_option(struct static_proto_state *state, struct blob_attr *attr, bool v6)
+{
+	struct device_route *route;
+	const char *str = blobmsg_data(attr);
+	int af = v6 ? AF_INET6 : AF_INET;
 
-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 },
-};
+	route = calloc(1, sizeof(*route));
+	if (!inet_pton(af, str, &route->nexthop)) {
+		interface_add_error(state->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);
+
+	return true;
+}
 
 static bool
 static_proto_setup(struct static_proto_state *state)
 {
-	struct uci_option *tb[__OPT_MAX];
+	struct blob_attr *tb[__OPT_MAX];
 	struct in_addr ina;
 	const char *error;
 	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(state->config),
+		blob_len(state->config));
 
 	if (tb[OPT_NETMASK]) {
-		if (!inet_aton(tb[OPT_NETMASK]->v.string, &ina)) {
+		if (!inet_aton(blobmsg_data(tb[OPT_NETMASK]), &ina)) {
 			error = "INVALID_NETMASK";
 			goto error;
 		}
@@ -144,23 +173,15 @@ static_proto_setup(struct static_proto_state *state)
 	if (n_v4 < 0 || n_v6 < 0)
 		goto out;
 
-#if 0
-	if (ps.n_v4 && tb[OPT_GATEWAY]) {
-		if (!inet_pton(AF_INET, tb[OPT_GATEWAY]->v.string, &ps.ipv4gw)) {
-			error = "INVALID_GATEWAY";
-			goto error;
-		}
-		ps.flags |= STATIC_F_IPV4GW;
+	if (n_v4 && tb[OPT_GATEWAY]) {
+		if (!parse_gateway_option(state, tb[OPT_GATEWAY], false))
+			goto out;
 	}
 
-	if (ps.n_v6 && tb[OPT_IP6GW]) {
-		if (!inet_pton(AF_INET6, tb[OPT_IP6GW]->v.string, &ps.ipv6gw)) {
-			error = "INVALID_GATEWAY";
-			goto error;
-		}
-		ps.flags |= STATIC_F_IPV6GW;
+	if (n_v6 && tb[OPT_IP6GW]) {
+		if (!parse_gateway_option(state, tb[OPT_IP6GW], true))
+			goto out;
 	}
-#endif
 
 	return true;
 
@@ -198,27 +219,40 @@ 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_attach(struct proto_handler *h, struct interface *iface,
-	      struct uci_section *s)
+static_attach(const struct proto_handler *h, struct interface *iface,
+	      struct blob_attr *attr)
 {
 	struct static_proto_state *state;
 
 	state = calloc(1, sizeof(*state));
+	if (!state)
+		return NULL;
+
 	state->iface = iface;
-	state->section = s;
+	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;
 
 	return &state->proto;
+
+error:
+	free(state);
+	return NULL;
 }
 
 static struct proto_handler static_proto = {
 	.name = "static",
+	.config_params = &static_attr_list,
 	.attach = static_attach,
 };