router: advertise removed addresses as invalid in 3 consecutive RAs

[project/odhcpd.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 015a716dd1cf2de877108f1c670927b66045d2aa..31893d1a2b6471490552b9b08548d2bf8e9c27cd 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -35,6 +35,10 @@ struct config config = {.legacy = false, .main_dhcpv4 = false,
 #define START_DEFAULT  100
 #define LIMIT_DEFAULT  150
 
+#define HOSTID_LEN_MIN 12
+#define HOSTID_LEN_MAX 64
+#define HOSTID_LEN_DEFAULT HOSTID_LEN_MIN
+
 #define OAF_DHCPV6     (OAF_DHCPV6_NA | OAF_DHCPV6_PD)
 
 enum {
@@ -61,6 +65,7 @@ enum {
        IFACE_ATTR_DHCPV6_ASSIGNALL,
        IFACE_ATTR_DHCPV6_PD,
        IFACE_ATTR_DHCPV6_NA,
+       IFACE_ATTR_DHCPV6_HOSTID_LEN,
        IFACE_ATTR_RA_DEFAULT,
        IFACE_ATTR_RA_MANAGEMENT,
        IFACE_ATTR_RA_FLAGS,
@@ -82,6 +87,7 @@ enum {
        IFACE_ATTR_NDPROXY_ROUTING,
        IFACE_ATTR_NDPROXY_SLAVE,
        IFACE_ATTR_PREFIX_FILTER,
+       IFACE_ATTR_PREFERRED_LIFETIME,
        IFACE_ATTR_MAX
 };
 
@@ -109,6 +115,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_DHCPV6_ASSIGNALL] = { .name ="dhcpv6_assignall", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_DHCPV6_PD] = { .name = "dhcpv6_pd", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_DHCPV6_NA] = { .name = "dhcpv6_na", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_DHCPV6_HOSTID_LEN] = { .name = "dhcpv6_hostidlength", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_PD_MANAGER] = { .name = "pd_manager", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_PD_CER] = { .name = "pd_cer", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_RA_DEFAULT] = { .name = "ra_default", .type = BLOBMSG_TYPE_INT32 },
@@ -130,6 +137,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_PREFIX_FILTER] = { .name = "prefix_filter", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_PREFERRED_LIFETIME] = { .name = "preferred_lifetime", .type = BLOBMSG_TYPE_STRING },
 };
 
 static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
@@ -197,11 +205,13 @@ static void set_interface_defaults(struct interface *iface)
        iface->ndp = MODE_DISABLED;
        iface->learn_routes = 1;
        iface->dhcp_leasetime = 43200;
+       iface->preferred_lifetime = 43200;
        iface->dhcpv4_start.s_addr = htonl(START_DEFAULT);
        iface->dhcpv4_end.s_addr = htonl(START_DEFAULT + LIMIT_DEFAULT - 1);
        iface->dhcpv6_assignall = true;
        iface->dhcpv6_pd = true;
        iface->dhcpv6_na = true;
+       iface->dhcpv6_hostid_len = HOSTID_LEN_DEFAULT;
        iface->dns_service = true;
        iface->ra_flags = ND_RA_FLAG_OTHER;
        iface->ra_slaac = true;
@@ -238,6 +248,7 @@ static void close_interface(struct interface *iface)
        clean_interface(iface);
        free(iface->addr4);
        free(iface->addr6);
+       free(iface->invalid_addr6);
        free(iface->ifname);
        free(iface);
 }
@@ -397,7 +408,7 @@ int set_lease_from_blobmsg(struct blob_attr *ba)
 
        if ((c = tb[LEASE_ATTR_HOSTID])) {
                errno = 0;
-               l->hostid = strtoul(blobmsg_get_string(c), NULL, 16);
+               l->hostid = strtoull(blobmsg_get_string(c), NULL, 16);
                if (errno)
                        goto err;
        } else {
@@ -437,6 +448,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        struct interface *iface;
        struct blob_attr *tb[IFACE_ATTR_MAX], *c;
        bool get_addrs = false;
+       int mode;
+       const char *ifname = NULL;
 
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len);
 
@@ -471,7 +484,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                get_addrs = overwrite = true;
        }
 
