application/luci-ffwizard-leipzig: don't write system hostname to olsrd config, will...
[project/luci.git] / applications / luci-ffwizard-leipzig / luasrc / model / cbi / ffwizard.lua
index 0e1ef28..b30b596 100644 (file)
@@ -18,6 +18,7 @@ $Id$
 local uci = require "luci.model.uci".cursor()
 local tools = require "luci.tools.ffwizard"
 local util = require "luci.util"
+local sys = require "luci.sys"
 
 
 -------------------- View --------------------
@@ -78,26 +79,13 @@ end
 client = f:field(Flag, "client", "WLAN-DHCP anbieten")
 client:depends("wifi", "1")
 client.rmempty = true
-function client.cfgvalue(self, section)
-       return uci:get("freifunk", "wizard", "client")
-end
-function client.write(self, section, value)
-       uci:set("freifunk", "wizard", "client", value)
-       uci:save("freifunk")
-end
 
 
 olsr = f:field(Flag, "olsr", "OLSR einrichten")
+olsr.rmempty = true
 
 share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben")
 share.rmempty = true
-function share.cfgvalue(self, section)
-       return uci:get("freifunk", "wizard", "sharenet")
-end
-function share.write(self, section, value)
-       uci:set("freifunk", "wizard", "sharenet", value)
-       uci:save("freifunk")
-end
 
 
 
@@ -162,9 +150,9 @@ function main.write(self, section, value)
        tools.wifi_delete_ifaces(device)
        tools.network_remove_interface(device)
        tools.firewall_zone_remove_interface("freifunk", device)
-       
+
        -- Tune community settings
-       if community then
+       if community and uci:get("freifunk", community) then
                uci:tset("freifunk", "community", uci:get_all("freifunk", community))
        end
 
@@ -185,7 +173,7 @@ function main.write(self, section, value)
        uci:save("wireless")
 
        -- Create firewall zone and add default rules (first time)
-       local newzone = tools.firewall_create_zone("freifunk", "DROP", "ACCEPT", "DROP", true)
+       local newzone = tools.firewall_create_zone("freifunk", "REJECT", "ACCEPT", "REJECT", true)
        if newzone then
                uci:foreach("freifunk", "fw_forwarding", function(section)
                        uci:section("firewall", "forwarding", nil, section)
@@ -200,12 +188,42 @@ function main.write(self, section, value)
                uci:foreach(external, "fw_rule", function(section)
                        uci:section("firewall", "rule", nil, section)
                end)
+       end
+
+       -- Enforce firewall include
+       local has_include = false
+       uci:foreach("firewall", "include",
+               function(section)
+                       if section.path == "/etc/firewall.freifunk" then
+                               has_include = true
+                       end
+               end)
+
+       if not has_include then
+               uci:section("firewall", "include", nil,
+                       { path = "/etc/firewall.freifunk" })
+       end
+
+       -- Allow state: invalid packets
+       uci:foreach("firewall", "defaults",
+               function(section)
+                       uci:set("firewall", section[".name"], "drop_invalid", "0")
+               end)
+
+       -- Prepare advanced config
+       local has_advanced = false
+       uci:foreach("firewall", "advanced",
+               function(section) has_advanced = true end)
 
-               uci:save("firewall")
+       if not has_advanced then
+               uci:section("firewall", "advanced", nil,
+                       { tcp_ecn = "0", ip_conntrack_max = "8192", tcp_westwood = "1" })
        end
 
+       uci:save("firewall")
+
 
-       -- Crate network interface
+       -- Create network interface
        local netconfig = uci:get_all("freifunk", "interface")
        util.update(netconfig, uci:get_all(external, "interface") or {})
        netconfig.proto = "static"
@@ -215,6 +233,21 @@ function main.write(self, section, value)
        uci:save("network")
 
        tools.firewall_zone_add_interface("freifunk", device)
+
+
+       -- Set hostname
+       local new_hostname = ip:gsub("%.", "-")
+       local old_hostname = sys.hostname()
+
+       if old_hostname == "OpenWrt" or old_hostname:match("^%d+-%d+-%d+-%d+$") then
+               uci:foreach("system", "system",
+                       function(s)
+                               uci:set("system", s['.name'], "hostname", new_hostname)
+                       end)
+
+               sys.hostname(new_hostname)
+               uci:save("system")
+       end
 end
 
 
@@ -225,12 +258,12 @@ function olsr.write(self, section, value)
 
 
        local device = dev:formvalue(section)
-       
+
        local community = net:formvalue(section)
        local external  = community and uci:get("freifunk", community, "external") or ""
 
        -- Delete old interface
-       uci:delete_all("freifunk", "Interface", {interface=device})
+       uci:delete_all("olsrd", "Interface", {interface=device})
 
        -- Write new interface
        local olsrbase = uci:get_all("freifunk", "olsr_interface")
@@ -238,17 +271,37 @@ function olsr.write(self, section, value)
        olsrbase.interface = device
        olsrbase.ignore    = "0"
        uci:section("olsrd", "Interface", nil, olsrbase)
+
+       -- Delete old watchdog settings
+       uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_watchdog.so.0.1"})
+
+       -- Write new watchdog settings
+       uci:section("olsrd", "LoadPlugin", nil, {
+               library  = "olsrd_watchdog.so.0.1",
+               file     = "/var/run/olsrd.watchdog",
+               interval = "30"
+       })
+
+       -- Import hosts
+       uci:foreach("dhcp", "dnsmasq", function(s)
+               uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
+       end)
+
        uci:save("olsrd")
+       uci:save("dhcp")
 end
 
 
 function share.write(self, section, value)
        uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"})
+       uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw_plain.so.0.4"})
 
        if value == "1" then
                uci:section("firewall", "forwarding", nil, {src="freifunk", dest="wan"})
+               uci:section("olsrd", "LoadPlugin", nil, {library="olsrd_dyn_gw_plain.so.0.4"})
        end
        uci:save("firewall")
+       uci:save("olsrd")
 end
 
 
@@ -294,10 +347,22 @@ function client.write(self, section, value)
        dhcpbase.interface = device .. "dhcp"
        dhcpbase.start = dhcpbeg
        dhcpbase.limit = limit
+       dhcpbase.force = 1
 
        uci:section("dhcp", "dhcp", device .. "dhcp", dhcpbase)
        uci:save("dhcp")
-       
+
+       uci:delete_all("firewall", "rule", {
+               src="freifunk",
+               proto="udp",
+               dest_port="53"
+       })
+       uci:section("firewall", "rule", nil, {
+               src="freifunk",
+               proto="udp",
+               dest_port="53",
+               target="ACCEPT"
+       })
        uci:delete_all("firewall", "rule", {
                src="freifunk",
                proto="udp",
@@ -311,14 +376,25 @@ function client.write(self, section, value)
                dest_port="67",
                target="ACCEPT"
        })
-       
+       uci:delete_all("firewall", "rule", {
+               src="freifunk",
+               proto="tcp",
+               dest_port="8082",
+       })
+       uci:section("firewall", "rule", nil, {
+               src="freifunk",
+               proto="tcp",
+               dest_port="8082",
+               target="ACCEPT"
+       })
+
 
 
        -- Delete old splash
-       uci:delete_all("luci_splash", "iface", {net=device, zone="freifunk"})
+       uci:delete_all("luci_splash", "iface", {network=device.."dhcp", zone="freifunk"})
 
        -- Register splash
-       uci:section("luci_splash", "iface", nil, {net=device, zone="freifunk"})
+       uci:section("luci_splash", "iface", nil, {network=device.."dhcp", zone="freifunk"})
        uci:save("luci_splash")
 end