diff options
9 files changed, 1974 insertions, 0 deletions
diff --git a/applications/luci-ffwizard/Makefile b/applications/luci-ffwizard/Makefile new file mode 100644 index 0000000000..a4f7c76ef9 --- /dev/null +++ b/applications/luci-ffwizard/Makefile @@ -0,0 +1,4 @@ +PO = + +include ../../build/config.mk +include ../../build/module.mk diff --git a/applications/luci-ffwizard/htdocs/luci-static/resources/OSMLatLon.htm b/applications/luci-ffwizard/htdocs/luci-static/resources/OSMLatLon.htm new file mode 100644 index 0000000000..30ad5bc34d --- /dev/null +++ b/applications/luci-ffwizard/htdocs/luci-static/resources/OSMLatLon.htm @@ -0,0 +1,20 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> + +<head> + <title>OpenStreetMap</title> + <script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script> + <script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script> + <script type="text/javascript" src="osm.js"></script> +</head> +<body onload="init();drawmap();" style="padding:0px; margin:0px"> + <div id="map"></div> + <div style="position:absolute; bottom:0%; width:100%; background:url('cbi/black_60.png'); font-size:10px; color:#fff;z-index:1000"> + Map by <a href="http://www.openstreetmap.org" title="www.openstreetmap.org" style="color:#fff;" >openstreetmap.org</a>, License CC-BY-SA + + <span id="osm"> + Latitude: <input id="osmlat" name="osmlat" type="text" size="20" style="font-size:10px;"> + Longitude: <input id="osmlon" name="osmlon" type="text" size="20" style="font-size:10px;"> + </span> + </div> + +</body> diff --git a/applications/luci-ffwizard/htdocs/luci-static/resources/osm.js b/applications/luci-ffwizard/htdocs/luci-static/resources/osm.js new file mode 100644 index 0000000000..4138ef6ad2 --- /dev/null +++ b/applications/luci-ffwizard/htdocs/luci-static/resources/osm.js @@ -0,0 +1,130 @@ +var map; +var layer_mapnik; +var layer_tah; +var layer_markers; +var PI = Math.PI; +var latfield = ''; +var lonfield = ''; +var latfield_id=''; +var lonfield_id=''; +var centerlon = 10; +var centerlat = 52; +var zoom = 6; + +function lon2merc(lon) { + return 20037508.34 * lon / 180; +} + +function lat2merc(lat) { + lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / PI; + return 20037508.34 * lat; +} + +function merc2lon(lon) { + return lon*180/20037508.34; +}; + +function merc2lat(lat) { + return Math.atan(Math.exp(lat*PI/20037508.34))*360/PI-90; +}; + +OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { + defaultHandlerOptions: { + 'single': true, + 'double': false, + 'pixelTolerance': 0, + 'stopSingle': false, + 'stopDouble': false + }, + + initialize: function(options) { + this.handlerOptions = OpenLayers.Util.extend( + {}, this.defaultHandlerOptions + ); + OpenLayers.Control.prototype.initialize.apply( + this, arguments + ); + this.handler = new OpenLayers.Handler.Click( + this, { + 'click': this.trigger + }, this.handlerOptions + ); + }, + + trigger: function(e) { + var lonlat = map.getLonLatFromViewPortPx(e.xy); + lat=merc2lat(lonlat.lat); + lon=merc2lon(lonlat.lon); + if(parent.document.getElementById(latfield_id)==null){ + latfield=document.getElementById('osmlat'); + }else{ + latfield=parent.document.getElementById(latfield_id); + } + if(parent.document.getElementById(lonfield_id)==null){ + lonfield=document.getElementById('osmlon'); + }else{ + lonfield=parent.document.getElementById(lonfield_id); + } + latfield.value = lat; + lonfield.value = lon; + } +}); + +function init(){ + var field = window.name.substring(0, window.name.lastIndexOf(".")); + if(parent.document.getElementById(field+".latfield")!=null){ + latfield_id = parent.document.getElementById(field+".latfield").value; + document.getElementById('osm').style.display="none"; + } + if(parent.document.getElementById(field+".lonfield")!=null){ + lonfield_id = parent.document.getElementById(field+".lonfield").value; + } + if(parent.document.getElementById(field+".centerlat")!=null){ + centerlat =parseFloat(parent.document.getElementById(field+".centerlat").value); + } + if(parent.document.getElementById(field+".centerlon")!=null){ + centerlon = parseFloat(parent.document.getElementById(field+".centerlon").value); + } + if(parent.document.getElementById(field+".zoom")!=null){ + zoom = parseFloat(parent.document.getElementById(field+".zoom").value); + } +} + +function drawmap() { + OpenLayers.Lang.setCode('de'); + mapdiv=document.getElementById('map'); + mapdiv.style.height=window.innerHeight+"px"; + mapdiv.style.width=window.innerWidth+"px"; + map = new OpenLayers.Map('map', { + projection: new OpenLayers.Projection("EPSG:900913"), + displayProjection: new OpenLayers.Projection("EPSG:4326"), + controls: [ + new OpenLayers.Control.MouseDefaults(), + new OpenLayers.Control.PanZoomBar()], + maxExtent: + new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34), + numZoomLevels: 18, + maxResolution: 156543, + units: 'meters' + }); + + layer_mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik"); + + map.addLayers([layer_mapnik]); + var y =lat2merc(centerlat); + var x =lon2merc(centerlon); + map.setCenter(new OpenLayers.LonLat(x, y), zoom); + + // Check for geolocation support + if(navigator.geolocation){ + navigator.geolocation.getCurrentPosition(function(position){ + var y =lat2merc(position.coords.latitude); + var x =lon2merc(position.coords.longitude); + map.setCenter(new OpenLayers.LonLat(x, y), '17'); + }); + } + + var click = new OpenLayers.Control.Click(); + map.addControl(click); + click.activate(); +} diff --git a/applications/luci-ffwizard/luasrc/controller/ffwizard.lua b/applications/luci-ffwizard/luasrc/controller/ffwizard.lua new file mode 100644 index 0000000000..428962d4be --- /dev/null +++ b/applications/luci-ffwizard/luasrc/controller/ffwizard.lua @@ -0,0 +1,23 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth <steven@midlink.org> +Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> +Copyright 2011 Patrick Grimm <patrick@pberg.freifunk.net> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +]]-- + +module "luci.controller.ffwizard" + +function index() + entry({"admin", "freifunk", "ffwizard"}, form("ffwizard"), "Freifunkassistent", 1) + assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, "Freifunkassistent", 1) +end
\ No newline at end of file diff --git a/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua new file mode 100644 index 0000000000..d2a051d3d2 --- /dev/null +++ b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua @@ -0,0 +1,1449 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth <steven@midlink.org> +Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> +Copyright 2011 Patrick Grimm <patrick@pberg.freifunk.net> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +]]-- + + +local uci = require "luci.model.uci".cursor() +local uci_state = require "luci.model.uci".cursor_state() +local tools = require "luci.tools.ffwizard" +local util = require "luci.util" +local sys = require "luci.sys" +local ip = require "luci.ip" +local fs = require "nixio.fs" + + +local has_pptp = fs.access("/usr/sbin/pptp") +local has_pppoe = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() +local has_l2gvpn = fs.access("/usr/sbin/node") +local has_radvd = fs.access("/etc/config/radvd") +local has_rom = fs.access("/rom/etc") +local has_autoipv6 = fs.access("/usr/bin/auto-ipv6") +local has_qos = fs.access("/etc/init.d/qos") + +luci.i18n.loadc("freifunk") + +function get_mac(ix) + if string.find(ix, "radio") then + ix = string.gsub(ix,"radio", 'wlan') + end + local mac = fs.readfile("/sys/class/net/" .. ix .. "/address") + if not mac then + mac = luci.util.exec("ifconfig " .. ix) + mac = mac and mac:match(" ([A-F0-9:]+)%s*\n") + else + mac = mac:sub(1,17) + end + if mac and #mac > 0 then + return mac:lower() + end + return "?" +end +function get_ula(imac) + if string.len(imac) == 17 then + local mac1 = string.sub(imac,4,8) + local mac2 = string.sub(imac,10,14) + local mac3 = string.sub(imac,16,17) + return 'fdca:ffee:babe::02'..mac1..'ff:fe'..mac2..mac3..'/64' + end + return "?" +end + + +-------------------- View -------------------- +f = SimpleForm("ffwizward", "Freifunkassistent", + "Dieser Assistent unterstützt Sie bei der Einrichtung des Routers für das Freifunknetz.") +-- main netconfig +local newpsswd = has_rom and sys.exec("diff /rom/etc/passwd /etc/passwd") +if newpsswd ~= "" then + pw = f:field(Flag, "pw", "Router Passwort", "Setzen Sie den Haken, um Ihr Passwort zu ändern.") + function pw.cfgvalue(self, section) + return 1 + end +end + +pw1 = f:field(Value, "pw1", translate("password")) +pw1.password = true +pw1.rmempty = false + +pw2 = f:field(Value, "pw2", translate("confirmation")) +pw2.password = true +pw2.rmempty = false + +function pw2.validate(self, value, section) + return pw1:formvalue(section) == value and value +end + +if newpsswd ~= "" then + pw1:depends("pw", "1") + pw2:depends("pw", "1") +end + +net = f:field(ListValue, "net", "Freifunk Community", "Nutzen Sie die Einstellungen der Freifunk Gemeinschaft in ihrer Nachbarschaft.") +net.rmempty = false +net.optional = false +uci:foreach("freifunk", "community", function(s) + net:value(s[".name"], "%s (%s)" % {s.name, s.mesh_network or "?"}) +end) +function net.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "net") +end +function net.write(self, section, value) + uci:set("freifunk", "wizard", "net", value) + uci:save("freifunk") +end +net_lat = f:field(ListValue, "net_lat", "", "") +net_lat:depends("net", "0") +net_lon = f:field(ListValue, "net_lon", "", "") +net_lon:depends("net", "0") +uci:foreach("freifunk", "community", function(s) + if s.latitude then + net_lat:value(s[".name"], "%s" % {s.latitude or "?"}) + end + if s.longitude then + net_lon:value(s[".name"], "%s" % {s.longitude or "?"}) + end +end) + +-- hostname +hostname = f:field(Value, "hostname", "Knoten Name", "Geben Sie Ihrem Freifunk Router einen Namen. Wenn Sie dieses Feld leer lassen, wird der Name automatisch aus der Mesh IP generiert.") +hostname.rmempty = true +hostname.optional = false +function hostname.cfgvalue(self, section) + return sys.hostname() +end +function hostname.write(self, section, value) + uci:set("freifunk", "wizard", "hostname", value) + uci:save("freifunk") +end +function hostname.validate(self, value) + if (#value > 16) then + return + elseif (string.find(value, "[^%w%_%-]")) then + return + else + return value + end +end + +-- location +location = f:field(Value, "location", "Standort", "Geben Sie den Standort ihres Gerätes an") +location.rmempty = false +location.optional = false +function location.cfgvalue(self, section) + return uci:get("freifunk", "contact", "location") +end +function location.write(self, section, value) + uci:set("freifunk", "contact", "location", value) + uci:save("freifunk") +end + +-- mail +mail = f:field(Value, "mail", "E-Mail", "Bitte hinterlegen Sie eine Kontaktadresse.") +mail.rmempty = false +mail.optional = false +function mail.cfgvalue(self, section) + return uci:get("freifunk", "contact", "mail") +end +function mail.write(self, section, value) + uci:set("freifunk", "contact", "mail", value) + uci:save("freifunk") +end +-- main netconfig +main = f:field(Flag, "netconfig", "Netzwerk einrichten", "Setzen Sie den Haken, wenn Sie Ihr Freifunk Netzwerk einrichten wollen.") +uci:foreach("wireless", "wifi-device", + function(section) + local device = section[".name"] + local dev = f:field(Flag, "device_" .. device , "<b>Drahtloses Netzwerk \"" .. device:upper() .. "\"</b> ", "Konfigurieren Sie Ihre drahtlose " .. device:upper() .. "Schnittstelle (WLAN).") + dev:depends("netconfig", "1") + dev.rmempty = false + function dev.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "device_" .. device) + end + function dev.write(self, sec, value) + if value then + uci:set("freifunk", "wizard", "device_" .. device, value) + uci:save("freifunk") + end + end + local chan = f:field(ListValue, "chan_" .. device, device:upper() .. " Freifunk Kanal einrichten", "Ihr Gerät und benachbarte Freifunk Knoten müssen auf demselben Kanal senden. Je nach Gerätetyp können Sie zwischen verschiedenen 2,4Ghz und 5Ghz Kanälen auswählen.") + chan:depends("device_" .. device, "1") + chan.rmempty = true + function chan.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "chan_" .. device) + end + chan:value('default') + for i = 1, 14, 1 do + chan:value(i) + end + for i = 36, 64, 4 do + chan:value(i) + end + for i = 100, 140, 4 do + chan:value(i) + end + function chan.write(self, sec, value) + if value then + uci:set("freifunk", "wizard", "chan_" .. device, value) + uci:save("freifunk") + end + end + local meship = f:field(Value, "meship_" .. device, device:upper() .. " Mesh IP Adresse einrichten", "Ihre Mesh IP Adresse erhalten Sie von der Freifunk Gemeinschaft in Ihrer Nachbarschaft. Es ist eine netzweit eindeutige Identifikation, z.B. 104.1.1.1.") + meship:depends("device_" .. device, "1") + meship.rmempty = true + function meship.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "meship_" .. device) + end + function meship.validate(self, value) + local x = ip.IPv4(value) + return ( x and x:prefix() == 32 ) and x:string() or "" + end + function meship.write(self, sec, value) + uci:set("freifunk", "wizard", "meship_" .. device, value) + local new_ip = ip.IPv4(value) + if new_ip then + local new_hostname = new_ip:string():gsub("%.", "-") + uci:set("freifunk", "wizard", "hostname", new_hostname) + uci:save("freifunk") + end + end + local meship6 = f:field(Value, "meship6_" .. device, device:upper() .. " Mesh IPv6 Adresse einrichten", "Ihre Mesh IP Adresse wird automatisch berechnet") + meship6:depends("device_" .. device, "1") + meship6.rmempty = true + function meship6.cfgvalue(self, section) + return get_ula(get_mac(device)) + end + local client = f:field(Flag, "client_" .. device, device:upper() .. " DHCP anbieten", "DHCP weist verbundenen Benutzern automatisch eine Adresse zu. Diese Option sollten Sie unbedingt aktivieren, wenn Sie Nutzer an der drahtlosen Schnittstelle erwarten.") + client:depends("device_" .. device, "1") + client.rmempty = false + function client.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "client_" .. device) + end + function client.write(self, sec, value) + uci:set("freifunk", "wizard", "client_" .. device, value) + uci:save("freifunk") + end + local dhcpmesh = f:field(Value, "dhcpmesh_" .. device, device:upper() .. " Mesh DHCP anbieten", "Bestimmen Sie den Adressbereich aus dem Ihre Nutzer IP Adressen erhalten. Es wird empfohlen einen Adressbereich aus Ihrer lokalen Freifunk Gemeinschaft zu nutzen. Der Adressbereich ist ein netzweit eindeutiger Netzbereich. z.B. 104.1.2.1/28") + dhcpmesh:depends("client_" .. device, "1") + dhcpmesh.rmempty = true + function dhcpmesh.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "dhcpmesh_" .. device) + end + function dhcpmesh.validate(self, value) + local x = ip.IPv4(value) + return ( x and x:minhost()) and x:string() or "" + end + function dhcpmesh.write(self, sec, value) + uci:set("freifunk", "wizard", "dhcpmesh_" .. device, value) + uci:save("freifunk") + end + local hwtype = section.type + if hwtype == "atheros" then + local vap = f:field(Flag, "vap_" .. device , "Virtueller Drahtloser Zugangspunkt", "Konfigurieren Sie Ihren Virtuellen AP") + vap:depends("client_" .. device, "1") + vap.rmempty = false + function vap.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "vap_" .. device) + end + function vap.write(self, sec, value) + uci:set("freifunk", "wizard", "vap_" .. device, value) + uci:save("freifunk") + end + end + end) + +uci:foreach("network", "interface", + function(section) + local device = section[".name"] + local ifname = uci_state:get("network",device,"ifname") + if device ~= "loopback" and not string.find(device, "gvpn") and not string.find(device, "wifi") and not string.find(device, "wl") and not string.find(device, "wlan") and not string.find(device, "wireless") and not string.find(device, "radio") then + dev = f:field(Flag, "device_" .. device , "<b>Drahtgebundenes Netzwerk \"" .. device:upper() .. "\"</b>", "Konfigurieren Sie Ihre drahtgebunde " .. device:upper() .. " Schnittstelle (LAN).") + dev:depends("netconfig", "1") + dev.rmempty = false + function dev.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "device_" .. device) + end + function dev.write(self, sec, value) + uci:set("freifunk", "wizard", "device_" .. device, value) + uci:save("freifunk") + end + meship = f:field(Value, "meship_" .. device, device:upper() .. " Mesh IP Adresse einrichten", "Ihre Mesh IP Adresse erhalten Sie von der Freifunk Gemeinschaft in Ihrer Nachbarschaft. Es ist eine netzweit eindeutige Identifikation, z.B. 104.1.1.1.") + meship:depends("device_" .. device, "1") + meship.rmempty = true + function meship.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "meship_" .. device) + end + function meship.validate(self, value) + local x = ip.IPv4(value) + return ( x and x:prefix() == 32 ) and x:string() or "" + end + function meship.write(self, sec, value) + uci:set("freifunk", "wizard", "meship_" .. device, value) + end + meship6 = f:field(Value, "meship6_" .. device, device:upper() .. " Mesh IPv6 Adresse einrichten", "Ihre Mesh IP Adresse wird automatisch berechnet") + meship6:depends("device_" .. device, "1") + meship6.rmempty = true + function meship6.cfgvalue(self, section) + return get_ula(get_mac(ifname)) + end + client = f:field(Flag, "client_" .. device, device:upper() .. " DHCP anbieten","DHCP weist verbundenen Benutzern automatisch eine Adresse zu. Diese Option sollten Sie unbedingt aktivieren, wenn Sie Nutzer an der drahtlosen Schnittstelle erwarten.") + client:depends("device_" .. device, "1") + client.rmempty = false + function client.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "client_" .. device) + end + function client.write(self, sec, value) + uci:set("freifunk", "wizard", "client_" .. device, value) + uci:save("freifunk") + end + dhcpmesh = f:field(Value, "dhcpmesh_" .. device, device:upper() .. " Mesh DHCP anbieten ", "Bestimmen Sie den Adressbereich aus dem Ihre Nutzer IP Adressen erhalten. Es wird empfohlen einen Adressbereich aus Ihrer lokalen Freifunk Gemeinschaft zu nutzen. Der Adressbereich ist ein netzweit eindeutiger Netzbereich. z.B. 104.1.2.1/28") + dhcpmesh:depends("client_" .. device, "1") + dhcpmesh.rmempty = true + function dhcpmesh.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "dhcpmesh_" .. device) + end + function dhcpmesh.validate(self, value) + local x = ip.IPv4(value) + return ( x and x:prefix() <= 30 and x:minhost()) and x:string() or "" + end + function dhcpmesh.write(self, sec, value) + uci:set("freifunk", "wizard", "dhcpmesh_" .. device, value) + uci:save("freifunk") + end + end + end) + + +local syslat = uci:get("freifunk", "wizard", "latitude") or 52 +local syslon = uci:get("freifunk", "wizard", "longitude") or 10 +uci:foreach("system", "system", function(s) + if s.latitude then + syslat = s.latitude + end + if s.longitude then + syslon = s.longitude + end +end) +uci:foreach("olsrd", "LoadPlugin", function(s) + if s.library == "olsrd_nameservice.so.0.3" then + if s.lat then + syslat = s.lat + end + if s.lon then + syslon = s.lon + end + end +end) + +lat = f:field(Value, "lat", "geographischer Breitengrad", "Setzen Sie den Breitengrad (Latitude) Ihres Geräts.") +lat:depends("netconfig", "1") +function lat.cfgvalue(self, section) + return syslat +end +function lat.write(self, section, value) + uci:set("freifunk", "wizard", "latitude", value) + uci:save("freifunk") +end + +lon = f:field(Value, "lon", "geograpischer Längengrad", "Setzen Sie den Längengrad (Longitude) Ihres Geräts.") +lon:depends("netconfig", "1") +function lon.cfgvalue(self, section) + return syslon +end +function lon.write(self, section, value) + uci:set("freifunk", "wizard", "longitude", value) + uci:save("freifunk") +end + +--[[ +*Opens an OpenStreetMap iframe or popup +*Makes use of resources/OSMLatLon.htm and htdocs/resources/osm.js +(is that the right place for files like these?) +]]-- + +local class = util.class + +OpenStreetMapLonLat = class(AbstractValue) + +function OpenStreetMapLonLat.__init__(self, ...) + AbstractValue.__init__(self, ...) + self.template = "cbi/osmll_value" + self.latfield = nil + self.lonfield = nil + self.centerlat = "" + self.centerlon = "" + self.zoom = "0" + self.width = "100%" --popups will ignore the %-symbol, "100%" is interpreted as "100" + self.height = "600" + self.popup = false + self.displaytext="OpenStreetMap" --text on button, that loads and displays the OSMap + self.hidetext="X" -- text on button, that hides OSMap +end + +osm = f:field(OpenStreetMapLonLat, "latlon", "Geokoordinaten mit OpenStreetMap ermitteln:", "Klicken Sie auf Ihren Standort in der Karte. Diese Karte funktioniert nur, wenn das Gerät bereits eine Verbindung zum Internet hat.") +osm:depends("netconfig", "1") +osm.latfield = "lat" +osm.lonfield = "lon" +osm.centerlat = syslat +osm.centerlon = syslon +osm.width = "100%" +osm.height = "600" +osm.popup = false +syslatlengh = string.len(syslat) +if syslatlengh > 7 then + osm.zoom = "15" +elseif syslatlengh > 5 then + osm.zoom = "12" +else + osm.zoom = "6" +end +osm.displaytext="OpenStreetMap anzeigen" +osm.hidetext="OpenStreetMap verbergen" + +share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben", "Geben Sie Ihren Internetzugang im Freifunknetz frei.") +share.rmempty = false +share:depends("netconfig", "1") +function share.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "share") +end +function share.write(self, section, value) + uci:set("freifunk", "wizard", "share", value) + uci:save("freifunk") +end + +wanproto = f:field(ListValue, "wanproto", "Protokoll des Internetzugangs", "Geben Sie das Protokol an ueber das eine Internet verbindung hergestellt werden kann.") +wanproto:depends("sharenet", "1") +wanproto:value("static", translate("manual", "manual")) +wanproto:value("dhcp", translate("automatic", "automatic")) +if has_pppoe then wanproto:value("pppoe", "PPPoE") end +if has_pptp then wanproto:value("pptp", "PPTP") end +function wanproto.cfgvalue(self, section) + return uci:get("network", "wan", "proto") or "dhcp" +end +function wanproto.write(self, section, value) + uci:set("network", "wan", "proto", value) + uci:save("network") +end +wanip = f:field(Value, "wanipaddr", translate("ipaddress")) +wanip:depends("wanproto", "static") +function wanip.cfgvalue(self, section) + return uci:get("network", "wan", "ipaddr") +end +function wanip.write(self, section, value) + uci:set("network", "wan", "ipaddr", value) + uci:save("network") +end +wannm = f:field(Value, "wannetmask", translate("netmask")) +wannm:depends("wanproto", "static") +function wannm.cfgvalue(self, section) + return uci:get("network", "wan", "netmask") +end +function wannm.write(self, section, value) + uci:set("network", "wan", "netmask", value) + uci:save("network") +end +wangw = f:field(Value, "wangateway", translate("gateway")) +wangw:depends("wanproto", "static") +wangw.rmempty = true +function wangw.cfgvalue(self, section) + return uci:get("network", "wan", "gateway") +end +function wangw.write(self, section, value) + uci:set("network", "wan", "gateway", value) + uci:save("network") +end +wandns = f:field(Value, "wandns", translate("dnsserver")) +wandns:depends("wanproto", "static") +wandns.rmempty = true +function wandns.cfgvalue(self, section) + return uci:get("network", "wan", "dns") +end +function wandns.write(self, section, value) + uci:set("network", "wan", "dns", value) + uci:save("network") +end +wanusr = f:field(Value, "wanusername", translate("username")) +wanusr:depends("wanproto", "pppoe") +wanusr:depends("wanproto", "pptp") +function wanusr.cfgvalue(self, section) + return uci:get("network", "wan", "username") +end +function wanusr.write(self, section, value) + uci:set("network", "wan", "username", value) + uci:save("network") +end +wanpwd = f:field(Value, "wanpassword", translate("password")) +wanpwd.password = true +wanpwd:depends("wanproto", "pppoe") +wanpwd:depends("wanproto", "pptp") +function wanpwd.cfgvalue(self, section) + return uci:get("network", "wan", "password") +end +function wanpwd.write(self, section, value) + uci:set("network", "wan", "password", value) + uci:save("network") +end + +wansec = f:field(Flag, "wansec", "WAN-Zugriff auf Gateway beschränken", "Verbieten Sie Zugriffe auf Ihr lokales Netzwerk aus dem Freifunknetz.") +wansec.rmempty = false +wansec:depends("wanproto", "static") +wansec:depends("wanproto", "dhcp") +function wansec.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "wan_security") +end +function wansec.write(self, section, value) + uci:set("freifunk", "wizard", "wan_security", value) + uci:save("freifunk") +end +if has_qos then + wanqosdown = f:field(Value, "wanqosdown", "Download Bandbreite begrenzen", "kb/s") + wanqosdown:depends("sharenet", "1") + function wanqosdown.cfgvalue(self, section) + return uci:get("qos", "wan", "download") + end + function wanqosdown.write(self, section, value) + uci:set("qos", "wan", "download", value) + uci:save("qos") + end + wanqosup = f:field(Value, "wanqosup", "Upload Bandbreite begrenzen", "kb/s") + wanqosup:depends("sharenet", "1") + function wanqosup.cfgvalue(self, section) + return uci:get("qos", "wan", "upload") + end + function wanqosup.write(self, section, value) + uci:set("qos", "wan", "upload", value) + uci:save("qos") + end +end + +if has_l2gvpn then + gvpn = f:field(Flag, "gvpn", "Freifunk Internet Tunnel", "Verbinden Sie ihren Router ueber das Internet mit anderen Freifunknetzen.") + gvpn.rmempty = false + gvpn:depends("sharenet", "1") + function gvpn.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "gvpn") + end + function gvpn.write(self, section, value) + uci:set("freifunk", "wizard", "gvpn", value) + uci:save("freifunk") + end + gvpnip = f:field(Value, "gvpnipaddr", translate("ipaddress")) + gvpnip:depends("gvpn", "1") + function gvpnip.cfgvalue(self, section) + return uci:get("l2gvpn", "bbb", "ip") or uci:get("network", "gvpn", "ipaddr") + end + function gvpnip.validate(self, value) + local x = ip.IPv4(value) + return ( x and x:prefix() == 32 ) and x:string() or "" + end +end + +hb = f:field(Flag, "hb", "Heartbeat aktivieren","Dem Gerät erlauben anonyme Statistiken zu übertragen. (empfohlen)") +hb.rmempty = false +hb:depends("netconfig", "1") +function hb.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "hb") +end +function hb.write(self, section, value) + uci:set("freifunk", "wizard", "hb", value) + uci:save("freifunk") +end + +-------------------- Control -------------------- +function f.handle(self, state, data) + if state == FORM_VALID then + local debug = uci:get("freifunk", "wizard", "debug") + if debug == "1" then + if data.pw1 then + local stat = luci.sys.user.setpasswd("root", data.pw1) == 0 + if stat then + f.message = translate("a_s_changepw_changed") + else + f.errmessage = translate("unknownerror") + end + end + data.pw1 = nil + data.pw2 = nil + luci.http.redirect(luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path), "system", "system")) + else + if data.pw1 then + local stat = luci.sys.user.setpasswd("root", data.pw1) == 0 +-- if stat then +-- f.message = translate("a_s_changepw_changed") +-- else +-- f.errmessage = translate("unknownerror") + end + data.pw1 = nil + data.pw2 = nil + uci:commit("freifunk") + uci:commit("wireless") + uci:commit("network") + uci:commit("dhcp") + uci:commit("luci_splash") + uci:commit("firewall") + uci:commit("system") + uci:commit("uhttpd") + uci:commit("olsrd") + uci:commit("manager") + if has_autoipv6 then + uci:commit("autoipv6") + end + if has_qos then + uci:commit("qos") + end + if has_l2gvpn then + uci:commit("l2gvpn") + end + if has_radvd then + uci:commit("radvd") + end + luci.http.redirect(luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path), "system", "reboot") .. "?reboot=1") + end + return false + elseif state == FORM_INVALID then + self.errmessage = "Ungültige Eingabe: Bitte die Formularfelder auf Fehler prüfen." + end + return true +end + +local function _strip_internals(tbl) + tbl = tbl or {} + for k, v in pairs(tbl) do + if k:sub(1, 1) == "." then + tbl[k] = nil + end + end + return tbl +end +-- Configure Freifunk checked +function main.write(self, section, value) + if value == "0" then + uci:set("freifunk", "wizard", "netconfig", "0") + uci:save("freifunk") + return + end + -- Collect IP-Address + local community = net:formvalue(section) + + -- Invalidate fields + if not community then + net.tag_missing[section] = true + return + end + + uci:set("freifunk", "wizard", "netconfig", "1") + uci:save("freifunk") + + local external + external = uci:get("freifunk", community, "external") or "" + + local netname = "wireless" + local network + network = ip.IPv4(uci:get("freifunk", community, "mesh_network") or "104.0.0.0/8") + + -- Tune community settings + if community and uci:get("freifunk", community) then + uci:tset("freifunk", "community", uci:get_all("freifunk", community)) + end + + -- Cleanup + uci:delete_all("firewall","zone", {name="freifunk"}) + uci:delete_all("firewall","forwarding", {dest="freifunk"}) + uci:delete_all("firewall","forwarding", {src="freifunk"}) + uci:delete_all("firewall","rule", {dest="freifunk"}) + uci:delete_all("firewall","rule", {src="freifunk"}) + uci:save("firewall") + -- Create firewall zone and add default rules (first time) + -- firewall_create_zone("name" , "input" , "output", "forward ", Masqurade) + local newzone = tools.firewall_create_zone("freifunk", "ACCEPT", "ACCEPT", "REJECT" , true) + if newzone then + uci:foreach("freifunk", "fw_forwarding", function(section) + uci:section("firewall", "forwarding", nil, section) + end) + uci:foreach(external, "fw_forwarding", function(section) + uci:section("firewall", "forwarding", nil, section) + end) + + uci:foreach("freifunk", "fw_rule", function(section) + uci:section("firewall", "rule", nil, section) + end) + uci:foreach(external, "fw_rule", function(section) + uci:section("firewall", "rule", nil, section) + end) + end + uci:save("firewall") + uci:delete("manager", "heartbeat", "interface") + uci:save("manager") + -- Delete olsrdv4 + uci:delete_all("olsrd", "olsrd") + local olsrbase + olsrbase = uci:get_all("freifunk", "olsrd") or {} + util.update(olsrbase, uci:get_all(external, "olsrd") or {}) + olsrbase.IpVersion='6and4' + uci:section("olsrd", "olsrd", nil, olsrbase) + -- Delete olsrdv4 old p2pd settings + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_mdns.so.1.0.0"}) + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_p2pd.so.0.1.0"}) + -- Write olsrdv4 new p2pd settings + uci:section("olsrd", "LoadPlugin", nil, { + library = "olsrd_p2pd.so.0.1.0", + P2pdTtl = 10, + UdpDestPort = "224.0.0.251 5353", + ignore = 1, + }) + -- Delete http plugin + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_httpinfo.so.0.1"}) + + -- Delete olsrdv4 old interface + uci:delete_all("olsrd", "Interface") + uci:delete_all("olsrd", "Hna4") + -- Create wireless ip4/ip6 and firewall config + uci:foreach("wireless", "wifi-device", + function(sec) + local device = sec[".name"] + if not luci.http.formvalue("cbid.ffwizward.1.device_" .. device) then + return + end + node_ip = luci.http.formvalue("cbid.ffwizward.1.meship_" .. device) and ip.IPv4(luci.http.formvalue("cbid.ffwizward.1.meship_" .. device)) + node_ip6 = luci.http.formvalue("cbid.ffwizward.1.meship6_" .. device) and ip.IPv6(luci.http.formvalue("cbid.ffwizward.1.meship6_" .. device)) + if not node_ip or not network or not network:contains(node_ip) then + meship.tag_missing[section] = true + node_ip = nil + return + end + -- rename the wireless interface s/wifi/wireless/ + local nif + if string.find(device, "wifi") then + nif = string.gsub(device,"wifi", netname) + elseif string.find(device, "wl") then + nif = string.gsub(device,"wl", netname) + elseif string.find(device, "wlan") then + nif = string.gsub(device,"wlan", netname) + elseif string.find(device, "radio") then + nif = string.gsub(device,"radio", netname) + end + -- Cleanup + tools.wifi_delete_ifaces(device) + -- tools.network_remove_interface(device) + uci:delete("network", device .. "dhcp") + uci:delete("network", device) + tools.firewall_zone_remove_interface("freifunk", device) + -- tools.network_remove_interface(nif) + uci:delete("network", nif .. "dhcp") + uci:delete("network", nif) + tools.firewall_zone_remove_interface("freifunk", nif) + -- Delete old dhcp + uci:delete("dhcp", device) + uci:delete("dhcp", device .. "dhcp") + uci:delete("dhcp", nif) + uci:delete("dhcp", nif .. "dhcp") + -- Delete old splash + uci:delete_all("luci_splash", "iface", {network=device.."dhcp", zone="freifunk"}) + uci:delete_all("luci_splash", "iface", {network=nif.."dhcp", zone="freifunk"}) + -- Delete old radvd + if has_radvd then + uci:delete_all("radvd", "interface", {interface=nif.."dhcp"}) + uci:delete_all("radvd", "interface", {interface=nif}) + uci:delete_all("radvd", "prefix", {interface=nif.."dhcp"}) + uci:delete_all("radvd", "prefix", {interface=nif}) + end + -- New Config + -- Tune wifi device + local ssiduci = uci:get("freifunk", community, "ssid") + local ssiddot = string.find(ssiduci,'%..*') + local ssidshort + if ssiddot then + ssidshort = string.sub(ssiduci,ssiddot) + else + ssidshort = ssiduci + end + local devconfig = uci:get_all("freifunk", "wifi_device") + util.update(devconfig, uci:get_all(external, "wifi_device") or {}) + local ssid = uci:get("freifunk", community, "ssid") + local channel = luci.http.formvalue("cbid.ffwizward.1.chan_" .. device) + local hwmode = "11bg" + local bssid = "02:CA:FF:EE:BA:BE" + local mrate = 5500 + if channel and channel ~= "default" then + if devconfig.channel ~= channel then + devconfig.channel = channel + local chan = tonumber(channel) + if chan >= 0 and chan < 10 then + bssid = channel .. "2:CA:FF:EE:BA:BE" + ssid = "ch" .. channel .. ssidshort + elseif chan == 10 then + bssid = "02:CA:FF:EE:BA:BE" + ssid = "ch" .. channel .. ssidshort + elseif chan >= 11 and chan <= 14 then + bssid = string.format("%X",channel) .. "2:CA:FF:EE:BA:BE" + ssid = "ch" .. channel .. ssidshort + elseif chan >= 36 and chan <= 64 then + hwmode = "11a" + mrate = "" + outdoor = 0 + bssid = "00:" .. channel ..":CA:FF:EE:EE" + ssid = "ch" .. channel .. ssidshort + elseif chan >= 100 and chan <= 140 then + hwmode = "11a" + mrate = "" + outdoor = 1 + bssid = "01:" .. string.sub(channel, 2) .. ":CA:FF:EE:EE" + ssid = "ch" .. channel .. ssidshort + end + devconfig.hwmode = hwmode + devconfig.outdoor = outdoor + end + end + uci:tset("wireless", device, devconfig) + -- Create wifi iface + local ifconfig = uci:get_all("freifunk", "wifi_iface") + util.update(ifconfig, uci:get_all(external, "wifi_iface") or {}) + ifconfig.device = device + ifconfig.network = nif + if ssid then + -- See Table https://kifuse02.pberg.freifunk.net/moin/channel-bssid-essid + ifconfig.ssid = ssid + else + ifconfig.ssid = "olsr.freifunk.net" + end + -- See Table https://kifuse02.pberg.freifunk.net/moin/channel-bssid-essid + ifconfig.bssid = bssid + ifconfig.encryption="none" + -- Read Preset + local netconfig = uci:get_all("freifunk", "interface") + util.update(netconfig, uci:get_all(external, "interface") or {}) + netconfig.proto = "static" + netconfig.ipaddr = node_ip:string() + netconfig.ip6addr = node_ip6:string() + uci:section("network", "interface", nif, netconfig) + if has_radvd then + uci:section("radvd", "interface", nil, { + interface =nif, + AdvSendAdvert =1, + AdvManagedFlag =0, + AdvOtherConfigFlag =0, + ignore =0 + }) + uci:section("radvd", "prefix", nil, { + interface =nif, + AdvOnLink =1, + AdvAutonomous =1, + AdvRouterAddr =0, + ignore =0, + }) + uci:save("radvd") + end + local new_hostname = node_ip:string():gsub("%.", "-") + uci:set("freifunk", "wizard", "hostname", new_hostname) + uci:save("freifunk") + tools.firewall_zone_add_interface("freifunk", nif) + uci:save("firewall") + -- Write new olsrv4 interface + local olsrifbase = uci:get_all("freifunk", "olsr_interface") + util.update(olsrifbase, uci:get_all(external, "olsr_interface") or {}) + olsrifbase.interface = nif + olsrifbase.ignore = "0" + uci:section("olsrd", "Interface", nil, olsrifbase) + -- Collect MESH DHCP IP NET + local client = luci.http.formvalue("cbid.ffwizward.1.client_" .. device) + if client then + local dhcpmeshnet = luci.http.formvalue("cbid.ffwizward.1.dhcpmesh_" .. device) and ip.IPv4(luci.http.formvalue("cbid.ffwizward.1.dhcpmesh_" .. device)) + local ifacelist = uci:get_list("manager", "heartbeat", "interface") or {} + table.insert(ifacelist,nif .. "dhcp") + uci:set_list("manager", "heartbeat", "interface", ifacelist) + uci:save("manager") + if dhcpmeshnet then + if not dhcpmeshnet:minhost() or not dhcpmeshnet:mask() then + dhcpmesh.tag_missing[section] = true + dhcpmeshnet = nil + return + end + dhcp_ip = dhcpmeshnet:minhost():string() + dhcp_mask = dhcpmeshnet:mask():string() + dhcp_network = dhcpmeshnet:network():string() + uci:section("olsrd", "Hna4", nil, { + netmask = dhcp_mask, + netaddr = dhcp_network + }) + uci:foreach("olsrd", "LoadPlugin", + function(s) + if s.library == "olsrd_p2pd.so.0.1.0" then + uci:set("olsrd", s['.name'], "ignore", "0") + local nonolsr = uci:get("olsrd", s['.name'], "NonOlsrIf") or "" + vap = luci.http.formvalue("cbid.ffwizward.1.vap_" .. device) + if vap then + nonolsr = nif.."dhcp "..nonolsr + else + nonolsr = nif.." "..nonolsr + end + uci:set("olsrd", s['.name'], "NonOlsrIf", nonolsr) + end + end) + else + local subnet_prefix = tonumber(uci:get("freifunk", community, "splash_prefix")) or 27 + local pool_network = uci:get("freifunk", community, "splash_network") or "10.104.0.0/16" + local pool = luci.ip.IPv4(pool_network) + local ip = tostring(node_ip) + if pool and ip then + local hosts_per_subnet = 2^(32 - subnet_prefix) + local number_of_subnets = (2^pool:prefix())/hosts_per_subnet + local seed1, seed2 = ip:match("(%d+)%.(%d+)$") + if seed1 and seed2 then + math.randomseed(seed1 * seed2) + end + local subnet = pool:add(hosts_per_subnet * math.random(number_of_subnets)) + dhcp_ip = subnet:network(subnet_prefix):add(1):string() + dhcp_mask = subnet:mask(subnet_prefix):string() + end + end + if dhcp_ip and dhcp_mask then + -- Create alias + local aliasbase = uci:get_all("freifunk", "alias") + util.update(aliasbase, uci:get_all(external, "alias") or {}) + aliasbase.ipaddr = dhcp_ip + aliasbase.netmask = dhcp_mask + aliasbase.proto = "static" + vap = luci.http.formvalue("cbid.ffwizward.1.vap_" .. device) + if vap then + uci:section("network", "interface", nif .. "dhcp", aliasbase) + uci:section("wireless", "wifi-iface", nil, { + device =device, + mode ="ap", + encryption ="none", + network =nif.."dhcp", + ssid ="AP"..ssidshort + }) + if has_radvd then + uci:section("radvd", "interface", nil, { + interface =nif .. "dhcp", + AdvSendAdvert =1, + AdvManagedFlag =0, + AdvOtherConfigFlag =0, + ignore =0 + }) + uci:section("radvd", "prefix", nil, { + interface =nif .. "dhcp", + AdvOnLink =1, + AdvAutonomous =1, + AdvRouterAddr =0, + ignore =0 + }) + uci:save("radvd") + end + tools.firewall_zone_add_interface("freifunk", nif .. "dhcp") + uci:save("wireless") + ifconfig.mcast_rate = nil + ifconfig.encryption="none" + else + aliasbase.interface = nif + uci:section("network", "alias", nif .. "dhcp", aliasbase) + end + -- Create dhcp + local dhcpbase = uci:get_all("freifunk", "dhcp") + util.update(dhcpbase, uci:get_all(external, "dhcp") or {}) + dhcpbase.interface = nif .. "dhcp" + dhcpbase.force = 1 + uci:section("dhcp", "dhcp", nif .. "dhcp", dhcpbase) + uci:set_list("dhcp", nif .. "dhcp", "dhcp_option", "119,olsr") + -- Create firewall settings + 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" + }) + uci:section("firewall", "rule", nil, { + src="freifunk", + proto="udp", + src_port="68", + 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" + }) + -- Register splash + uci:section("luci_splash", "iface", nil, {network=nif.."dhcp", zone="freifunk"}) + uci:save("luci_splash") + -- Make sure that luci_splash is enabled + sys.init.enable("luci_splash") + end + else + -- Delete old splash + uci:delete_all("luci_splash", "iface", {network=device.."dhcp", zone="freifunk"}) + end + --Write Ad-Hoc wifi section after AP wifi section + uci:section("wireless", "wifi-iface", nil, ifconfig) + uci:save("network") + uci:save("wireless") + uci:save("network") + uci:save("firewall") + uci:save("dhcp") + end) + -- Create wired ip and firewall config + uci:foreach("network", "interface", + function(sec) + local device = sec[".name"] + if not luci.http.formvalue("cbid.ffwizward.1.device_" .. device) then + return + end + if device ~= "loopback" and not string.find(device, "wifi") and not string.find(device, "wl") and not string.find(device, "wlan") and not string.find(device, "wireless") and not string.find(device, "radio") then + local node_ip + node_ip = luci.http.formvalue("cbid.ffwizward.1.meship_" .. device) and ip.IPv4(luci.http.formvalue("cbid.ffwizward.1.meship_" .. device)) + node_ip6 = luci.http.formvalue("cbid.ffwizward.1.meship6_" .. device) and ip.IPv6(luci.http.formvalue("cbid.ffwizward.1.meship6_" .. device)) + if not node_ip or not network or not network:contains(node_ip) then + meship.tag_missing[section] = true + node_ip = nil + return + end + -- Cleanup + tools.firewall_zone_remove_interface(device, device) + uci:delete_all("firewall","zone", {name=device}) + uci:delete_all("firewall","forwarding", {src=device}) + uci:delete_all("firewall","forwarding", {dest=device}) + uci:delete("network", device .. "dhcp") + -- Delete old dhcp + uci:delete("dhcp", device) + uci:delete("dhcp", device .. "dhcp") + -- Delete old splash + uci:delete_all("luci_splash", "iface", {network=device.."dhcp", zone="freifunk"}) + if has_radvd then + uci:delete_all("radvd", "interface", {interface=device.."dhcp"}) + uci:delete_all("radvd", "interface", {interface=device}) + uci:delete_all("radvd", "prefix", {interface=device.."dhcp"}) + uci:delete_all("radvd", "prefix", {interface=device}) + end + -- New Config + local netconfig = uci:get_all("freifunk", "interface") + util.update(netconfig, uci:get_all(external, "interface") or {}) + netconfig.proto = "static" + netconfig.ipaddr = node_ip:string() + netconfig.ip6addr = node_ip6:string() + uci:section("network", "interface", device, netconfig) + uci:save("network") + if has_radvd then + uci:section("radvd", "interface", nil, { + interface =device, + AdvSendAdvert =1, + AdvManagedFlag =0, + AdvOtherConfigFlag =0, + ignore =0 + }) + uci:section("radvd", "prefix", nil, { + interface =device, + AdvOnLink =1, + AdvAutonomous =1, + AdvRouterAddr =0, + ignore =0, + }) + uci:save("radvd") + end + local new_hostname = node_ip:string():gsub("%.", "-") + uci:set("freifunk", "wizard", "hostname", new_hostname) + uci:save("freifunk") + tools.firewall_zone_add_interface("freifunk", device) + uci:save("firewall") + -- Write new olsrv4 interface + local olsrifbase = uci:get_all("freifunk", "olsr_interface") + util.update(olsrifbase, uci:get_all(external, "olsr_interface") or {}) + olsrifbase.interface = device + olsrifbase.ignore = "0" + uci:section("olsrd", "Interface", nil, olsrifbase) + olsrifbase.Mode = 'ether' + -- Collect MESH DHCP IP NET + local client = luci.http.formvalue("cbid.ffwizward.1.client_" .. device) + if client then + local dhcpmeshnet = luci.http.formvalue("cbid.ffwizward.1.dhcpmesh_" .. device) and ip.IPv4(luci.http.formvalue("cbid.ffwizward.1.dhcpmesh_" .. device)) + local ifacelist = uci:get_list("manager", "heartbeat", "interface") or {} + table.insert(ifacelist,device .. "dhcp") + uci:set_list("manager", "heartbeat", "interface", ifacelist) + uci:save("manager") + if dhcpmeshnet then + if not dhcpmeshnet:minhost() or not dhcpmeshnet:mask() then + dhcpmesh.tag_missing[section] = true + dhcpmeshnet = nil + return + end + dhcp_ip = dhcpmeshnet:minhost():string() + dhcp_mask = dhcpmeshnet:mask():string() + dhcp_network = dhcpmeshnet:network():string() + uci:section("olsrd", "Hna4", nil, { + netmask = dhcp_mask, + netaddr = dhcp_network + }) + uci:foreach("olsrd", "LoadPlugin", + function(s) + if s.library == "olsrd_p2pd.so.0.1.0" then + uci:set("olsrd", s['.name'], "ignore", "0") + local nonolsr = uci:get("olsrd", s['.name'], "NonOlsrIf") or "" + uci:set("olsrd", s['.name'], "NonOlsrIf", device .." ".. nonolsr) + end + end) + else + local subnet_prefix = tonumber(uci:get("freifunk", community, "splash_prefix")) or 27 + local pool_network = uci:get("freifunk", community, "splash_network") or "10.104.0.0/16" + local pool = luci.ip.IPv4(pool_network) + local ip = tostring(node_ip) + if pool and ip then + local hosts_per_subnet = 2^(32 - subnet_prefix) + local number_of_subnets = (2^pool:prefix())/hosts_per_subnet + local seed1, seed2 = ip:match("(%d+)%.(%d+)$") + if seed1 and seed2 then + math.randomseed(seed1 * seed2) + end + local subnet = pool:add(hosts_per_subnet * math.random(number_of_subnets)) + dhcp_ip = subnet:network(subnet_prefix):add(1):string() + dhcp_mask = subnet:mask(subnet_prefix):string() + end + end + if dhcp_ip and dhcp_mask then + -- Create alias + local aliasbase = uci:get_all("freifunk", "alias") + util.update(aliasbase, uci:get_all(external, "alias") or {}) + aliasbase.interface = device + aliasbase.ipaddr = dhcp_ip + aliasbase.netmask = dhcp_mask + aliasbase.proto = "static" + uci:section("network", "alias", device .. "dhcp", aliasbase) + -- Create dhcp + local dhcpbase = uci:get_all("freifunk", "dhcp") + util.update(dhcpbase, uci:get_all(external, "dhcp") or {}) + dhcpbase.interface = device .. "dhcp" + dhcpbase.force = 1 + uci:section("dhcp", "dhcp", device .. "dhcp", dhcpbase) + uci:set_list("dhcp", device .. "dhcp", "dhcp_option", "119,olsr") + -- Create firewall settings + 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" + }) + uci:section("firewall", "rule", nil, { + src="freifunk", + proto="udp", + src_port="68", + 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" + }) + -- Register splash + uci:section("luci_splash", "iface", nil, {network=device.."dhcp", zone="freifunk"}) + uci:save("luci_splash") + -- Make sure that luci_splash is enabled + sys.init.enable("luci_splash") + end + end + uci:save("wireless") + uci:save("network") + uci:save("firewall") + uci:save("dhcp") + end + end) + --enable radvd + if has_radvd then + sys.init.enable("radvd") + 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) + + if not has_advanced then + uci:section("firewall", "advanced", nil, + { tcp_ecn = "0", ip_conntrack_max = "8192", tcp_westwood = "1" }) + end + uci:save("wireless") + uci:save("network") + uci:save("firewall") + uci:save("dhcp") + + local new_hostname = uci:get("freifunk", "wizard", "hostname") + local old_hostname = sys.hostname() + + local dhcphb = hb:formvalue(section) + if dhcphb then + uci:set("manager", "heartbeat", "enabled", "1") + -- Make sure that heartbeat is enabled + sys.init.enable("machash") + + else + uci:set("manager", "heartbeat", "enabled", "0") + -- Make sure that heartbeat is enabled + sys.init.disable("machash") + end + uci:save("manager") + + local custom_hostname = hostname:formvalue(section) + uci:foreach("system", "system", + function(s) + -- Make crond silent + uci:set("system", s['.name'], "cronloglevel", "10") + -- Make set timzone and zonename + uci:set("system", s['.name'], "zonename", "Europe/Berlin") + uci:set("system", s['.name'], "timezone", 'CET-1CEST,M3.5.0,M10.5.0/3') + -- Set hostname + if custom_hostname then + uci:set("system", s['.name'], "hostname", custom_hostname) + sys.hostname(custom_hostname) + else + if new_hostname then + if old_hostname == "OpenWrt" or old_hostname:match("^%d+-%d+-%d+-%d+$") then + uci:set("system", s['.name'], "hostname", new_hostname) + sys.hostname(new_hostname) + end + end + end + end) + + -- Create time rdate_servers + local rdate = uci:get_all("freifunk", "time") + uci:delete_all("system", "time") + uci:section("system", "time", "rdate_servers", rdate) + rdate.server = rdate.rdate_servers + rdate.rdate_servers = "" + uci:delete_all("system", "rdate", nil) + uci:section("system", "rdate", nil, rdate) + uci:save("system") + + -- Create http splash port 8082 + uci:set_list("uhttpd","main","listen_http",{"80"}) + uci:set_list("uhttpd","main","listen_https",{"443"}) + uci:save("uhttpd") + + -- Read geos + local latval = tonumber(lat:formvalue(section)) + local lonval = tonumber(lon:formvalue(section)) + + -- Save latlon to system too + if latval and lonval then + uci:foreach("system", "system", function(s) + uci:set("system", s[".name"], "latlon",string.format("%.15f %.15f", latval, lonval)) + uci:set("system", s[".name"], "latitude",string.format("%.15f", latval)) + uci:set("system", s[".name"], "longitude",string.format("%.15f", lonval)) + end) + else + uci:foreach("system", "system", function(s) + uci:delete("system", s[".name"], "latlon") + uci:delete("system", s[".name"], "latitude") + uci:delete("system", s[".name"], "longitude") + end) + end + -- 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" + }) + + -- Delete old nameservice settings + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_nameservice.so.0.3"}) + -- Write new nameservice settings + uci:section("olsrd", "LoadPlugin", nil, { + library = "olsrd_nameservice.so.0.3", + suffix = ".olsr", + hosts_file = "/var/etc/hosts.olsr", + latlon_file = "/var/run/latlon.js", + lat = latval and string.format("%.15f", latval) or "", + lon = lonval and string.format("%.15f", lonval) or "", + services_file = "/var/etc/services.olsr" + }) + + -- Import hosts and set domain + uci:foreach("dhcp", "dnsmasq", function(s) + uci:set_list("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr") + uci:set("dhcp", s[".name"], "local", "/olsr/") + uci:set("dhcp", s[".name"], "domain", "olsr") + end) + + -- Make sure that OLSR is enabled + sys.init.enable("olsrd") + + uci:save("olsrd") + uci:save("dhcp") + -- Import hosts and set domain + uci:foreach("dhcp", "dnsmasq", function(s) + uci:set_list("dhcp", s[".name"], "addnhosts", {"/var/etc/hosts.olsr","/var/etc/hosts.olsr.ipv6"}) + end) + + uci:save("dhcp") + + -- Internet sharing + local share_value = share:formvalue(section) + if share_value == "1" then + uci:set("freifunk", "wizard", "netconfig", "1") + uci:section("firewall", "forwarding", nil, {src="freifunk", dest="wan"}) + -- Set autoipv6 tunnel mode + uci:set("autoipv6", "olsr_node", "enable", "0") + uci:set("autoipv6", "tunnel", "enable", "1") + uci:save("autoipv6") + -- Delete/Disable gateway plugin + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw.so.0.5"}) + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw_plain.so.0.4"}) + -- Enable gateway_plain plugin + uci:section("olsrd", "LoadPlugin", nil, {library="olsrd_dyn_gw_plain.so.0.4"}) + sys.exec("chmod +x /etc/init.d/freifunk-p2pblock") + sys.init.enable("freifunk-p2pblock") + sys.init.enable("qos") + sys.exec('grep wan /etc/crontabs/root >/dev/null || echo "0 6 * * * ifup wan" >> /etc/crontabs/root') + + if wansec:formvalue(section) == "1" then + uci:foreach("firewall", "zone", + function(s) + if s.name == "wan" then + uci:set("firewall", s['.name'], "local_restrict", "1") + return false + end + end) + end + else + uci:set("freifunk", "wizard", "netconfig", "0") + uci:save("freifunk") + -- Set autoipv6 olsrd mode + uci:set("autoipv6", "olsr_node", "enable", "1") + uci:set("autoipv6", "tunnel", "enable", "0") + uci:save("autoipv6") + -- Delete gateway plugins + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw.so.0.5"}) + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw_plain.so.0.4"}) + -- Disable gateway_plain plugin + uci:section("olsrd", "LoadPlugin", nil, { + library = "olsrd_dyn_gw_plain.so.0.4", + ignore = 1, + }) + sys.init.disable("freifunk-p2pblock") + sys.init.disable("qos") + sys.exec("chmod -x /etc/init.d/freifunk-p2pblock") + uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"}) + uci:foreach("firewall", "zone", + function(s) + if s.name == "wan" then + uci:delete("firewall", s['.name'], "local_restrict") + return false + end + end) + end + -- Write gvpn dummy interface + if has_l2gvpn then + if gvpn then + local vpn = gvpn:formvalue(section) + if vpn then + uci:delete_all("l2gvpn", "l2gvpn") + uci:delete_all("l2gvpn", "node") + uci:delete_all("l2gvpn", "supernode") + -- Write olsr tunnel interface options + local olsr_gvpnifbase = uci:get_all("freifunk", "olsr_gvpninterface") + util.update(olsr_gvpnifbase, uci:get_all(external, "olsr_gvpninterface") or {}) + uci:section("olsrd", "Interface", nil, olsr_gvpnifbase) + local vpnip = gvpnip:formvalue(section) + local gvpnif = uci:get_all("freifunk", "gvpn_node") + util.update(gvpnif, uci:get_all(external, "gvpn_node") or {}) + if gvpnif and gvpnif.tundev and vpnip then + uci:section("network", "interface", gvpnif.tundev, { + ifname =gvpnif.tundev , + proto ="static" , + ipaddr =vpnip , + netmask =gvpnif.subnet or "255.255.255.192" , + }) + gvpnif.ip="" + gvpnif.subnet="" + gvpnif.up="" + gvpnif.down="" + gvpnif.mac="00:00:48:"..string.format("%X",string.gsub( vpnip, ".*%." , "" ))..":00:00" + tools.firewall_zone_add_interface("freifunk", gvpnif.tundev) + uci:section("l2gvpn", "node" , gvpnif.community , gvpnif) + uci:save("network") + uci:save("l2gvpn") + uci:save("firewall") + uci:save("olsrd") + sys.init.enable("l2gvpn") + end + else + -- Disable l2gvpn + sys.exec("/etc/init.d/l2gvpn stop") + sys.init.disable("l2gvpn") + end + end + end + + uci:save("freifunk") + uci:save("firewall") + uci:save("olsrd") + uci:save("system") +end + +return f + diff --git a/applications/luci-ffwizard/luasrc/tools/ffwizard.lua b/applications/luci-ffwizard/luasrc/tools/ffwizard.lua new file mode 100644 index 0000000000..217cd44bb8 --- /dev/null +++ b/applications/luci-ffwizard/luasrc/tools/ffwizard.lua @@ -0,0 +1,149 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth <steven@midlink.org> +Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ + +]]-- + +local uci = require "luci.model.uci" +local util = require "luci.util" +local table = require "table" + +local type = type + +module "luci.tools.ffwizard" + +-- Deletes all references of a wifi device +function wifi_delete_ifaces(device) + local cursor = uci.cursor() + cursor:delete_all("wireless", "wifi-iface", {device=device}) + cursor:save("wireless") +end + +-- Deletes a network interface and all occurences of it in firewall zones and dhcp +function network_remove_interface(iface) + local cursor = uci.cursor() + + if not cursor:delete("network", iface) then + return false + end + + local aliases = {iface} + cursor:foreach("network", "alias", + function(section) + if section.interface == iface then + table.insert(aliases, section[".name"]) + end + end) + + -- Delete Aliases and Routes + cursor:delete_all("network", "route", {interface=iface}) + cursor:delete_all("network", "alias", {interface=iface}) + + -- Delete DHCP sections + cursor:delete_all("dhcp", "dhcp", + function(section) + return util.contains(aliases, section.interface) + end) + + -- Remove OLSR sections + cursor:delete_all("olsrd", "Interface", {Interface=iface}) + + -- Remove Splash sections + cursor:delete_all("luci-splash", "iface", {network=iface}) + + cursor:save("network") + cursor:save("olsr") + cursor:save("dhcp") + cursor:save("luci-splash") +end + +-- Creates a firewall zone +function firewall_create_zone(zone, input, output, forward, masq) + local cursor = uci.cursor() + if not firewall_find_zone(zone) then + local stat = cursor:section("firewall", "zone", nil, { + input = input, + output = output, + forward = forward, + masq = masq and "1", + name = zone + }) + cursor:save("firewall") + return stat + end +end + +-- Adds interface to zone, creates zone on-demand +function firewall_zone_add_interface(name, interface) + local cursor = uci.cursor() + local zone = firewall_find_zone(name) + local net = cursor:get("firewall", zone, "network") + local old = net or (cursor:get("network", name) and name) + cursor:set("firewall", zone, "network", (old and old .. " " or "") .. interface) + cursor:save("firewall") +end + +-- Removes interface from zone +function firewall_zone_remove_interface(name, interface) + local cursor = uci.cursor() + local zone = firewall_find_zone(name) + if zone then + local net = cursor:get("firewall", zone, "network") + local new = remove_list_entry(net, interface) + if new then + if #new > 0 then + cursor:set("firewall", zone, "network", new) + else + cursor:delete("firewall", zone, "network") + end + cursor:save("firewall") + end + end +end + + +-- Finds the firewall zone with given name +function firewall_find_zone(name) + local find + + uci.cursor():foreach("firewall", "zone", + function (section) + if section.name == name then + find = section[".name"] + end + end) + + return find +end + + + +-- Helpers -- + +-- Removes a listentry, handles real and pseduo lists transparently +function remove_list_entry(value, entry) + if type(value) == "nil" then + return nil + end + + local result = type(value) == "table" and value or util.split(value, " ") + local key = util.contains(result, entry) + + while key do + table.remove(result, key) + key = util.contains(result, entry) + end + + result = type(value) == "table" and result or table.concat(result, " ") + return result ~= value and result +end diff --git a/applications/luci-ffwizard/luasrc/view/cbi/osmll_value.htm b/applications/luci-ffwizard/luasrc/view/cbi/osmll_value.htm new file mode 100644 index 0000000000..07bd7582b6 --- /dev/null +++ b/applications/luci-ffwizard/luasrc/view/cbi/osmll_value.htm @@ -0,0 +1,116 @@ +<%# +cc-by-sa Andreas Pittrich <andreas.pittrich@web.de> +in behalf of the german pirate party (Piratenpartei) +www.piratenpartei.de + +$Id$ + +-%> +<%+cbi/valueheader%> +<script type="text/javascript"> +function set_lat_lon() { + var net + var entry + var lon + var lat + var zoom + net = document.getElementById('cbid.ffwizward.1.net').value; + if (!net){ + return + } + + lon = document.getElementById('cbid.ffwizward.1.latlon.centerlon'); + lat = document.getElementById('cbid.ffwizward.1.latlon.centerlat'); + zoom = document.getElementById('cbid.ffwizward.1.latlon.zoom'); + if ( !lon.value || lon.value == '' || lon.value == 0 || lon.value == 10 ) { + for ( var i = 0 ; true ; i++ ) { + if (i == cbi_d.length) { + break; + } + if (cbi_d[i].id == 'cbi-ffwizward-1-net_lon') { + entry = cbi_d[i]; + for (var j=0; true; j++) { + if ( entry.node.children[0].children[j] ){ + if ( entry.node.children[0].children[j].value == net ) { + lon.value = entry.node.children[0].children[j].text; + zoom.value = '14'; + break; + } + } else { + break; + } + } + break; + } + } + } + if ( !lat.value || lat.value == '' || lat.value == 0 || lat.value == 52 ) { + for (var i=0; true; i++) { + if (i == cbi_d.length) { + break; + } + if (cbi_d[i].id == 'cbi-ffwizward-1-net_lat') { + entry = cbi_d[i]; + for (var j=0; true; j++) { + if ( entry.node.children[0].children[j] ){ + if ( entry.node.children[0].children[j].value == net ) { + lat.value = entry.node.children[0].children[j].text; + break; + } + } else { + break; + } + } + break; + } + } + } +} +</script> + + <% if self:cfgvalue(section) ~= false then %> + <% if self.latfield and self.lonfield then %> + <input type="hidden" <%= attr("value", string.format('cbid.%s.%s.%s', self.config, section, self.latfield))..attr("id", cbid..".latfield")..attr("name", cbid..".latfield")%>/> + <input type="hidden" <%= attr("value", string.format('cbid.%s.%s.%s', self.config, section, self.lonfield))..attr("id", cbid..".lonfield")..attr("name", cbid..".lonfield")%>/> + <% end %> + <input type="hidden" <%= attr("value", self.centerlat)..attr("id", cbid..".centerlat")..attr("name", cbid..".centerlat")%>/> + <input type="hidden" <%= attr("value", self.centerlon)..attr("id", cbid..".centerlon")..attr("name", cbid..".centerlon")%>/> + <input type="hidden" <%= attr("value", self.zoom)..attr("id", cbid..".zoom")..attr("name", cbid..".zoom")%>/> + <% end %> + + <% if self.popup then %> + <input class="cbi-input-button" type="button"<%= attr("name", cbid..".button")..attr("id", cbid..".button")..attr("value", self.displaytext)%> + onclick=" + popup=window.open('/luci-static/resources/OSMLatLon.htm', '<%=cbid%>.window', 'innerWidth=<%=self.width%>, innerHeight=<%=self.height%>, location=no, menubar=no, scrollbars=no, status=no, toolbar=no'); + popup.focus(); + " + /> + </div> + <div> + <% else %> + <input class="cbi-input-button" type="button"<%= attr("name", cbid..".displayosm")..attr("id", cbid..".displayosm")..attr("value", self.displaytext)%> + onclick=" + set_lat_lon(); + document.getElementById('<%=cbid..".hideosm"%>').style.display='inline'; + document.getElementById('<%=cbid..".displayosm"%>').style.display='none'; + for(var i = 0; Math.min(i, window.frames.length)!=window.frames.lengths; i++){ + if(frames[i].name=='<%=cbid..".iframe"%>'){ + document.getElementById('<%=cbid..".iframediv"%>').style.display='block'; + frames[i].location.href='/luci-static/resources/OSMLatLon.htm'; + } + } + " + /> + <input class="cbi-input-button" style="display:none" type="button"<%= attr("name", cbid..".hideosm")..attr("id", cbid..".hideosm")..attr("value", self.hidetext)%> + onclick=" + document.getElementById('<%=cbid..".displayosm"%>').style.display='inline'; + document.getElementById('<%=cbid..".hideosm"%>').style.display='none'; + document.getElementById('<%=cbid..".iframediv"%>').style.display='none'; + " + /> + </div> + <div class="cbi-value-osmiframesection" id="<%=cbid..".iframediv"%>" style="display:none"> + <iframe src="" <%= attr("id", cbid..".iframe")..attr("name", cbid..".iframe")..attr("width", self.width)..attr("height", self.height)%> frameborder="0" scrolling="no"></iframe> + <%end%> + +<%+cbi/valuefooter%> diff --git a/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults b/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults new file mode 100644 index 0000000000..d9ef3d9add --- /dev/null +++ b/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults @@ -0,0 +1,80 @@ +#!/bin/sh + +set_default_config() +{ + local cfg="$1" + config_get type "$cfg" "type" + case $type in + atheros) + uci set freifunk.wifi_device.channel=1 + uci set freifunk.wifi_device.diversity=0 + uci set freifunk.wifi_device.txantenna=1 + uci set freifunk.wifi_device.rxantenna=1 + uci set freifunk.wifi_device.disabled=0 + uci set freifunk.wifi_device.txpower="" + uci set freifunk.wifi_device.country=276 + uci set freifunk.wifi_device.regdomain="0x37" + uci set freifunk.wifi_device.outdoor="1" + uci set freifunk.wifi_device.hwmode=11g + uci set freifunk.wifi_device.distance=1000 + uci set freifunk.wifi_iface=defaults + uci set freifunk.wifi_iface.mode=adhoc + uci set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" + uci set freifunk.wifi_iface.sw_merge=1 + uci set freifunk.wifi_iface.mcast_rate=5500 + uci set freifunk.wifi_iface.probereq=1 + uci commit freifunk + ;; + mac80211) + uci set freifunk.wifi_device.channel=1 + uci set freifunk.wifi_device.diversity="" + uci set freifunk.wifi_device.disabled=0 + uci set freifunk.wifi_device.txpower="" + uci set freifunk.wifi_device.country=DE + uci set freifunk.wifi_device.distance=1000 + uci set freifunk.wifi_device.htmode='HT40-' + uci set freifunk.wifi_device.hwmode=11ng + uci set freifunk.wifi_iface=defaults + uci set freifunk.wifi_iface.mode=adhoc + uci set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" + uci set freifunk.wifi_iface.sw_merge="" + uci commit freifunk + ;; + broadcom) + uci set freifunk.wifi_device.channel=1 + uci set freifunk.wifi_device.diversity="" + uci set freifunk.wifi_device.disabled=0 + uci set freifunk.wifi_device.txpower="" + uci set freifunk.wifi_device.country=DE + uci set freifunk.wifi_device.txantenna=0 + uci set freifunk.wifi_device.rxantenna=0 + uci set freifunk.wifi_device.hwmode=11g + uci set freifunk.wifi_device.distance=1000 + uci set freifunk.wifi_iface=defaults + uci set freifunk.wifi_iface.encryption=none + uci set freifunk.wifi_iface.mode=adhoc + uci set freifunk.wifi_iface.bssid="02:CA:FF:EE:BA:BE" + uci set freifunk.wifi_iface.sw_merge="" + uci commit freifunk + ;; + esac +} + + + +( +while true ; do + sleep 30 + wifie=0 + + config_load wireless && wifie=1 + + if [ $wifie -eq 1 ] ; then + config_foreach set_default_config wifi-device + + uci set freifunk.interface.dns="88.198.178.18 141.54.1.1 212.204.49.83 8.8.8.8 8.8.4.4" + uci commit freifunk + exit 0 + fi +done +) >/dev/null & diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 334467c4cf..2151fe951e 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -321,6 +321,9 @@ endef $(eval $(call application,ffwizard-leipzig,Freifunk Leipzig configuration wizard)) +$(eval $(call application,ffwizard,Freifunk configuration wizard, + +PACKAGE_luci-mod-freifunk)) + $(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\ +PACKAGE_luci-app-siitwizard:kmod-siit)) |