get_proto_handlers now also dumps the validation info

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index 1850e54..e4465eb 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -49,13 +49,13 @@ 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 = {
+const struct uci_blob_param_list proto_ip_attr = {
        .n_params = __OPT_MAX,
        .params = proto_ip_attributes,
        .info = proto_ip_attr_info,
@@ -69,6 +69,7 @@ enum {
        ADDR_PREFERRED,
        ADDR_VALID,
        ADDR_OFFLINK,
+       ADDR_CLASS,
        __ADDR_MAX
 };
 
@@ -80,6 +81,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 +210,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;
@@ -530,7 +535,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);
        }