applications/siitwizzard: also prepare firewall include

[project/luci.git] / applications / luci-siitwizard / luasrc / model / cbi / siitwizard.lua

diff --git a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
index ec503ae..2d8ad2c 100644 (file)
--- a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -33,10 +33,10 @@ uci:foreach("wireless", "wifi-device",
 lanip = f:field(Value, "ipaddr", "LAN IP Adresse")
 lanip.value = "172.23.1.1"
 
-lanmsk = f:field(Value, "netmask", "Lokale LAN Netzmaske")
+lanmsk = f:field(Value, "lanmask", "Lokale LAN Netzmaske")
 lanmsk.value = "255.255.255.0"
 
-gv4msk = f:field(Value, "netmask", "Globale LAN Netzmaske")
+gv4msk = f:field(Value, "gv4mask", "Globale LAN Netzmaske")
 gv4msk.value = "255.255.0.0"
 
 
@@ -169,7 +169,7 @@ function mode.write(self, section, value)
 
                uci:section("network", "route", nil, {
                        interface = "siit0",
-                       target    = gv4_net:host():string(),
+                       target    = gv4_net:network():string(),
                        netmask   = gv4_net:mask():string()
                })
 
@@ -260,6 +260,15 @@ function mode.write(self, section, value)
                dest = "lan"
        })
 
+       -- firewall include
+       uci:delete_all("firewall", "include",
+               function(s) return s.path == "/etc/firewall.user" end)
+
+       uci:section("firewall", "include", nil, {
+               path = "/etc/firewall.user"
+       })
+
+
        -- siit0 interface
        uci:delete_all("network", "interface",
                function(s) return ( s.ifname == "siit0" ) end)
@@ -314,6 +323,14 @@ function mode.write(self, section, value)
                prefix  = siit_route:prefix()
        })
 
+       -- txtinfo v6
+       uci:foreach("olsrd", "LoadPlugin",
+               function(s)
+                       if s.library == "olsrd_txtinfo.so.0.1" then
+                               uci:set("olsrd", s['.name'], "accept", "::1")
+                       end
+               end)
+
        uci:save("wireless")
        uci:save("firewall")
        uci:save("network")