X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ffwizard-leipzig%2Fluasrc%2Fmodel%2Fcbi%2Fffwizard.lua;h=780316c4a017085d2ff2e7967df2153d0658f3ab;hp=cd737c9854478b41add76e564fbb4f9f0d530d6a;hb=9c03a76fc28dac4efe4714f0e61bb41bf2784ef7;hpb=05f350547e275e23062892227e20d536709ef99a diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua index cd737c9854..780316c4a0 100644 --- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua +++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua @@ -17,6 +17,30 @@ $Id$ local uci = require "luci.model.uci".cursor() local tools = require "luci.tools.ffwizard" +local util = require "luci.util" +local sys = require "luci.sys" +local ip = require "luci.ip" + +local function mksubnet(community, meship) + 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) + + if pool then + local hosts_per_subnet = 2^(32 - subnet_prefix) + local number_of_subnets = (2^pool:prefix())/hosts_per_subnet + + local seed1, seed2 = meship:match("(%d+)%.(%d+)$") + math.randomseed(seed1 * seed2) + + local subnet = pool:add(hosts_per_subnet * math.random(number_of_subnets)) + + local subnet_ipaddr = subnet:network(subnet_prefix):add(1):string() + local subnet_netmask = subnet:mask(subnet_prefix):string() + + return subnet_ipaddr, subnet_netmask + end +end -------------------- View -------------------- @@ -33,11 +57,13 @@ uci:foreach("wireless", "wifi-device", main = f:field(Flag, "wifi", "Freifunkzugang einrichten") -net = f:field(Value, "net", "Freifunknetz") +net = f:field(Value, "net", "Freifunk Community", "Mesh Netzbereich") net.rmempty = true net:depends("wifi", "1") -net:value("104.61", "Leipzig (104.61)") -net:value("104.62", "Halle (104.62)") +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 @@ -46,47 +72,64 @@ function net.write(self, section, value) uci:save("freifunk") end - -subnet = f:field(ListValue, "subnet", "Subnetz (Projekt)") -subnet.rmempty = true -subnet:depends("wifi", "1") -for i=0, 255 do - subnet:value(i) -end -function subnet.cfgvalue(self, section) - return uci:get("freifunk", "wizard", "subnet") +meship = f:field(Value, "meship", "Mesh IP Adresse", "Netzweit eindeutige Identifikation") +meship.rmempty = true +meship:depends("wifi", "1") +function meship.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "meship") end -function subnet.write(self, section, value) - uci:set("freifunk", "wizard", "subnet", value) +function meship.write(self, section, value) + uci:set("freifunk", "wizard", "meship", value) uci:save("freifunk") end - -node = f:field(Value, "node", "Knoten") -node.rmempty = true -node:depends("wifi", "1") -for i=1, 51 do - node:value(i) -end -function node.cfgvalue(self, section) - return uci:get("freifunk", "wizard", "node") -end -function node.write(self, section, value) - uci:set("freifunk", "wizard", "node", value) - uci:save("freifunk") +function meship.validate(self, value) + local x = ip.IPv4(value) + return ( x and x:prefix() == 32 ) and x:string() or "" end client = f:field(Flag, "client", "WLAN-DHCP anbieten") client:depends("wifi", "1") - +client.rmempty = false +function client.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "dhcp_splash") or "0" +end olsr = f:field(Flag, "olsr", "OLSR einrichten") +olsr.rmempty = true + +lat = f:field(Value, "lat", "Latitude") +lat:depends("olsr", "1") +function lat.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "latitude") +end +function lat.write(self, section, value) + uci:set("freifunk", "wizard", "latitude", value) + uci:save("freifunk") +end -share = f:field(ListValue, "sharenet", "Eigenen Internetzugang freigeben") -share:value("maybe", "-- keine Aktion --") -share:value("yes", "einschalten") -share:value("no", "ausschalten") +lon = f:field(Value, "lon", "Longitude") +lon:depends("olsr", "1") +function lon.cfgvalue(self, section) + return uci:get("freifunk", "wizard", "longitude") +end +function lon.write(self, section, value) + uci:set("freifunk", "wizard", "longitude", value) + uci:save("freifunk") +end +share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben") +share.rmempty = true +wansec = f:field(Flag, "wansec", "WAN-Zugriff auf Gateway beschränken") +wansec.rmempty = false +wansec:depends("sharenet", "1") +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 -------------------- Control -------------------- function f.handle(self, state, data) @@ -114,73 +157,135 @@ function main.write(self, section, value) if value == "0" then return end - + local device = dev:formvalue(section) + local node_ip, external -- Collect IP-Address - local inet = net:formvalue(section) - local isubnet = subnet:formvalue(section) - local inode = node:formvalue(section) - + local community = net:formvalue(section) + -- Invalidate fields - if not inet then + if not community then net.tag_missing[section] = true + else + external = uci:get("freifunk", community, "external") or "" + network = ip.IPv4(uci:get("freifunk", community, "mesh_network") or "104.0.0.0/8") + node_ip = meship:formvalue(section) and ip.IPv4(meship:formvalue(section)) + + if not node_ip or not network or not network:contains(node_ip) then + meship.tag_missing[section] = true + node_ip = nil + end end - if not isubnet then - subnet.tag_missing[section] = true - end - if not inode then - node.tag_missing[section] = true - end - - if not inet or not isubnet or not inode then - return - end - - local ip = "%s.%s.%s" % {inet, isubnet, inode} - - + + if not node_ip then return end + + -- Cleanup tools.wifi_delete_ifaces(device) tools.network_remove_interface(device) tools.firewall_zone_remove_interface("freifunk", device) - - + + -- Tune community settings + if community and uci:get("freifunk", community) then + uci:tset("freifunk", "community", uci:get_all("freifunk", community)) + end + -- Tune wifi device - local devconfig = _strip_internals(uci:get_all("freifunk", "wifi_device")) + local devconfig = uci:get_all("freifunk", "wifi_device") + util.update(devconfig, uci:get_all(external, "wifi_device") or {}) uci:tset("wireless", device, devconfig) - + -- Create wifi iface - local ifconfig = _strip_internals(uci:get_all("freifunk", "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 = device + ifconfig.ssid = uci:get("freifunk", community, "ssid") uci:section("wireless", "wifi-iface", nil, ifconfig) - + -- Save wifi - uci:save("wireless") - + 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, _strip_internals(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, _strip_internals(section)) + uci:section("firewall", "rule", nil, section) + end) + uci:foreach(external, "fw_rule", function(section) + uci:section("firewall", "rule", nil, section) end) - - uci:save("firewall") end - - - -- Crate network interface - local netconfig = _strip_internals(uci:get_all("freifunk", "interface")) - netconfig.ipaddr = ip + + -- 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("firewall") + + + -- Create network interface + local netconfig = uci:get_all("freifunk", "interface") + util.update(netconfig, uci:get_all(external, "interface") or {}) + netconfig.proto = "static" + netconfig.ipaddr = node_ip:string() uci:section("network", "interface", device, netconfig) - + uci:save("network") - + tools.firewall_zone_add_interface("freifunk", device) + + + local new_hostname = node_ip:string():gsub("%.", "-") + local old_hostname = sys.hostname() + + uci:foreach("system", "system", + function(s) + -- Make crond silent + uci:set("system", s['.name'], "cronloglevel", "10") + + -- Set hostname + 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) + + uci:save("system") end @@ -188,82 +293,201 @@ function olsr.write(self, section, value) if value == "0" then return end - + + local device = dev:formvalue(section) - + + local community = net:formvalue(section) + local external = community and uci:get("freifunk", community, "external") or "" + + local latval = tonumber(lat:formvalue(section)) + local lonval = tonumber(lon:formvalue(section)) + + -- Delete old interface - uci:delete_all("freifunk", "Interface", {Interface=device}) - + uci:delete_all("olsrd", "Interface", {interface=device}) + -- Write new interface - local olsrbase = _strip_internals(uci:get_all("freifunk", "olsr_interface")) - olsrbase.Interface = device - uci:section("olsr", "Interface", nil, olsrbase) - uci:save("olsr") + local olsrbase = uci:get_all("freifunk", "olsr_interface") + util.update(olsrbase, uci:get_all(external, "olsr_interface") or {}) + 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" + }) + + -- 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 "" + }) + + -- 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)) + end) + else + uci:foreach("system", "system", function(s) + uci:delete("system", s[".name"], "latlon") + end) + end + + -- Import hosts + uci:foreach("dhcp", "dnsmasq", function(s) + uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr") + end) + + -- Make sure that OLSR is enabled + sys.exec("/etc/init.d/olsrd enable") + + uci:save("olsrd") + uci:save("dhcp") end function share.write(self, section, value) - if value == "maybe" then - return - end - uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"}) - - if value == "yes" then + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw_plain.so.0.4"}) + uci:foreach("firewall", "zone", + function(s) + if s.name == "wan" then + uci:delete("firewall", s['.name'], "local_restrict") + return false + end + end) + + 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"}) + + 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 end + uci:save("firewall") + uci:save("olsrd") + uci:save("system") end function client.write(self, section, value) if value == "0" then + uci:delete("freifunk", "wizard", "dhcp_splash") + uci:save("freifunk") return end - + local device = dev:formvalue(section) -- Collect IP-Address - local inet = net:formvalue(section) - local isubnet = subnet:formvalue(section) - local inode = node:formvalue(section) - - if not inet or not isubnet or not inode then - return - end - - local dhcpbeg = 48 + tonumber(inode) * 4 - local dclient = "%s.%s.%s" % {inet:gsub("^[0-9]+", "10"), isubnet, dhcpbeg} - local limit = dhcpbeg < 252 and 3 or 2 - + local node_ip = meship:formvalue(section) + + if not node_ip then return end + + local community = net:formvalue(section) + local external = community and uci:get("freifunk", community, "external") or "" + local splash_ip, splash_mask = mksubnet(community, node_ip) + -- Delete old alias uci:delete("network", device .. "dhcp") - + -- Create alias - local aliasbase = _strip_internals(uci:get_all("freifunk", "alias")) + local aliasbase = uci:get_all("freifunk", "alias") + util.update(aliasbase, uci:get_all(external, "alias") or {}) aliasbase.interface = device - aliasbase.ipaddr = dclient + aliasbase.ipaddr = splash_ip + aliasbase.netmask = splash_mask aliasbase.proto = "static" uci:section("network", "alias", device .. "dhcp", aliasbase) uci:save("network") - - + + -- Create dhcp - local dhcpbase = _strip_internals(uci:get_all("freifunk", "dhcp")) + local dhcpbase = uci:get_all("freifunk", "dhcp") + util.update(dhcpbase, uci:get_all(external, "dhcp") or {}) dhcpbase.interface = device .. "dhcp" dhcpbase.start = dhcpbeg dhcpbase.limit = limit + dhcpbase.force = 1 uci:section("dhcp", "dhcp", device .. "dhcp", dhcpbase) uci:save("dhcp") - - + + 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" + }) + + uci:save("firewall") + -- 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") + + -- Make sure that luci_splash is enabled + sys.exec("/etc/init.d/luci_splash enable") + + -- Remember state + uci:set("freifunk", "wizard", "dhcp_splash", "1") + uci:save("freifunk") end -return f \ No newline at end of file +return f