X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-siitwizard%2Fluasrc%2Fmodel%2Fcbi%2Fsiitwizard.lua;h=3603d6e363a4c214d83b43816b1291a058cf16de;hp=b6493b3269ba34042b2b38e20af54b2072231d2c;hb=a5c4b5bb5e835287a77bf1693e61f71cd7e6113c;hpb=a7e7c31f8c659b55c1adb0863a8f2f66d3452d2b

diff --git a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
index b6493b326..3603d6e36 100644
--- a/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
+++ b/applications/luci-siitwizard/luasrc/model/cbi/siitwizard.lua
@@ -15,52 +15,103 @@ $Id$
 ]]--
 
 local uci = require "luci.model.uci".cursor()
-local tools = require "luci.tools.ffwizard"
-local util = require "luci.util"
 
-local io = require "io"
+-------------------- Init --------------------
+
+--
+-- 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
+			return r.dest:sub(LL_PREFIX)
+		end
+	end
+	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", "4over6-Assistent",
- "Dieser Assistent unterstüzt bei der Einrichtung von IPv4-over-IPv6 Translation.")
+f = SimpleForm("siitwizward", "SIIT-Wizzard",
+ "This wizzard helps to setup SIIT (IPv4-over-IPv6) translation according to RFC2765.")
 