-       const char *ifname = NULL;
        if (overwrite) {
                if ((c = tb[IFACE_ATTR_IFNAME]))
                        ifname = blobmsg_get_string(c);
@@ -519,10 +531,24 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_LEASETIME])) {
                double time = parse_leasetime(c);
-               if (time < 0)
-                       goto err;
 
-               iface->dhcp_leasetime = time;
+               if (time >= 0)
+                       iface->dhcp_leasetime = time;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_LEASETIME].name, iface->name);
+
+       }
+
+       if ((c = tb[IFACE_ATTR_PREFERRED_LIFETIME])) {
+               double time = parse_leasetime(c);
+
+               if (time >= 0)
+                       iface->preferred_lifetime = time;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_PREFERRED_LIFETIME].name, iface->name);
+
        }
 
        if ((c = tb[IFACE_ATTR_START])) {
@@ -559,7 +585,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                }
        }
 
-       int mode;
        if ((c = tb[IFACE_ATTR_RA])) {
                if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) {
                        iface->ra = mode;
@@ -567,7 +592,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        if (iface->ra != MODE_DISABLED)
                                iface->ignore = false;
                } else
-                       goto err;
+                       syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_DHCPV4])) {
@@ -578,9 +604,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                if (iface->dhcpv4 != MODE_DISABLED)
                                        iface->ignore = false;
                        }
-               }
-               else
-                       goto err;
+               } else
+                       syslog(LOG_ERR, "Invalid %s mode configured for interface %s",
+                              iface_attrs[IFACE_ATTR_DHCPV4].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_DHCPV6])) {
@@ -590,7 +616,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        if (iface->dhcpv6 != MODE_DISABLED)
                                iface->ignore = false;
                } else
-                       goto err;
+                       syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_DHCPV6].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_NDP])) {
@@ -600,7 +627,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        if (iface->ndp != MODE_DISABLED)
                                iface->ignore = false;
                } else
-                       goto err;
+                       syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_NDP].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_ROUTER])) {
@@ -608,10 +636,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
+                       struct in_addr addr4;
+
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
                                continue;
 
-                       struct in_addr addr4;
                        if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) {
                                iface->dhcpv4_router = realloc(iface->dhcpv4_router,
                                                (++iface->dhcpv4_router_cnt) * sizeof(*iface->dhcpv4_router));
@@ -620,7 +649,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                                iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
                        } else
-                               goto err;
+                               syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                                      iface_attrs[IFACE_ATTR_ROUTER].name, iface->name);
                }
        }
 
@@ -630,14 +660,19 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                iface->always_rewrite_dns = true;
                blobmsg_for_each_attr(cur, c, rem) {
+                       struct in_addr addr4;
+                       struct in6_addr addr6;
+
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
                                continue;
 
-                       struct in_addr addr4;
-                       struct in6_addr addr6;
                        if (inet_pton(AF_INET, blobmsg_get_string(cur), &addr4) == 1) {
-                               if (addr4.s_addr == INADDR_ANY)
-                                       goto err;
+                               if (addr4.s_addr == INADDR_ANY) {
+                                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                                              iface_attrs[IFACE_ATTR_DNS].name, iface->name);
+
+                                       continue;
+                               }
 
                                iface->dhcpv4_dns = realloc(iface->dhcpv4_dns,
                                                (++iface->dhcpv4_dns_cnt) * sizeof(*iface->dhcpv4_dns));
@@ -646,8 +681,12 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                                iface->dhcpv4_dns[iface->dhcpv4_dns_cnt - 1] = addr4;
                        } else if (inet_pton(AF_INET6, blobmsg_get_string(cur), &addr6) == 1) {
-                               if (IN6_IS_ADDR_UNSPECIFIED(&addr6))
-                                       goto err;
+                               if (IN6_IS_ADDR_UNSPECIFIED(&addr6)) {
+                                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                                              iface_attrs[IFACE_ATTR_DNS].name, iface->name);
+
+                                       continue;
+                               }
 
                                iface->dns = realloc(iface->dns,
                                                (++iface->dns_cnt) * sizeof(*iface->dns));
@@ -656,7 +695,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                                iface->dns[iface->dns_cnt - 1] = addr6;
                        } else
-                               goto err;
+                               syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                                      iface_attrs[IFACE_ATTR_DNS].name, iface->name);
                }
        }
 
@@ -668,18 +708,27 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
-                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
-                               continue;
-
                        uint8_t buf[256];
                        char *domain = blobmsg_get_string(cur);
                        size_t domainlen = strlen(domain);
+                       int len;
+
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, false))
+                               continue;
+
+                       domain = blobmsg_get_string(cur);
+                       domainlen = strlen(domain);
+
                        if (domainlen > 0 && domain[domainlen - 1] == '.')
                                domain[domainlen - 1] = 0;
 
