applications/siitwizard: remove leftover variable definition
[project/luci.git] / applications / luci-siitwizard / luasrc / model / cbi / siitwizard.lua
index a6b4050..12d9ff9 100644 (file)
@@ -16,35 +16,12 @@ $Id$
 
 local uci = require "luci.model.uci".cursor()
 
--------------------- View --------------------
-f = SimpleForm("siitwizward", "4over6-Assistent",
- "Dieser Assistent unterstüzt bei der Einrichtung von IPv4-over-IPv6 Translation.")
-
-mode = f:field(ListValue, "mode", "Betriebsmodus")
-mode:value("gateway", "Gateway")
-mode:value("client", "Client")
-
-dev = f:field(ListValue, "device", "WLAN-Gerät")
-uci:foreach("wireless", "wifi-device",
-       function(section)
-               dev:value(section[".name"])
-       end)
-
-lanip = f:field(Value, "ipaddr", "LAN IP Adresse")
-lanip.value = "172.23.1.1"
-lanip:depends("mode", "client")
-
-lanmsk = f:field(Value, "netmask", "LAN Netzmaske")
-lanmsk.value = "255.255.0.0"
-lanmsk:depends("mode", "client")
-
-
--------------------- Control --------------------
-LL_PREFIX = luci.ip.IPv6("fe80::/64")
+-------------------- Init --------------------
 
 --
--- find link-local address
+-- Find link-local address
 --
+LL_PREFIX = luci.ip.IPv6("fe80::/64")
 function find_ll()
        for _, r in ipairs(luci.sys.net.routes6()) do
                if LL_PREFIX:contains(r.dest) and r.dest:higher(LL_PREFIX) then
@@ -54,14 +31,87 @@ function find_ll()
        return luci.ip.IPv6("::")
 end
 
+--
+-- Determine defaults
+--
+local ula_prefix  = uci:get("siit", "ipv6", "ula_prefix")  or "fd00::"
+local ula_global  = uci:get("siit", "ipv6", "ula_global")  or "00ca:ffee:babe::"               -- = Freifunk
+local ula_subnet  = uci:get("siit", "ipv6", "ula_subnet")  or "0000:0000:0000:4223::"  -- = Berlin
+local siit_prefix = uci:get("siit", "ipv6", "siit_prefix") or "::ffff:0000:0000"
+local ipv4_pool   = uci:get("siit", "ipv4", "pool")        or "172.16.0.0/12"
+local ipv4_netsz  = uci:get("siit", "ipv4", "netsize")     or "24"
+
+--
+-- Find IPv4 allocation pool
+--
+local gv4_net = luci.ip.IPv4(ipv4_pool)
+
+--
+-- Generate ULA
+--
+local ula = luci.ip.IPv6("::/64")
+
+for _, prefix in ipairs({ ula_prefix, ula_global, ula_subnet }) do
+       ula = ula:add(luci.ip.IPv6(prefix))
+end
+
+ula = ula:add(find_ll())
 
 
+-------------------- View --------------------
+f = SimpleForm("siitwizward", "SIIT-Wizzard",
+ "This wizzard helps to setup SIIT (IPv4-over-IPv6) translation according to RFC2765.")
+
+f:field(DummyValue, "info_ula", "Mesh ULA address").value = ula:string()
+
+f:field(DummyValue, "ipv4_pool", "IPv4 allocation pool").value =
+       "%s (%i hosts)" %{ gv4_net:string(), 2 ^ gv4_net:prefix() - 2 }
+
+f:field(DummyValue, "ipv4_size", "IPv4 LAN network prefix").value =
+       "%i bit (%i hosts)" %{ ipv4_netsz, 2 ^ ( 32 - ipv4_netsz ) - 2 }
+
+mode = f:field(ListValue, "mode", "Operation mode")
+mode:value("client", "Client")
+mode:value("gateway", "Gateway")
+
+dev = f:field(ListValue, "device", "Wireless device")
+uci:foreach("wireless", "wifi-device",
+       function(section)
+               dev:value(section[".name"])
+       end)
+
+lanip = f:field(Value, "ipaddr", "LAN IPv4 subnet")
+function lanip.formvalue(self, section)
+       local val = self.map:formvalue(self:cbid(section))
+       local net = luci.ip.IPv4("%s/%i" %{ val, ipv4_netsz })
+
+       if net then
+               if gv4_net:contains(net) then
+                       if not net:minhost():equal(net:host()) then
+                               self.error = { [section] = true }
+                               f.errmessage = "IPv4 address is not the first host of " ..
+                                       "subnet, expected " .. net:minhost():string()
+                       end
+               else
+                       self.error = { [section] = true }
+                       f.errmessage = "IPv4 address is not within the allocation pool"
+               end
+       else
+               self.error = { [section] = true }
+               f.errmessage = "Invalid IPv4 address given"
+       end
+
+       return val
+end
+
+dns = f:field(Value, "dns", "DNS server for LAN clients")
+dns.value = "141.1.1.1"
+
+-------------------- Control --------------------
 function f.handle(self, state, data)
        if state == FORM_VALID then
                luci.http.redirect(luci.dispatcher.build_url("admin", "uci", "changes"))
                return false