-mode = f:field(ListValue, "mode", "Betriebsmodus")
-mode:value("gateway", "Gateway")
+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 ^ ( 32 - 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", "WLAN-Gerät")
-uci:foreach("network", "interface",
+dev = f:field(ListValue, "device", "Wireless device")
+uci:foreach("wireless", "wifi-device",
 	function(section)
-		if section[".name"] ~= "siit0" then
-			dev:value(section[".name"])
-		end
+		dev:value(section[".name"])
 	end)
 
-
--------------------- Control --------------------
-LL_PREFIX = luci.ip.IPv6("fe80::/16")
-
---
--- find link-local address
---
-function find_ll(dev)
-	for _, r in ipairs(luci.sys.net.routes6()) do
-		if r.device == dev and LL_PREFIX:contains(r.dest) then
-			return r.dest:sub(LL_PREFIX)
+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 luci.ip.IPv6("::")
-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
@@ -68,28 +119,55 @@ end
 function mode.write(self, section, value)
 
 	--
-	-- Determine defaults
+	-- Find LAN IPv4 range
 	--
-	local ula_prefix  = uci:get("siit", "defaults", "ula_prefix")  or "fd00::"
-	local ula_global  = uci:get("siit", "defaults", "ula_global")  or "00ca:ffee:babe::"		-- = Freifunk
-	local ula_subnet  = uci:get("siit", "defaults", "ula_subnet")  or "0000:0000:0000:4223::"	-- = Berlin
-	local siit_prefix = uci:get("siit", "defaults", "siit_prefix") or "::ffff:ffff:0000:0000"
-	local siit_route  = luci.ip.IPv6(siit_prefix .. "/96")
+	local lan_net = luci.ip.IPv4(
+		( lanip:formvalue(section) or "172.16.0.1" ) .. "/" .. ipv4_netsz
+	)
 
-	-- Find wifi interface
-	local device = dev:formvalue(section)
+	if not lan_net then return end
 
 	--
-	-- Generate ULA
+	-- Find wifi interface, dns server and hostname
 	--
-	local ula = luci.ip.IPv6("::")
+	local device      = dev:formvalue(section)
+	local dns_server  = dns:formvalue(section) or "141.1.1.1"
+	local hostname    = "siit-" .. lan_net:host():string():gsub("%.","-")
 
-	for _, prefix in ipairs({ ula_prefix, ula_global, ula_subnet }) do
-		ula = ula:add(luci.ip.IPv6(prefix))
-	end
+	--
+	-- Configure wifi device
+	--
+	local wifi_device  = dev:formvalue(section)
+	local wifi_essid   = uci:get("siit", "wifi", "essid")   or "6mesh.freifunk.net"
+	local wifi_bssid   = uci:get("siit", "wifi", "bssid")   or "02:ca:ff:ee:ba:be"
+	local wifi_channel = uci:get("siit", "wifi", "channel") or "1"
 
-	ula = ula:add(find_ll(uci:get("network", device, "ifname") or device))
+	-- nuke old device definition
+	uci:delete_all("wireless", "wifi-iface",
+		function(s) return s.device == wifi_device end )
 
+	uci:delete_all("network", "interface",
+		function(s) return s['.name'] == wifi_device end )
+
+	-- create wifi device definition
+	uci:tset("wireless", wifi_device, {
+		disabled  = 0,
+		channel   = wifi_channel,
+--		txantenna = 1,
+--		rxantenna = 1,
+--		diversity = 0
+	})
+
+	uci:section("wireless", "wifi-iface", nil, {
+		encryption = "none",
+		mode       = "adhoc",
+		txpower    = 10,
+		sw_merge   = 1,
+		network    = wifi_device,
+		device     = wifi_device,
+		ssid       = wifi_essid,
+		bssid      = wifi_bssid,
+	})
 
 	--
 	-- Gateway mode
@@ -103,8 +181,29 @@ function mode.write(self, section, value)
 
 	if value == "gateway" then
 
-		uci:set("network", "wan", "mtu", 1400)
+		-- wan mtu
+		uci:set("network", "wan", "mtu", 1240)
+
+		-- lan settings
+		uci:tset("network", "lan", {
+			mtu     = 1240,
+			ipaddr  = lan_net:host():string(),
+			netmask = lan_net:mask():string(),
+			proto   = "static"
+		})
 
+		-- 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
@@ -115,26 +214,100 @@ function mode.write(self, section, value)
 	--	* Also, MTU on LAN reduced to 1400.
 
 	else
-		local lan_ip = luci.ip.IPv4(
-			uci:get("network", "lan", "ipaddr"),
-			uci:get("network", "lan", "netmask")
-		)
 
-		siit_route = luci.ip.IPv6(
-			siit_prefix .. "/" .. (96 + lan_ip:prefix())
-		):add(lan_ip[2])
+		-- lan settings
+		uci:tset("network", "lan", {
+			mtu     = 1240,
+			ipaddr  = lan_net:host():string(),
+			netmask = lan_net:mask():string()
+		})
 
+		-- derive siit subnet from lan config
+		siit_route = luci.ip.IPv6(
+			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
@@ -142,38 +315,69 @@ function mode.write(self, section, value)
 		function(s) return siit_route:contains(luci.ip.IPv6(s.target)) end)
 
 	uci:section("network", "route6", nil, {
-		interface = device,
+		interface = "siit0",
 		target    = siit_route:string()
 	})
 
-	-- interface
-	uci:set("network", device, "ip6addr", ula:string())
-	uci:set("network", "lan", "mtu", 1400)
+	-- create wifi network interface
+	uci:section("network", "interface", wifi_device, {
+		proto   = "static",
+		mtu     = 1400,
+		ip6addr = ula:string()
+	})
 
-	uci:set("olsrd", "general", "IpVersion", 6)
-	uci:foreach("olsrd", "Interface",
-		function(s)
-			if s.interface == device then
-				uci:set("olsrd", s[".name"], "Ip6AddrType", "global")
-			end
-			uci:delete("olsrd", s[".name"], "Ip4Broadcast")
-		end)
+	-- nuke old olsrd interfaces
+	uci:delete_all("olsrd", "Interface",
+		function(s) return s.interface == wifi_device end)
+
+	-- configure olsrd interface
+	uci:foreach("olsrd", "olsrd",
+		function(s) uci:set("olsrd", s['.name'], "IpVersion", 6) end)
+
+	uci:section("olsrd", "Interface", nil, {
+		ignore      = 0,
+		interface   = wifi_device,
+		Ip6AddrType = "global"
+	})
 
 	-- hna6
 	uci:delete_all("olsrd", "Hna6",
-		function(s)
-			if s.netaddr and s.prefix then
-				return siit_route:contains(luci.ip.IPv6(s.netaddr.."/"..s.prefix))
-			end
-		end)
+		function(s) return true end)
 
 	uci:section("olsrd", "Hna6", nil, {
 		netaddr = siit_route:host():string(),
 		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,
+		start       = bit.band(lan_net:minhost():add(1)[2][2], 0xFF),
+		limit       = ( 2 ^ ( 32 - lan_net:prefix() ) ) - 3
+	})
+
+	-- 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