config: restore interface defaults when cleaning interface

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

diff --git a/src/config.c b/src/config.c
index 372ea67..5174f2c 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 <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>
 
 #include <uci.h>
 #include <uci_blob.h>


@@ -92,7 +95,6 @@ const struct uci_blob_param_list interface_attr_list = {
        .info = iface_attr_info,
 };
 
        .info = iface_attr_info,
 };
 

-

 enum {
        LEASE_ATTR_IP,
        LEASE_ATTR_MAC,
 enum {
        LEASE_ATTR_IP,
        LEASE_ATTR_MAC,


@@ -103,7 +105,6 @@ enum {
        LEASE_ATTR_MAX
 };
 
        LEASE_ATTR_MAX
 };
 

-

 static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
        [LEASE_ATTR_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
 static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
        [LEASE_ATTR_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING },
        [LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },


@@ -113,13 +114,11 @@ static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
        [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
 
        [LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
 

-

 const struct uci_blob_param_list lease_attr_list = {
        .n_params = LEASE_ATTR_MAX,
        .params = lease_attrs,
 };
 
 const struct uci_blob_param_list lease_attr_list = {
        .n_params = LEASE_ATTR_MAX,
        .params = lease_attrs,
 };
 

-

 enum {
        ODHCPD_ATTR_MAINDHCP,
        ODHCPD_ATTR_LEASEFILE,
 enum {
        ODHCPD_ATTR_MAINDHCP,
        ODHCPD_ATTR_LEASEFILE,


@@ -127,19 +126,50 @@ enum {
        ODHCPD_ATTR_MAX
 };
 
        ODHCPD_ATTR_MAX
 };
 

-

 static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
        [ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
        [ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
        [ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },
 };
 
 static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
        [ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
        [ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
        [ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },
 };
 

-

 const struct uci_blob_param_list odhcpd_attr_list = {
        .n_params = ODHCPD_ATTR_MAX,
        .params = odhcpd_attrs,
 };
 
 const struct uci_blob_param_list odhcpd_attr_list = {
        .n_params = ODHCPD_ATTR_MAX,
        .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 void free_lease(struct lease *l)
+{
+       if (l->head.next)
+               list_del(&l->head);
+
+       free(l->duid);
+       free(l);
+}

 
 static struct interface* get_interface(const char *name)
 {
 
 static struct interface* get_interface(const char *name)
 {


@@ -150,6 +180,11 @@ static struct interface* get_interface(const char *name)
        return NULL;
 }
 
        return NULL;
 }
 

+static void set_interface_defaults(struct interface *iface)
+{
+       iface->managed = 1;
+       iface->learn_routes = 1;
+}

 
 static void clean_interface(struct interface *iface)
 {
 
 static void clean_interface(struct interface *iface)
 {


@@ -161,9 +196,9 @@ static void clean_interface(struct interface *iface)
        free(iface->dhcpv6_raw);
        free(iface->filter_class);
        memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
        free(iface->dhcpv6_raw);
        free(iface->filter_class);
        memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));

+       set_interface_defaults(iface);

 }
 
 }
 

-

 static void close_interface(struct interface *iface)
 {
        if (iface->head.next)
 static void close_interface(struct interface *iface)
 {
        if (iface->head.next)


@@ -178,23 +213,20 @@ static void close_interface(struct interface *iface)
        free(iface);
 }
 
        free(iface);
 }
 

-

 static int parse_mode(const char *mode)
 {
 static int parse_mode(const char *mode)
 {

-       if (!strcmp(mode, "disabled")) {
+       if (!strcmp(mode, "disabled"))

                return RELAYD_DISABLED;
                return RELAYD_DISABLED;

-       } else if (!strcmp(mode, "server")) {
+       else if (!strcmp(mode, "server"))

                return RELAYD_SERVER;
                return RELAYD_SERVER;

-       } else if (!strcmp(mode, "relay")) {
+       else if (!strcmp(mode, "relay"))

                return RELAYD_RELAY;
                return RELAYD_RELAY;

-       } else if (!strcmp(mode, "hybrid")) {
+       else if (!strcmp(mode, "hybrid"))

                return RELAYD_HYBRID;
                return RELAYD_HYBRID;

-       } else {
+       else

                return -1;
                return -1;

-       }

 }
 
 }
 

-

 static void set_config(struct uci_section *s)
 {
        struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;
 static void set_config(struct uci_section *s)
 {
        struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;


@@ -307,14 +339,12 @@ static int set_lease(struct uci_section *s)
        return 0;
 
 err:
        return 0;
 
 err:

-       if (lease) {
-               free(lease->duid);
-               free(lease);
-       }
+       if (lease)
+               free_lease(lease);
+

        return -1;
 }
 
        return -1;
 }
 

-

 int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX], *c;
 int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX], *c;


@@ -334,9 +364,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
                strncpy(iface->name, name, sizeof(iface->name) - 1);
 
 
                strncpy(iface->name, name, sizeof(iface->name) - 1);
 

-               /* Default settings */
-               iface->managed = 1;
-               iface->learn_routes = true;
+               set_interface_defaults(iface);

 
                list_add(&iface->head, &interfaces);
                overwrite = true;
 
                list_add(&iface->head, &interfaces);
                overwrite = true;


@@ -458,9 +486,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                        goto err;
 
                                iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
                                        goto err;
 
                                iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;

-                       } else {
+                       } else

                                goto err;
                                goto err;

-                       }

                }
        }
 
                }
        }
 


