* Separated Freifunk wizard from Freifunk module

3 files changed, 303 insertions, 0 deletions

diff --git a/applications/luci-ffwizard-leipzig/Makefile b/applications/luci-ffwizard-leipzig/Makefile
new file mode 100644
index 000000000..81a96f6a8
--- /dev/null
+++ b/applications/luci-ffwizard-leipzig/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file
diff --git a/applications/luci-ffwizard-leipzig/src/controller/luci_ffwizard_leipzig/wizard.lua b/applications/luci-ffwizard-leipzig/src/controller/luci_ffwizard_leipzig/wizard.lua
new file mode 100644
index 000000000..d6a704704
--- /dev/null
+++ b/applications/luci-ffwizard-leipzig/src/controller/luci_ffwizard_leipzig/wizard.lua
@@ -0,0 +1,243 @@
+module("ffluci.controller.luci_ffwizard_leipzig.wizard", package.seeall)
+
+function index()
+	entry({"admin", "index", "wizard"}, action_wizard, "Freifunkassistent", 20)
+end
+
+
+function action_wizard()
+	if ffluci.http.formvalue("ip") then
+		return configure_freifunk()
+	end
+	
+	local ifaces = {}
+	local wldevs = ffluci.model.uci.sections("wireless")
+	
+	if wldevs then
+		for k, v in pairs(wldevs) do
+			if v[".type"] == "wifi-device" then
+				table.insert(ifaces, k)
+			end
+		end
+	end
+	
+	ffluci.template.render("freifunk/wizard", {ifaces=ifaces})
+end
+
+function configure_freifunk()
+	local ip  = ffluci.http.formvalue("ip")
+	local uci = ffluci.model.uci.Session()
+	
+	-- Load UCI
+	uci:t_load("network")
+	uci:t_load("dhcp")
+	uci:t_load("freifunk")
+	uci:t_load("luci_splash")
+	uci:t_load("olsr")
+	uci:t_load("wireless")
+	uci:t_load("luci_fw")
+	
+	
+	-- Configure FF-Interface
+	uci:t_del("network", "ff")
+	uci:t_del("network", "ffdhcp")
+	
+	uci:t_set("network", "ff", nil, "interface")
+	uci:t_set("network", "ff", "type", "bridge")
+	uci:t_set("network", "ff", "proto", "static")
+	uci:t_set("network", "ff", "ipaddr", ip)
+	uci:t_set("network", "ff", "netmask", uci:t_get("freifunk", "community", "mask")) 
+	uci:t_set("network", "ff", "dns", uci:t_get("freifunk", "community", "dns")) 
+	
+	-- Reset Routing
+	local routing = uci:t_sections("luci_fw")
+	if routing then
+		for k, v in pairs(routing) do
+			if v[".type"] == "routing" and (v.iface == "ff" or v.oface == "ff") then
+				uci:t_del("luci_fw", k)
+			end
+		end
+	
+		local int = uci:t_add("luci_fw", "routing")
+		uci:t_set("luci_fw", int, "iface", "ff")
+		uci:t_set("luci_fw", int, "oface", "ff")
+		uci:t_set("luci_fw", int, "fwd", "1")
+	end
+	
+	-- Routing from Internal
+	local iface = ffluci.http.formvalue("frominternal")
+	if iface and iface ~= "" then
+		local routing = uci:t_sections("luci_fw")
+		if routing then
+			for k, v in pairs(routing) do
+				if v[".type"] == "routing" and (v.iface == iface and v.oface == "ff") then
+					uci:t_del("luci_fw", k)
+				end
+			end
+		
+			local int = uci:t_add("luci_fw", "routing")
+			uci:t_set("luci_fw", int, "iface", iface)
+			uci:t_set("luci_fw", int, "oface", "ff")
+			uci:t_set("luci_fw", int, "fwd", "1")
+			uci:t_set("luci_fw", int, "nat", "1")
+		end		
+	end	
+	
+	-- Routing to External
+	local iface = ffluci.http.formvalue("toexternal")
+	if iface and iface ~= "" then
+		local routing = uci:t_sections("luci_fw")
+		if routing then
+			for k, v in pairs(routing) do
+				if v[".type"] == "routing" and (v.oface == iface and v.iface == "ff") then
+					uci:t_del("luci_fw", k)
+				end
+			end
+		
+			local int = uci:t_add("luci_fw", "routing")
+			uci:t_set("luci_fw", int, "iface", "ff")
+			uci:t_set("luci_fw", int, "oface", iface)
+			uci:t_set("luci_fw", int, "fwd", "1")
+			uci:t_set("luci_fw", int, "nat", "1")
+		end		
+	end	
+	
+	-- Configure DHCP
+	if ffluci.http.formvalue("dhcp") then
+		local dhcpnet = uci:t_get("freifunk", "community", "dhcp"):match("^([0-9]+)")
+		local dhcpip  = ip:gsub("^[0-9]+", dhcpnet)
+	
+		uci:t_set("network", "ffdhcp", nil, "interface")
+		uci:t_set("network", "ffdhcp", "proto", "static")
+		uci:t_set("network", "ffdhcp", "ifname", "br-ff:dhcp")
+		uci:t_set("network", "ffdhcp", "ipaddr", dhcpip)
+		uci:t_set("network", "ffdhcp", "netmask", uci:t_get("freifunk", "community", "dhcpmask"))
+		
+		local dhcp = uci:t_sections("dhcp")
+		if dhcp then
+			for k, v in pairs(dhcp) do
+				if v[".type"] == "dhcp" and v.interface == "ffdhcp" then
+					uci:t_del("dhcp", k)
+				end
+			end		
+			
+			local dhcpbeg = 48 + tonumber(ip:match("[0-9]+$")) * 4
+			
+			local sk = uci:t_add("dhcp", "dhcp")
+			uci:t_set("dhcp", sk, "interface", "ffdhcp")
+			uci:t_set("dhcp", sk, "start", dhcpbeg)
+			uci:t_set("dhcp", sk, "limit", (dhcpbeg < 252) and 3 or 2)
+			uci:t_set("dhcp", sk, "leasetime", "30m")
+		end 
+		
+		local splash = uci:t_sections("luci_splash")
+		if splash then
+			for k, v in pairs(splash) do
+				if v[".type"] == "iface" then
+					uci:t_del("luci_splash", k)
+				end
+			end		
+			
+			local sk = uci:t_add("luci_splash", "iface")
+			uci:t_set("luci_splash", sk, "network", "ffdhcp")
+		end 	
+		
+		local routing = uci:t_sections("luci_fw")
+		if routing then
+			for k, v in pairs(routing) do
+				if v[".type"] == "routing" and (v.iface == "ffdhcp" or v.oface == "ffdhcp") then
+					uci:t_del("luci_fw", k)
+				end
+			end
+			
+			local int = uci:t_add("luci_fw", "routing")
+			uci:t_set("luci_fw", int, "iface", "ffdhcp")
+			uci:t_set("luci_fw", int, "oface", "ff")
+			uci:t_set("luci_fw", int, "nat", "1")			
+			
+			local iface = ffluci.http.formvalue("toexternal")
+			if iface and iface ~= "" then
+				local int = uci:t_add("luci_fw", "routing")
+				uci:t_set("luci_fw", int, "iface", "ffdhcp")
+				uci:t_set("luci_fw", int, "oface", iface)
+				uci:t_set("luci_fw", int, "nat", "1")				
+			end
+		end	
+	end
+	
+	-- Configure OLSR
+	if ffluci.http.formvalue("olsr") and uci:t_sections("olsr") then
+		for k, v in pairs(uci:t_sections("olsr")) do
+			if v[".type"] == "Interface" or v[".type"] == "LoadPlugin" then
+				uci:t_del("olsr", k)
+			end
+		end
+		
+		if ffluci.http.formvalue("shareinet") then
+			uci:t_set("olsr", "dyn_gw", nil, "LoadPlugin")
+			uci:t_set("olsr", "dyn_gw", "Library", "olsrd_dyn_gw.so.0.4")
+		end
+		
+		uci:t_set("olsr", "nameservice", nil, "LoadPlugin")
+		uci:t_set("olsr", "nameservice", "Library", "olsrd_nameservice.so.0.3")
+		uci:t_set("olsr", "nameservice", "name", ip:gsub("%.", "-"))
+		uci:t_set("olsr", "nameservice", "hosts_file", "/var/etc/hosts")
+		uci:t_set("olsr", "nameservice", "suffix", ".olsr")
+		uci:t_set("olsr", "nameservice", "latlon_infile", "/tmp/latlon.txt")
+		
+		uci:t_set("olsr", "txtinfo", nil, "LoadPlugin")
+		uci:t_set("olsr", "txtinfo", "Library", "olsrd_txtinfo.so.0.1")
+		uci:t_set("olsr", "txtinfo", "Accept", "127.0.0.1")
+		
+		local oif = uci:t_add("olsr", "Interface")
+		uci:t_set("olsr", oif, "Interface", "ff")
+		uci:t_set("olsr", oif, "HelloInterval", "6.0")
+		uci:t_set("olsr", oif, "HelloValidityTime", "108.0")
+		uci:t_set("olsr", oif, "TcInterval", "4.0")
+		uci:t_set("olsr", oif, "TcValidityTime", "324.0")
+		uci:t_set("olsr", oif, "MidInterval", "18.0")
+		uci:t_set("olsr", oif, "MidValidityTime", "324.0")
+		uci:t_set("olsr", oif, "HnaInterval", "18.0")
+		uci:t_set("olsr", oif, "HnaValidityTime", "108.0")
+	end
+	
+	-- Configure Wifi
+	local wcfg = uci:t_sections("wireless")
+	if wcfg then
+		for iface, v in pairs(wcfg) do
+			if v[".type"] == "wifi-device" and ffluci.http.formvalue("wifi."..iface) then
+				-- Cleanup
+				for k, j in pairs(wcfg) do
+					if j[".type"] == "wifi-iface" and j.device == iface then
+						uci:t_del("wireless", k)
+					end
+				end
+				
+				uci:t_set("wireless", iface, "disabled", "0")
+				uci:t_set("wireless", iface, "mode", "11g")
+				uci:t_set("wireless", iface, "txantenna", 1)
+				uci:t_set("wireless", iface, "rxantenna", 1)
+				uci:t_set("wireless", iface, "channel", uci:t_get("freifunk", "community", "channel")) 
+				
+				local wif = uci:t_add("wireless", "wifi-iface")
+				uci:t_set("wireless", wif, "device", iface)
+				uci:t_set("wireless", wif, "network", "ff")
+				uci:t_set("wireless", wif, "mode", "adhoc")
+				uci:t_set("wireless", wif, "ssid", uci:t_get("freifunk", "community", "essid"))
+				uci:t_set("wireless", wif, "bssid", uci:t_get("freifunk", "community", "bssid"))
+				uci:t_set("wireless", wif, "txpower", 13)
+			end
+		end
+	end
+	
+	-- Save UCI
+	uci:t_save("network")
+	uci:t_save("dhcp")
+	uci:t_save("freifunk")
+	uci:t_save("luci_splash")
+	uci:t_save("olsr")
+	uci:t_save("wireless")
+	uci:t_save("luci_fw")
+
+	ffluci.http.redirect(ffluci.dispatcher.build_url("admin", "uci", "changes"))
+end
\ No newline at end of file
diff --git a/applications/luci-ffwizard-leipzig/src/view/freifunk/wizard.htm b/applications/luci-ffwizard-leipzig/src/view/freifunk/wizard.htm
new file mode 100644
index 000000000..b08703ffe
--- /dev/null
+++ b/applications/luci-ffwizard-leipzig/src/view/freifunk/wizard.htm
@@ -0,0 +1,58 @@
+<%+header%>
+<h1><%:ffwizard Freifunkassistent%></h1>
+<p><%:ffwizard1 Dieser Assistent konfiguriert den Router für die Benutzung im Freifunknetz%></p>
+<br />
+<form method="post" action="<%=controller%>/admin/index/wizard">
+	<div class="cbi-section-node">
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:ip IP-Adresse%>:&nbsp;
+			<input type="text" size="20" name="ip" /></div>
+		</div>
+		<% for i, k in ipairs(ifaces) do %>
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:wificfg Drahtlosgerät einrichten%>: <%=k%></div>
+			<div class="cbi-value-field"><input type="checkbox" name="wifi.<%=k%>" value="1" checked="checked" /></div>
+		</div>
+		<% end %>
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:cfgolsr OLSR konfigurieren%></div>
+			<div class="cbi-value-field"><input type="checkbox" name="olsr" value="1" checked="checked" /></div>
+		</div>
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:cfgdhcp Drahtlos DHCP konfigurieren%></div>
+			<div class="cbi-value-field"><input type="checkbox" name="dhcp" value="1" checked="checked" /></div>
+		</div>
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:cfginternal Erlaube Zugriff von internem Netzwerk%>:</div>
+			<div class="cbi-value-field"><select name="frominternal">
+				<option value=""></option>
+<% for k, v in pairs(ffluci.model.uci.sections("network")) do
+	if v[".type"] == "interface" and k ~= "loopback" then %>
+<option value="<%=k%>"<% if k == "lan" then %> selected="selected"<% end %>><%=k%></option>
+<%	end
+end %>
+			</select></div>
+		</div>
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:cfgexternal Erlaube Zugriff auf externes Netzwerk%>:</div>
+			<div class="cbi-value-field"><select name="toexternal">
+				<option value=""></option>
+<% for k, v in pairs(ffluci.model.uci.sections("network")) do
+	if v[".type"] == "interface" and k ~= "loopback" then %>
+<option value="<%=k%>"<% if k == "wan" then %> selected="selected"<% end %>><%=k%></option>
+<%	end
+end %>
+			</select></div>
+		</div>
+		<div class="cbi-value">
+			<div class="cbi-value-title"><%:shareinet Internetzugang ankündigen%></div>
+			<div class="cbi-value-field"><input type="checkbox" name="shareinet" value="1" checked="checked" /></div>
+		</div>
+	</div>
+	<br />
+	<div>
+		<input type="submit" value="<%:configure Konfigurieren%>" />
+		<input type="reset" value="<%:reset Zurücksetzen%>" />
+	</div>
+</form> 
+<%+footer%>
\ No newline at end of file