firewall3: add UBUS support for ipset sections

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index 347902a064864d944751aa243edc2a9a24614f2a..6e275ef50955cdfb470130c465c3621b167471d0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -79,7 +79,7 @@ build_state(bool runtime)
        else
        {
                if (!fw3_ubus_connect())
-                       error("Failed to connect to ubus");
+                       warn("Failed to connect to ubus");
 
                if (uci_load(state->uci, "firewall", &p))
                {
@@ -101,12 +101,12 @@ build_state(bool runtime)
        fw3_ubus_rules(&b);
 
        fw3_load_defaults(state, p);
-       fw3_load_ipsets(state, p);
+       fw3_load_ipsets(state, p, b.head);
        fw3_load_zones(state, p);
        fw3_load_rules(state, p, b.head);
-       fw3_load_redirects(state, p);
+       fw3_load_redirects(state, p, b.head);
        fw3_load_snats(state, p, b.head);
-       fw3_load_forwards(state, p);
+       fw3_load_forwards(state, p, b.head);
        fw3_load_includes(state, p);
 
        return true;