netifd: Remove unnecessary default_config check in config_parse_interface

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index 9121918..0ba2fbe 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -55,9 +55,20 @@ static const struct uci_blob_param_info proto_ip_attr_info[__OPT_MAX] = {
        [OPT_IP6PREFIX] = { .type = BLOBMSG_TYPE_STRING },
 };
 
+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,
 };
 
@@ -259,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) {
@@ -535,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);
        }
@@ -594,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;
        }