From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 30 May 2009 22:38:46 +0000 (+0000)
Subject: applications/luci-splash: properly fix mac address detection in mixed IPv4/IPv6 envir... 
X-Git-Tag: 0.9.0~275
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=6a2bb359fdb3bb6a2a2545f46d70e83d608ca49b

applications/luci-splash: properly fix mac address detection in mixed IPv4/IPv6 environments (thanks stargieg)
---

diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua
index 5731efc8c..8603b141f 100644
--- a/applications/luci-splash/luasrc/controller/splash/splash.lua
+++ b/applications/luci-splash/luasrc/controller/splash/splash.lua
@@ -19,7 +19,8 @@ function action_dispatch()
 end
 
 function action_activate()
-	local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR"))
+	local ip = luci.http.getenv("REMOTE_ADDR") or "127.0.0.1"
+	local mac = luci.sys.net.ip4mac(ip:match("^[\[::ffff:]*(%d+.%d+%.%d+%.%d+)\]*$"))
 	if mac and luci.http.formvalue("accept") then
 		os.execute("luci-splash add "..mac.." >/dev/null 2>&1")
 		luci.http.redirect(luci.model.uci.cursor():get("freifunk", "community", "homepage"))