interface: suppress unnecessary device config overrides

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index 676852d..0ba2fbe 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

+#include <limits.h>

 
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>


@@ -48,15 +49,26 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
        [OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
 };
 
        [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 },
 };
 
        [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,
        .n_params = __OPT_MAX,
        .params = proto_ip_attributes,

+       .validate = proto_ip_validate,

        .info = proto_ip_attr_info,
 };
 
        .info = proto_ip_attr_info,
 };
 


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

+       ADDR_CLASS,

        __ADDR_MAX
 };
 
        __ADDR_MAX
 };
 


@@ -79,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 *


@@ -187,15 +201,17 @@ parse_address_item(struct blob_attr *attr, bool v6, bool ext)
        } else {
                time_t now = system_get_rtime();
                if ((cur = tb[ADDR_PREFERRED])) {
        } else {
                time_t now = system_get_rtime();
                if ((cur = tb[ADDR_PREFERRED])) {

-                       uint32_t preferred = blobmsg_get_u32(cur);
-                       if (preferred < UINT32_MAX)
-                               addr->preferred_until = now + preferred;
+                       int64_t preferred = blobmsg_get_u32(cur);
+                       int64_t preferred_until = preferred + (int64_t)now;
+                       if (preferred_until <= LONG_MAX && preferred != 0xffffffffLL)
+                               addr->preferred_until = preferred_until;

                }
 
                if ((cur = tb[ADDR_VALID])) {
                }
 
                if ((cur = tb[ADDR_VALID])) {

-                       uint32_t valid = blobmsg_get_u32(cur);
-                       if (valid < UINT32_MAX)
-                               addr->valid_until = now + valid;
+                       int64_t valid = blobmsg_get_u32(cur);
+                       int64_t valid_until = valid + (int64_t)now;
+                       if (valid_until <= LONG_MAX && valid != 0xffffffffLL)
+                               addr->valid_until = valid_until;

 
                }
 
 
                }
 


@@ -205,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;


@@ -251,9 +270,11 @@ 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;

 
 

-       if (v6) {
-               route->table = interface_ip_resolve_v6_rtable(iface->l3_dev.dev->ifindex);
+       unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
+       if (table) {
+               route->table = table;

                route->flags |= DEVROUTE_SRCTABLE;
        }
 
                route->flags |= DEVROUTE_SRCTABLE;
        }
 


@@ -281,9 +302,10 @@ 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);
        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;

 
 

-       uint32_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
-       uint32_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10);
+       int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
+       int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10);

 
        uint8_t length = strtoul(lengthstr, NULL, 10), excl_length = 0;
        if (length < 1 || length > 64)
 
        uint8_t length = strtoul(lengthstr, NULL, 10), excl_length = 0;
        if (length < 1 || length > 64)


@@ -311,6 +333,8 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len)
                                return false;
 
                        excludedp = &excluded;
                                return false;
 
                        excludedp = &excluded;

+               } else if (!strcmp(key, "class")) {
+                       pclass = val;

                }
 
        }
                }
 
        }


@@ -318,18 +342,18 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len)
 
 
 
 
 
 

-       time_t now = system_get_rtime();
+       int64_t now = system_get_rtime();

        time_t preferred_until = 0;
        time_t preferred_until = 0;

-       if (prefstr && pref != 0xffffffffU)
+       if (prefstr && pref != 0xffffffffLL && pref + now <= LONG_MAX)

                preferred_until = pref + now;
 
        time_t valid_until = 0;
                preferred_until = pref + now;
 
        time_t valid_until = 0;

-       if (validstr && valid != 0xffffffffU)
+       if (validstr && valid != 0xffffffffLL && valid + now <= LONG_MAX)

                valid_until = valid + now;
 
        interface_ip_add_device_prefix(iface, &addr, length,
                        valid_until, preferred_until,
                valid_until = valid + now;
 
        interface_ip_add_device_prefix(iface, &addr, length,
                        valid_until, preferred_until,

-                       excludedp, excl_length);
+                       excludedp, excl_length, pclass);

        return true;
 }
 
        return true;
 }
 


@@ -523,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);
        }


@@ -582,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;
        }