X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=main.c;h=c4b82282b6c416112c51f3fe1f2efb9e37e73dcc;hb=a4d98aea373e04f3fdc3c492c1688ba52ce490a9;hp=241da628274987dadb6d38c85c3ec4845a92d2c2;hpb=6cccf1ba7f0c3eb34ef4a7adc6af501376bfa875;p=project%2Ffirewall3.git

diff --git a/main.c b/main.c
index 241da62..c4b8228 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -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,13 +101,13 @@ 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_includes(state, p);
+	fw3_load_forwards(state, p, b.head);
+	fw3_load_includes(state, p, b.head);
 
 	return true;
 }