X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ffwizard-leipzig%2Fluasrc%2Fmodel%2Fcbi%2Fffwizard.lua;h=b30b596ec1304b1f0142512fe5e75ce0fee3fd0a;hp=87bbe4d1f29cf480239d977351523a9d734aac96;hb=8dac35f7cd4a7a4f61ca4ce620a7d4e85b20c33a;hpb=83494b2751c6ea69fa0fda43a8cb089cc18a45b4

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index 87bbe4d1f..b30b596ec 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -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 --------------------
@@ -172,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)
@@ -187,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"
@@ -202,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,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
 
 
@@ -281,6 +347,7 @@ 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")
@@ -288,6 +355,17 @@ function client.write(self, section, value)
 	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",
 		src_port="68",
 		dest_port="67"
 	})
@@ -313,10 +391,10 @@ function client.write(self, section, value)
 
 
 	-- 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