-       elseif state == FORM_INVALID then
-               self.errmessage = "Ungültige Eingabe: Bitte die Formularfelder auf Fehler prüfen."
        end
        return true
 end
@@ -69,6 +119,22 @@ end
 function mode.write(self, section, value)
 
        --
+       -- Find LAN IPv4 range
+       --
+       local lan_net = luci.ip.IPv4(
+               ( lanip:formvalue(section) or "172.16.0.1" ) .. "/" .. ipv4_netsz
+       )
+
+       if not lan_net then return end
+
+       --
+       -- Find wifi interface, dns server and hostname
+       --
+       local device      = dev:formvalue(section)
+       local dns_server  = dns:formvalue(section) or "141.1.1.1"
+       local hostname    = "siit-" .. lan_net:host():string():gsub("%.","-")
+
+       --
        -- Configure wifi device
        --
        local wifi_device  = dev:formvalue(section)
@@ -101,30 +167,6 @@ function mode.write(self, section, value)
                bssid      = wifi_bssid,
        })
 
-
-       --
-       -- Determine defaults
-       --
-       local ula_prefix  = uci:get("siit", "ipv6", "ula_prefix")  or "fd00::"
-       local ula_global  = uci:get("siit", "ipv6", "ula_global")  or "00ca:ffee:babe::"                -- = Freifunk
-       local ula_subnet  = uci:get("siit", "ipv6", "ula_subnet")  or "0000:0000:0000:4223::"   -- = Berlin
-       local siit_prefix = uci:get("siit", "ipv6", "siit_prefix") or "::ffff:0000:0000"
-
-       -- Find wifi interface
-       local device = dev:formvalue(section)
-
-       --
-       -- Generate ULA
-       --
-       local ula = luci.ip.IPv6("::/64")
-
-       for _, prefix in ipairs({ ula_prefix, ula_global, ula_subnet }) do
-               ula = ula:add(luci.ip.IPv6(prefix))
-       end
-
-       ula = ula:add(find_ll())
-
-
        --
        -- Gateway mode
        --
@@ -137,11 +179,29 @@ function mode.write(self, section, value)
 
        if value == "gateway" then
 
+               -- wan mtu
                uci:set("network", "wan", "mtu", 1400)
 
+               -- lan settings
+               uci:tset("network", "lan", {
+                       mtu     = 1400,
+                       ipaddr  = lan_net:host():string(),
+                       netmask = lan_net:mask():string()
+               })
+
                -- use full siit subnet
                siit_route = luci.ip.IPv6(siit_prefix .. "/96")
 
+               -- v4 <-> siit route
+               uci:delete_all("network", "route",
+                       function(s) return s.interface == "siit0" end)
+
+               uci:section("network", "route", nil, {
+                       interface = "siit0",
+                       target    = gv4_net:network():string(),
+                       netmask   = gv4_net:mask():string()
+               })
+
        --
        -- Client mode
        --
@@ -151,12 +211,8 @@ function mode.write(self, section, value)
        --      * Also, MTU on LAN reduced to 1400.
 
        else
