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=526913c07a9a165e3356a303ba78c104c63dbd08;hp=053df036a9c1182e45f0f0f26a5f87a1f72f6221;hb=08bcf69aac9c7429ad77f847a413d96b29265c52;hpb=394093af0e013ae9b9bbcb4636a7f35dd2fc3f10

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index 053df036a..526913c07 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)
@@ -209,10 +210,20 @@ function main.write(self, section, value)
 			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)
+
+	if not has_advanced then
+		uci:section("firewall", "advanced", nil,
+			{ tcp_ecn = "0" })
+	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"
@@ -222,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
 
 
@@ -236,6 +262,19 @@ function olsr.write(self, section, value)
 	local community = net:formvalue(section)
 	local external  = community and uci:get("freifunk", community, "external") or ""
 
+	-- Configure nameservice
+	local hostname
+	uci:foreach("system", "system", function(s) hostname = s.hostname end)
+
+	if hostname then
+		uci:foreach("olsrd", "LoadPlugin",
+			function(s)
+				if s.library == "olsrd_nameservice.so.0.3" then
+					uci:set("olsrd", s['.name'], "name", hostname)
+				end
+			end)
+	end
+
 	-- Delete old interface
 	uci:delete_all("olsrd", "Interface", {interface=device})
 
@@ -246,16 +285,25 @@ function olsr.write(self, section, value)
 	olsrbase.ignore    = "0"
 	uci:section("olsrd", "Interface", nil, olsrbase)
 	uci:save("olsrd")
+
+	-- Import hosts
+	uci:foreach("dhcp", "dnsmasq", function(s)
+		uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
+	end)
+	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