-                       int len = dn_comp(domain, buf, sizeof(buf), NULL, NULL);
-                       if (len <= 0)
-                               goto err;
+                       len = dn_comp(domain, buf, sizeof(buf), NULL, NULL);
+                       if (len <= 0) {
+                               syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                                      iface_attrs[IFACE_ATTR_DOMAIN].name, iface->name);
+
+                               continue;
+                       }
 
                        iface->search = realloc(iface->search, iface->search_len + len);
                        if (!iface->search)
@@ -713,6 +762,17 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        if ((c = tb[IFACE_ATTR_DHCPV6_NA]))
                iface->dhcpv6_na = blobmsg_get_bool(c);
 
+       if ((c = tb[IFACE_ATTR_DHCPV6_HOSTID_LEN])) {
+               uint32_t hostid_len = blobmsg_get_u32(c);
+
+               if (hostid_len >= HOSTID_LEN_MIN && hostid_len <= HOSTID_LEN_MAX)
+                       iface->dhcpv6_hostid_len = hostid_len;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                               iface_attrs[IFACE_ATTR_DHCPV6_HOSTID_LEN].name, iface->name);
+
+       }
+
        if ((c = tb[IFACE_ATTR_RA_DEFAULT]))
                iface->default_router = blobmsg_get_u32(c);
 
@@ -738,40 +798,50 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_RA_FLAGS])) {
                iface->ra_flags = 0;
+
                if (parse_ra_flags(&iface->ra_flags, c) < 0)
-                       goto err;
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA_FLAGS].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_RA_REACHABLETIME])) {
                uint32_t ra_reachabletime = blobmsg_get_u32(c);
-               if (ra_reachabletime > 3600000)
-                       goto err;
 
-               iface->ra_reachabletime = ra_reachabletime;
+               if (ra_reachabletime <= 3600000)
+                       iface->ra_reachabletime = ra_reachabletime;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA_REACHABLETIME].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_RA_RETRANSTIME])) {
                uint32_t ra_retranstime = blobmsg_get_u32(c);
-               if (ra_retranstime > 60000)
-                       goto err;
 
-               iface->ra_retranstime = ra_retranstime;
+               if (ra_retranstime <= 60000)
+                       iface->ra_retranstime = ra_retranstime;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA_RETRANSTIME].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {
                uint32_t ra_hoplimit = blobmsg_get_u32(c);
-               if (ra_hoplimit > 255)
-                       goto err;
 
-               iface->ra_hoplimit = ra_hoplimit;
+               if (ra_hoplimit <= 255)
+                       iface->ra_hoplimit = ra_hoplimit;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA_HOPLIMIT].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_RA_MTU])) {
                uint32_t ra_mtu = blobmsg_get_u32(c);
-               if (ra_mtu < 1280 || ra_mtu > 65535)
-                       goto err;
 
-               iface->ra_mtu = ra_mtu;
+               if (ra_mtu >= 1280 || ra_mtu <= 65535)
+                       iface->ra_mtu = ra_mtu;
+               else
+                       syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA_MTU].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_RA_SLAAC]))
@@ -808,7 +878,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                else if (!strcmp(prio, "medium") || !strcmp(prio, "default"))
                        iface->route_preference = 0;
                else
-                       goto err;
+                       syslog(LOG_ERR, "Invalid %s mode configured for interface '%s'",
+                              iface_attrs[IFACE_ATTR_RA_PREFERENCE].name, iface->name);
        }
 
        if ((c = tb[IFACE_ATTR_PD_MANAGER]))
@@ -817,7 +888,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_PD_CER]) &&
                        inet_pton(AF_INET6, blobmsg_get_string(c), &iface->dhcpv6_pd_cer) < 1)
-               goto err;
+               syslog(LOG_ERR, "Invalid %s value configured for interface '%s'",
+                      iface_attrs[IFACE_ATTR_PD_CER].name, iface->name);
 
        if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING]))
                iface->learn_routes = blobmsg_get_bool(c);
@@ -986,7 +1058,7 @@ struct lease *config_find_lease_by_mac(const uint8_t *mac)
        return NULL;
 }
 
-struct lease *config_find_lease_by_hostid(const uint32_t hostid)
+struct lease *config_find_lease_by_hostid(const uint64_t hostid)
 {
        struct lease *l;