-               -- lan interface
-               local lan_net = luci.ip.IPv4(
-                       lanip:formvalue(section) or "192.168.1.1",
-                       lanmsk:formvalue(section) or "255.255.255.0"
-               )
 
+               -- lan settings
                uci:tset("network", "lan", {
                        mtu     = 1400,
                        ipaddr  = lan_net:host():string(),
@@ -168,17 +224,87 @@ function mode.write(self, section, value)
                        siit_prefix .. "/" .. (96 + lan_net:prefix())
                ):add(lan_net[2])
 
+               -- ipv4 <-> siit route
+               uci:delete_all("network", "route",
+                       function(s) return s.interface == "siit0" end)
+
+               -- XXX: kind of a catch all, gv4_net would be better
+               --      but does not cover non-local v4 space
+               uci:section("network", "route", nil, {
+                       interface = "siit0",
+                       target    = "0.0.0.0",
+                       netmask   = "0.0.0.0"
+               })
        end
 
+       -- setup the firewall
+       uci:delete_all("firewall", "zone",
+               function(s) return (
+                       s['.name'] == "siit0" or s.name == "siit0" or
+                       s.network == "siit0" or s['.name'] == wifi_device or
+                       s.name == wifi_device or s.network == wifi_device
+               ) end)
+
+       uci:delete_all("firewall", "forwarding",
+               function(s) return (
+                       s.src == wifi_device and s.dest == "siit0" or
+                       s.dest == wifi_device and s.src == "siit0" or
+                       s.src == "lan" and s.dest == "siit0" or
+                       s.dest == "lan" and s.src == "siit0"
+               ) end)
+
+       uci:section("firewall", "zone", "siit0", {
+               name    = "siit0",
+               network = "siit0",
+               input   = "ACCEPT",
+               output  = "ACCEPT",
+               forward = "ACCEPT"
+       })
+
+       uci:section("firewall", "zone", wifi_device, {
+               name    = wifi_device,
+               network = wifi_device,
+               input   = "ACCEPT",
+               output  = "ACCEPT",
+               forward = "ACCEPT"
+       })
+
+       uci:section("firewall", "forwarding", nil, {
+               src  = wifi_device,
+               dest = "siit0"
+       })
+
+       uci:section("firewall", "forwarding", nil, {
+               src  = "siit0",
+               dest = wifi_device
+       })
+
+       uci:section("firewall", "forwarding", nil, {
+               src  = "lan",
+               dest = "siit0"
+       })
+
+       uci:section("firewall", "forwarding", nil, {
+               src  = "siit0",
+               dest = "lan"
+       })
+
+       -- firewall include
+       uci:delete_all("firewall", "include",
+               function(s) return s.path == "/etc/firewall.user" end)
+
+       uci:section("firewall", "include", nil, {
+               path = "/etc/firewall.user"
+       })
+
+
        -- siit0 interface
        uci:delete_all("network", "interface",
                function(s) return ( s.ifname == "siit0" ) end)
 
        uci:section("network", "interface", "siit0", {
                ifname  = "siit0",
-               proto   = "static",
-               ipaddr  = "169.254.42.42",
-               netmask = "255.255.255.0"
+               proto   = "none"
        })
 
        -- siit0 route
@@ -224,9 +350,33 @@ function mode.write(self, section, value)
                prefix  = siit_route:prefix()
        })
 
+       -- txtinfo v6 & olsrd nameservice
+       uci:foreach("olsrd", "LoadPlugin",
+               function(s)
+                       if s.library == "olsrd_txtinfo.so.0.1" then
+                               uci:set("olsrd", s['.name'], "accept", "::1")
+                       elseif s.library == "olsrd_nameservice.so.0.3" then
+                               uci:set("olsrd", s['.name'], "name", hostname)
+                       end
+               end)
+
+       -- lan dns
+       uci:tset("dhcp", "lan", {
+               dhcp_option = "6," .. dns_server
+       })
+
+       -- hostname
+       uci:foreach("system", "system",
+               function(s)
+                       uci:set("system", s['.name'], "hostname", hostname)
+               end)
+
        uci:save("wireless")
+       uci:save("firewall")
        uci:save("network")
+       uci:save("system")
        uci:save("olsrd")
+       uci:save("dhcp")
 end
 
 return f