@@ -489,9 +516,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
                                        goto err;
 
                                iface->dns[iface->dns_cnt - 1] = addr6;
                                        goto err;
 
                                iface->dns[iface->dns_cnt - 1] = addr6;

-                       } else {
+                       } else

                                goto err;
                                goto err;

-                       }

                }
        }
 
                }
        }
 


@@ -586,19 +612,16 @@ static int set_interface(struct uci_section *s)
 {
        blob_buf_init(&b, 0);
        uci_to_blob(&b, s, &interface_attr_list);
 {
        blob_buf_init(&b, 0);
        uci_to_blob(&b, s, &interface_attr_list);

+

        return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
 }
 
        return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
 }
 

-

 void odhcpd_reload(void)
 {
        struct uci_context *uci = uci_alloc_context();
 void odhcpd_reload(void)
 {
        struct uci_context *uci = uci_alloc_context();

-       while (!list_empty(&leases)) {
-               struct lease *l = list_first_entry(&leases, struct lease, head);
-               list_del(&l->head);
-               free(l->duid);
-               free(l);
-       }
+
+       while (!list_empty(&leases))
+               free_lease(list_first_entry(&leases, struct lease, head));

 
        struct interface *master = NULL, *i, *n;
 
 
        struct interface *master = NULL, *i, *n;
 


@@ -626,6 +649,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();
 
 #ifdef WITH_UBUS
        ubus_apply_network();


@@ -633,7 +662,7 @@ void odhcpd_reload(void)
 
        bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
 
 
        bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
 

-       // Test for
+       /* Test for */

        list_for_each_entry(i, &interfaces, head) {
                if (i->master)
                        continue;
        list_for_each_entry(i, &interfaces, head) {
                if (i->master)
                        continue;


@@ -648,7 +677,7 @@ void odhcpd_reload(void)
                        any_ndp_slave = true;
        }
 
                        any_ndp_slave = true;
        }
 

-       // Evaluate hybrid mode for master
+       /* Evaluate hybrid mode for master */

        list_for_each_entry(i, &interfaces, head) {
                if (!i->master)
                        continue;
        list_for_each_entry(i, &interfaces, head) {
                if (!i->master)
                        continue;


@@ -684,7 +713,7 @@ void odhcpd_reload(void)
 
        list_for_each_entry_safe(i, n, &interfaces, head) {
                if (i->inuse) {
 
        list_for_each_entry_safe(i, n, &interfaces, head) {
                if (i->inuse) {

-                       // Resolve hybrid mode
+                       /* Resolve hybrid mode */

                        if (i->dhcpv6 == RELAYD_HYBRID)
                                i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_SERVER;
                        if (i->dhcpv6 == RELAYD_HYBRID)
                                i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_SERVER;


@@ -697,10 +726,10 @@ void odhcpd_reload(void)
                                i->ndp = (master && master->ndp == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_DISABLED;
 
                                i->ndp = (master && master->ndp == RELAYD_RELAY) ?
                                                RELAYD_RELAY : RELAYD_DISABLED;
 

-                       setup_router_interface(i, !i->ignore);
-                       setup_dhcpv6_interface(i, !i->ignore);
-                       setup_ndp_interface(i, !i->ignore);
-                       setup_dhcpv4_interface(i, !i->ignore);
+                       setup_router_interface(i, !i->ignore || i->ra != RELAYD_DISABLED);
+                       setup_dhcpv6_interface(i, !i->ignore || i->dhcpv6 != RELAYD_DISABLED);
+                       setup_ndp_interface(i, !i->ignore || i->ndp != RELAYD_DISABLED);
+                       setup_dhcpv4_interface(i, !i->ignore || i->dhcpv4 != RELAYD_DISABLED);

                } else {
                        close_interface(i);
                }
                } else {
                        close_interface(i);
                }


@@ -710,7 +739,6 @@ void odhcpd_reload(void)
        uci_free_context(uci);
 }
 
        uci_free_context(uci);
 }
 

-

 static void handle_signal(int signal)
 {
        char b[1] = {0};
 static void handle_signal(int signal)
 {
        char b[1] = {0};


@@ -721,12 +749,11 @@ static void handle_signal(int signal)
                uloop_end();
 }
 
                uloop_end();
 }
 

-
-

 static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
 {
        char b[512];
        if (read(u->fd, b, sizeof(b)) < 0) {}
 static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
 {
        char b[512];
        if (read(u->fd, b, sizeof(b)) < 0) {}

+

        odhcpd_reload();
 }
 
        odhcpd_reload();
 }
 


@@ -735,6 +762,7 @@ static struct uloop_fd reload_fd = { .cb = reload_cb };
 void odhcpd_run(void)
 {
        if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {}
 void odhcpd_run(void)
 {
        if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {}

+

        reload_fd.fd = reload_pipe[0];
        uloop_fd_add(&reload_fd, ULOOP_READ);
 
        reload_fd.fd = reload_pipe[0];
        uloop_fd_add(&reload_fd, ULOOP_READ);