netifd: Fix restore of original device settings

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index d5e99bf..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 },
 };
 
        [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,
 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,
 };
 
        .info = proto_ip_attr_info,
 };
 


@@ -69,6 +80,7 @@ enum {
        ADDR_PREFERRED,
        ADDR_VALID,
        ADDR_OFFLINK,
        ADDR_PREFERRED,
        ADDR_VALID,
        ADDR_OFFLINK,

+       ADDR_CLASS,

        __ADDR_MAX
 };
 
        __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_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 *
 };
 
 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;
                }
                        else if (addr->preferred_until > addr->valid_until)
                                goto error;
                }

+
+               if ((cur = tb[ADDR_CLASS]))
+                       addr->pclass = strdup(blobmsg_get_string(cur));

        }
 
        return addr;
        }
 
        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->mask = 0;
        route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);

+       route->metric = iface->metric;

 
        unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
        if (table) {
 
        unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
        if (table) {


@@ -530,7 +547,17 @@ proto_dump_handlers(struct blob_buf *b)
        void *c;
 
        avl_for_each_element(&handlers, p, avl) {
        void *c;
 
        avl_for_each_element(&handlers, p, avl) {

+               void *v;
+

                c = blobmsg_open_table(b, p->name);
                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);
        }
                blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
                blobmsg_close_table(b, c);
        }


@@ -589,6 +616,9 @@ interface_proto_event(struct interface_proto_state *proto,
        case PROTO_CMD_TEARDOWN:
                ev = IFPEV_DOWN;
                break;
        case PROTO_CMD_TEARDOWN:
                ev = IFPEV_DOWN;
                break;

+       case PROTO_CMD_RENEW:
+               ev = IFPEV_RENEW;
+               break;

        default:
                return -EINVAL;
        }
        default:
                return -EINVAL;
        }