config: Create statefile dir

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

diff --git a/src/config.c b/src/config.c
index 44b049d..c0c1215 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -3,6 +3,9 @@
 #include <signal.h>
 #include <arpa/inet.h>
 #include <unistd.h>
+#include <libgen.h>
+#include <string.h>
+#include <sys/stat.h>
 
 #include <uci.h>
 #include <uci_blob.h>
@@ -140,6 +143,30 @@ const struct uci_blob_param_list odhcpd_attr_list = {
        .params = odhcpd_attrs,
 };
 
+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: %s\n", dir, mask, strerror(errno));
+
+       return ret;
+}
 
 static struct interface* get_interface(const char *name)
 {
@@ -333,6 +360,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                        return -1;
 
                strncpy(iface->name, name, sizeof(iface->name) - 1);
+
+               /* Default settings */
+               iface->managed = 1;
+               iface->learn_routes = true;
+
                list_add(&iface->head, &interfaces);
                overwrite = true;
        }
@@ -533,8 +565,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
                iface->managed = blobmsg_get_u32(c);
-       else if (overwrite)
-               iface->managed = 1;
 
        if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
                iface->ra_not_onlink = blobmsg_get_bool(c);
@@ -568,8 +598,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
        if ((c = tb[IFACE_ATTR_NDPROXY_ROUTING]))
                iface->learn_routes = blobmsg_get_bool(c);
-       else if (overwrite)
-               iface->learn_routes = true;
 
        if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE]))
                iface->external = blobmsg_get_bool(c);
@@ -625,6 +653,12 @@ void odhcpd_reload(void)
                }
        }
 
+       if (config.dhcp_statefile) {
+               char *path = strdup(config.dhcp_statefile);
+
+               mkdir_p(dirname(path), 0755);
+               free(path);
+       }
 
 #ifdef WITH_UBUS
        ubus_apply_network();