interface-ip: unify host and proto route handling

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index 23304f35676ba68b46a2bbb60e764e80f5d779d6..01473f2494fc0d586011a6a27fdbf58baa20a04f 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -33,9 +33,11 @@ enum {
        OPT_IP6ADDR,
        OPT_NETMASK,
        OPT_BROADCAST,
+       OPT_PTPADDR,
        OPT_GATEWAY,
        OPT_IP6GW,
        OPT_IP6PREFIX,
+       OPT_IP6DEPRECATED,
        __OPT_MAX,
 };
 
@@ -44,9 +46,11 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
        [OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
        [OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
        [OPT_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
+       [OPT_PTPADDR] = { .name = "ptpaddr", .type = BLOBMSG_TYPE_STRING },
        [OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
        [OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
        [OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
+       [OPT_IP6DEPRECATED] = { .name = "ip6deprecated", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static const struct uci_blob_param_info proto_ip_attr_info[__OPT_MAX] = {
@@ -60,6 +64,7 @@ static const char * const proto_ip_validate[__OPT_MAX] = {
        [OPT_IP6ADDR] = "ip6addr",
        [OPT_NETMASK] = "netmask",
        [OPT_BROADCAST] = "ipaddr",
+       [OPT_PTPADDR] = "ip4addr",
        [OPT_GATEWAY] = "ip4addr",
        [OPT_IP6GW] = "ip6addr",
        [OPT_IP6PREFIX] = "ip6addr",
@@ -111,46 +116,49 @@ alloc_device_addr(bool v6, bool ext)
        return addr;
 }
 
-static bool
-parse_addr(struct interface *iface, const char *str, bool v6, int mask,
-          bool ext, uint32_t broadcast)
+static struct device_addr *
+parse_addr(const char *str, bool v6, int mask, bool ext, uint32_t broadcast,
+               uint32_t ptp, bool deprecated)
 {
        struct device_addr *addr;
        int af = v6 ? AF_INET6 : AF_INET;
 
        addr = alloc_device_addr(v6, ext);
        if (!addr)
-               return false;
+               return NULL;
 
        addr->mask = mask;
        if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask))
                goto error;
 
-       if (!v6) {
-               if (IN_EXPERIMENTAL(ntohl(addr->addr.in.s_addr)))
-                       goto error;
-
-       } else if (IN6_IS_ADDR_MULTICAST(&addr->addr.in6))
+       if (v6 && IN6_IS_ADDR_MULTICAST(&addr->addr.in6))
                goto error;
 
        if (broadcast)
                addr->broadcast = broadcast;
 
-       vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
-       return true;
+       if (ptp)
+               addr->point_to_point = ptp;
+
+       if (deprecated)
+               addr->preferred_until = system_get_rtime();
+
+       return addr;
 
 error:
-       interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
        free(addr);
 
-       return false;
+       return NULL;
 }
 
 static int
 parse_static_address_option(struct interface *iface, struct blob_attr *attr,
-                           bool v6, int netmask, bool ext, uint32_t broadcast)
+                           bool v6, int netmask, bool ext, uint32_t broadcast,
+                           uint32_t ptp, bool deprecated)
 {
        struct blob_attr *cur;
+       struct device_addr *addr;
+       const char *str;
        int n_addr = 0;
        int rem;
 
@@ -158,10 +166,15 @@ parse_static_address_option(struct interface *iface, struct blob_attr *attr,
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                        return -1;
 
-               n_addr++;
-               if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
-                               broadcast))
+               str = blobmsg_data(cur);
+               addr = parse_addr(str, v6, netmask, ext, broadcast, ptp, deprecated);
+               if (addr == NULL) {
+                       interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
                        return -1;
+               }
+               addr->index = n_addr;
+               n_addr++;
+               vlist_add(&iface->proto_ip.addr, &addr->node, addr);
        }
 
        return n_addr;
@@ -260,8 +273,9 @@ parse_address_list(struct interface *iface, struct blob_attr *attr, bool v6,
                if (!addr)
                        return -1;
 
+               addr->index = n_addr;
                n_addr++;
-               vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
+               vlist_add(&iface->proto_ip.addr, &addr->node, addr);
        }
 
        return n_addr;
@@ -400,8 +414,9 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
        struct blob_attr *cur;
        const char *error;
        unsigned int netmask = 32;
+       bool ip6deprecated;
        int n_v4 = 0, n_v6 = 0;
-       struct in_addr bcast = {};
+       struct in_addr bcast = {}, ptp = {};
 
        blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
 
@@ -420,13 +435,22 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
                }
        }
 
+       if ((cur = tb[OPT_PTPADDR])) {
+               if (!inet_pton(AF_INET, blobmsg_data(cur), &ptp)) {
+                       error = "INVALID_PTPADDR";
+                       goto error;
+               }
+       }
+
+       ip6deprecated = blobmsg_get_bool_default(tb[OPT_IP6DEPRECATED], false);
+
        if ((cur = tb[OPT_IPADDR]))
                n_v4 = parse_static_address_option(iface, cur, false,
-                       netmask, false, bcast.s_addr);
+                       netmask, false, bcast.s_addr, ptp.s_addr, false);
 
        if ((cur = tb[OPT_IP6ADDR]))
                n_v6 = parse_static_address_option(iface, cur, true,
-                       128, false, 0);
+                       128, false, 0, 0, ip6deprecated);
 
        if ((cur = tb[OPT_IP6PREFIX]))
                if (parse_prefix_list(iface, cur) < 0)
@@ -569,7 +593,7 @@ proto_dump_handlers(struct blob_buf *b)
                void *v;
 
                c = blobmsg_open_table(b, p->name);
-               if (p->config_params->validate) {
+               if (p->config_params && p->config_params->validate) {
                        int i;
 
                        v = blobmsg_open_table(b, "validate");