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=edcedd78b9dd77d9a0e11984c9dee3e9da6caf21;hp=b81e77d9d730c80a5d0fcfdc9bec7fd8cb1ea2fc;hb=303b7fccaca4177e570ae3c7038ba8d1b36d6c8c;hpb=abf0c329c5f3766c711f9f81f2bba913a3e3f2bd

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index b81e77d9d..edcedd78b 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -217,7 +217,7 @@ function main.write(self, section, value)
 
 	if not has_advanced then
 		uci:section("firewall", "advanced", nil,
-			{ tcp_ecn = "0" })
+			{ tcp_ecn = "0", ip_conntrack_max = "8192", tcp_westwood = "1" })
 	end
 
 	uci:save("firewall")
@@ -245,7 +245,7 @@ function main.write(self, section, value)
 				uci:set("system", s['.name'], "hostname", new_hostname)
 			end)
 
-		luci.fs.writefile( "/proc/sys/kernel/hostname", new_hostname.."\n" )
+		sys.hostname(new_hostname)
 		uci:save("system")
 	end
 end
@@ -284,12 +284,23 @@ function olsr.write(self, section, value)
 	olsrbase.interface = device
 	olsrbase.ignore    = "0"
 	uci:section("olsrd", "Interface", nil, olsrbase)
-	uci:save("olsrd")
+
+	-- 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
 
@@ -349,6 +360,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")
@@ -356,6 +368,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"
 	})
@@ -381,10 +404,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