X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=0ba2fbe908486516c237e6999168938c1f1f7141;hp=d060d2ed9f435cbb03fe43d3909d5bda95afaaa0;hb=9d8dd091f8f336b111364ed211165b5ec9842a24;hpb=eec42f59364590f2210849a3a48ceb3ee8cbbb1c

diff --git a/proto.c b/proto.c
index d060d2e..0ba2fbe 100644
--- a/proto.c
+++ b/proto.c
@@ -49,15 +49,26 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
 	[OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
 };
 
-static const union config_param_info proto_ip_attr_info[__OPT_MAX] = {
+static const struct uci_blob_param_info proto_ip_attr_info[__OPT_MAX] = {
 	[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
 	[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
 	[OPT_IP6PREFIX] = { .type = BLOBMSG_TYPE_STRING },
 };
 
-const struct config_param_list proto_ip_attr = {
+static const char * const proto_ip_validate[__OPT_MAX] = {
+	[OPT_IPADDR] = "ip4addr",
+	[OPT_IP6ADDR] = "ip6addr",
+	[OPT_NETMASK] = "netmask",
+	[OPT_BROADCAST] = "ipaddr",
+	[OPT_GATEWAY] = "ip4addr",
+	[OPT_IP6GW] = "ip6addr",
+	[OPT_IP6PREFIX] = "ip6addr",
+};
+
+const struct uci_blob_param_list proto_ip_attr = {
 	.n_params = __OPT_MAX,
 	.params = proto_ip_attributes,
+	.validate = proto_ip_validate,
 	.info = proto_ip_attr_info,
 };
 
@@ -69,6 +80,7 @@ enum {
 	ADDR_PREFERRED,
 	ADDR_VALID,
 	ADDR_OFFLINK,
+	ADDR_CLASS,
 	__ADDR_MAX
 };
 
@@ -80,6 +92,7 @@ static const struct blobmsg_policy proto_ip_addr[__ADDR_MAX] = {
 	[ADDR_PREFERRED] = { .name = "preferred", .type = BLOBMSG_TYPE_INT32 },
 	[ADDR_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
 	[ADDR_OFFLINK] = { .name = "offlink", .type = BLOBMSG_TYPE_BOOL },
+	[ADDR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
 };
 
 static struct device_addr *
@@ -208,6 +221,9 @@ parse_address_item(struct blob_attr *attr, bool v6, bool ext)
 			else if (addr->preferred_until > addr->valid_until)
 				goto error;
 		}
+
+		if ((cur = tb[ADDR_CLASS]))
+			addr->pclass = strdup(blobmsg_get_string(cur));
 	}
 
 	return addr;
@@ -254,6 +270,7 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
 
 	route->mask = 0;
 	route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+	route->metric = iface->metric;
 
 	unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
 	if (table) {
@@ -285,6 +302,7 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len)
 	char *prefstr = strtok_r(NULL, ",", &saveptr);
 	char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr);
 	char *addstr = (!validstr) ? NULL : strtok_r(NULL, ",", &saveptr);
+	const char *pclass = NULL;
 
 	int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
 	int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10);
@@ -315,6 +333,8 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len)
 				return false;
 
 			excludedp = &excluded;
+		} else if (!strcmp(key, "class")) {
+			pclass = val;
 		}
 
 	}
@@ -333,7 +353,7 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len)
 
 	interface_ip_add_device_prefix(iface, &addr, length,
 			valid_until, preferred_until,
-			excludedp, excl_length);
+			excludedp, excl_length, pclass);
 	return true;
 }
 
@@ -527,7 +547,17 @@ proto_dump_handlers(struct blob_buf *b)
 	void *c;
 
 	avl_for_each_element(&handlers, p, avl) {
+		void *v;
+
 		c = blobmsg_open_table(b, p->name);
+		if (p->config_params->validate) {
+			int i;
+
+			v = blobmsg_open_table(b, "validate");
+			for (i = 0; i < p->config_params->n_params; i++)
+				blobmsg_add_string(b, p->config_params->params[i].name, uci_get_validate_string(p->config_params, i));
+			blobmsg_close_table(b, v);
+		}
 		blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
 		blobmsg_close_table(b, c);
 	}
@@ -586,6 +616,9 @@ interface_proto_event(struct interface_proto_state *proto,
 	case PROTO_CMD_TEARDOWN:
 		ev = IFPEV_DOWN;
 		break;
+	case PROTO_CMD_RENEW:
+		ev = IFPEV_RENEW;
+		break;
 	default:
 		return -EINVAL;
 	}