config: use multi-stage parsing of uci sections

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

diff --git a/src/config.c b/src/config.c
index dfeadac63fc18cdfaf61731804a155bd078a3eda..f1fe82b3312ac7cf2adf3747959e4f7788a06447 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -965,19 +965,27 @@ void odhcpd_reload(void)
        struct uci_package *dhcp = NULL;
        if (!uci_load(uci, "dhcp", &dhcp)) {
                struct uci_element *e;
+
+               /* 1. Global settings */
                uci_foreach_element(&dhcp->sections, e) {
                        struct uci_section *s = uci_to_section(e);
-                       if (!strcmp(s->type, "host"))
-                               set_lease(s);
-                       else if (!strcmp(s->type, "odhcpd"))
+                       if (!strcmp(s->type, "odhcpd"))
                                set_config(s);
                }
 
+               /* 2. DHCP pools */
                uci_foreach_element(&dhcp->sections, e) {
                        struct uci_section *s = uci_to_section(e);
                        if (!strcmp(s->type, "dhcp"))
                                set_interface(s);
                }
+
+               /* 3. Static leases */
+               uci_foreach_element(&dhcp->sections, e) {
+                       struct uci_section* s = uci_to_section(e);
+                       if (!strcmp(s->type, "host"))
+                               set_lease(s);
+               }
        }
 
        if (config.dhcp_statefile) {