X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ffwizard-leipzig%2Fluasrc%2Fmodel%2Fcbi%2Fffwizard.lua;h=df5afdfa149d04d29db59513cc48933a9b646e33;hp=afde3fdf9100f045eb39cc12ca5a23a85065a364;hb=ccd5ed7cec5bd2cd8121d22648074be905d793ab;hpb=5872bfa084797e903b5ba1a722c22938a6a9cc95 diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua index afde3fdf9..df5afdfa1 100644 --- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua +++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua @@ -17,6 +17,8 @@ $Id$ local uci = require "luci.model.uci".cursor() local tools = require "luci.tools.ffwizard" +local util = require "luci.util" +local sys = require "luci.sys" -------------------- View -------------------- @@ -33,11 +35,11 @@ uci:foreach("wireless", "wifi-device", main = f:field(Flag, "wifi", "Freifunkzugang einrichten") -net = f:field(Value, "net", "Freifunknetz") +net = f:field(Value, "net", "Freifunknetz", "1. Teil der IP-Adresse") net.rmempty = true net:depends("wifi", "1") uci:foreach("freifunk", "community", function(s) - net:value(s[".name"], s.name) + net:value(s[".name"], "%s (%s)" % {s.name, s.prefix}) end) function net.cfgvalue(self, section) @@ -49,7 +51,7 @@ function net.write(self, section, value) end -subnet = f:field(Value, "subnet", "Subnetz (Projekt)") +subnet = f:field(Value, "subnet", "Subnetz (Projekt)", "2. Teil der IP-Adresse") subnet.rmempty = true subnet:depends("wifi", "1") function subnet.cfgvalue(self, section) @@ -60,7 +62,7 @@ function subnet.write(self, section, value) uci:save("freifunk") end -node = f:field(Value, "node", "Knoten") +node = f:field(Value, "node", "Knoten", "3. Teil der IP-Adresse") node.rmempty = true node:depends("wifi", "1") for i=1, 51 do @@ -76,14 +78,14 @@ end client = f:field(Flag, "client", "WLAN-DHCP anbieten") client:depends("wifi", "1") +client.rmempty = true olsr = f:field(Flag, "olsr", "OLSR einrichten") +olsr.rmempty = true -share = f:field(ListValue, "sharenet", "Eigenen Internetzugang freigeben") -share:value("maybe", "-- keine Aktion --") -share:value("yes", "einschalten") -share:value("no", "ausschalten") +share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben") +share.rmempty = true @@ -115,7 +117,7 @@ function main.write(self, section, value) end local device = dev:formvalue(section) - local community + local community, external -- Collect IP-Address local inet = net:formvalue(section) @@ -127,6 +129,7 @@ function main.write(self, section, value) net.tag_missing[section] = true else community = inet + external = uci:get("freifunk", community, "external") or "" inet = uci:get("freifunk", community, "prefix") or inet end if not isubnet then @@ -147,18 +150,20 @@ function main.write(self, section, value) tools.wifi_delete_ifaces(device) tools.network_remove_interface(device) tools.firewall_zone_remove_interface("freifunk", device) - + -- Tune community settings - if community then + 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") @@ -168,22 +173,59 @@ function main.write(self, section, value) uci:save("wireless") -- Create firewall zone and add default rules (first time) - local newzone = tools.firewall_create_zone("freifunk", "DROP", "ACCEPT", "DROP", true) + local newzone = tools.firewall_create_zone("freifunk", "REJECT", "ACCEPT", "REJECT", true) if newzone then uci:foreach("freifunk", "fw_forwarding", function(section) - uci:section("firewall", "forwarding", nil, _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) + end - uci:save("firewall") + -- 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") + - -- Crate network interface - local netconfig = _strip_internals(uci:get_all("freifunk", "interface")) + -- Create network interface + local netconfig = uci:get_all("freifunk", "interface") + util.update(netconfig, uci:get_all(external, "interface") or {}) netconfig.proto = "static" netconfig.ipaddr = ip uci:section("network", "interface", device, netconfig) @@ -191,6 +233,21 @@ function main.write(self, section, value) uci:save("network") tools.firewall_zone_add_interface("freifunk", device) + + + -- Set hostname + local new_hostname = ip:gsub("%.", "-") + local old_hostname = sys.hostname() + + if old_hostname == "OpenWrt" or old_hostname:match("^%d+-%d+-%d+-%d+$") then + uci:foreach("system", "system", + function(s) + uci:set("system", s['.name'], "hostname", new_hostname) + end) + + sys.hostname(new_hostname) + uci:save("system") + end end @@ -199,31 +256,52 @@ function olsr.write(self, section, value) return end + local device = dev:formvalue(section) + local community = net:formvalue(section) + local external = community and uci:get("freifunk", community, "external") or "" + -- 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")) + 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" + }) + + -- Import hosts + uci:foreach("dhcp", "dnsmasq", function(s) + uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr") + end) + uci:save("olsrd") + uci:save("dhcp") end function share.write(self, section, value) - if value == "maybe" then - return - end - uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"}) + uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw_plain.so.0.4"}) - if value == "yes" then + if value == "1" then uci:section("firewall", "forwarding", nil, {src="freifunk", dest="wan"}) + uci:section("olsrd", "LoadPlugin", nil, {library="olsrd_dyn_gw_plain.so.0.4"}) end uci:save("firewall") + uci:save("olsrd") end @@ -242,8 +320,9 @@ function client.write(self, section, value) if not inet or not isubnet or not inode then return end - - inet = uci:get("freifunk", inet, "prefix") or inet + local community = inet + local external = community and uci:get("freifunk", community, "external") or "" + inet = uci:get("freifunk", community, "prefix") or inet local dhcpbeg = 48 + tonumber(inode) * 4 local dclient = "%s.%s.%s" % {inet:gsub("^[0-9]+", "10"), isubnet, dhcpbeg} @@ -253,7 +332,8 @@ function client.write(self, section, value) 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.proto = "static" @@ -262,14 +342,27 @@ function client.write(self, section, value) -- 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", @@ -283,14 +376,25 @@ function client.write(self, section, value) 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") end