Add support for netifd-generated rules

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index c0180b2..27d5298 100644 (file)
--- a/main.c
+++ b/main.c
@@ -98,12 +98,16 @@ build_state(bool runtime)
                cfg_state = state;
        }
 
+
+       struct blob_buf b = {NULL, NULL, 0, NULL};
+       fw3_ubus_rules(&b);
+
        fw3_load_defaults(state, p);
        fw3_load_ipsets(state, p);
        fw3_load_zones(state, p);
-       fw3_load_rules(state, p);
+       fw3_load_rules(state, p, b.head);
        fw3_load_redirects(state, p);
-       fw3_load_snats(state, p);
+       fw3_load_snats(state, p, b.head);
        fw3_load_forwards(state, p);
        fw3_load_includes(state, p);
 
@@ -374,6 +378,7 @@ start:
                        fw3_print_default_head_rules(handle, cfg_state, true);
                        fw3_print_rules(handle, cfg_state);
                        fw3_print_redirects(handle, cfg_state);
+                       fw3_print_snats(handle, cfg_state);
                        fw3_print_forwards(handle, cfg_state);
                        fw3_print_zone_rules(handle, cfg_state, true);
                        fw3_print_default_tail_rules(handle, cfg_state, true);
@@ -478,7 +483,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'q':
-                       freopen("/dev/null", "w", stderr);
+                       if (freopen("/dev/null", "w", stderr)) {}
                        break;
 
                case 'h':
@@ -513,7 +518,7 @@ int main(int argc, char **argv)
 #endif
                }
 
-               freopen("/dev/null", "w", stderr);
+               if (freopen("/dev/null", "w", stderr)) {};
 
                cfg_state->disable_ipsets = true;
                print_family = family;