projects / project / odhcpd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
config: log config parse failures to syslog
[project/odhcpd.git] / src / config.c
diff --git a/src/config.c b/src/config.c
index 95b745c5da392dee53cf26fae324816871abf9fb..e46ecb0d1063962603a1d9f8d1fd1b83e8a63e2e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -82,6 +82,7 @@ enum {
        IFACE_ATTR_NDPROXY_ROUTING,
        IFACE_ATTR_NDPROXY_SLAVE,
        IFACE_ATTR_PREFIX_FILTER,
+       IFACE_ATTR_PREFERRED_LIFETIME,
        IFACE_ATTR_MAX
 };
 
@@ -130,6 +131,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] = {
@@ -188,31 +190,6 @@ static const struct { const char *name; uint8_t flag; } ra_flags[] = {
        { .name = NULL, },
 };
 
-static int mkdir_p(char *dir, mode_t mask)
-{
-       char *l = strrchr(dir, '/');
-       int ret;
-
-       if (!l)
-               return 0;
-
-       *l = '\0';
-
-       if (mkdir_p(dir, mask))
-               return -1;
-
-       *l = '/';
-
-       ret = mkdir(dir, mask);
-       if (ret && errno == EEXIST)
-               return 0;
-
-       if (ret)
-               syslog(LOG_ERR, "mkdir(%s, %d) failed: %m\n", dir, mask);
-
-       return ret;
-}
-
 static void set_interface_defaults(struct interface *iface)
 {
        iface->ignore = true;
@@ -222,6 +199,7 @@ 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;
@@ -462,6 +440,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);
 
@@ -496,7 +476,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);
@@ -544,10 +523,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])) {
@@ -584,7 +577,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;
@@ -592,7 +584,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])) {
@@ -603,9 +596,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])) {
@@ -615,7 +608,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])) {
@@ -625,7 +619,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])) {
@@ -633,10 +628,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));
@@ -645,7 +641,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);
                }
        }
 
@@ -655,14 +652,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));
@@ -671,8 +673,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));
@@ -681,7 +687,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);
                }
        }
 
@@ -693,18 +700,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)
@@ -762,41 +778,49 @@ 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]))
@@ -833,7 +857,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]))
@@ -842,7 +867,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);
OpenWrt DHCP Server