From: Steven Barth <steven@midlink.org>
Date: Mon, 25 May 2009 10:31:02 +0000 (+0000)
Subject: Fix LuCI-Frickel-Splashd
X-Git-Tag: 0.9.0~384
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=282e08a0c796d0b1ab66dc335f833d02f83ee10c;p=project%2Fluci.git

Fix LuCI-Frickel-Splashd
---

diff --git a/applications/luci-splash/root/usr/bin/luci-splashd b/applications/luci-splash/root/usr/bin/luci-splashd
index 6152daa524..a4f11c3bf2 100755
--- a/applications/luci-splash/root/usr/bin/luci-splashd
+++ b/applications/luci-splash/root/usr/bin/luci-splashd
@@ -1,20 +1,29 @@
 #!/usr/bin/lua
 
-local nixio = require "nixio"
+local nixio = require "nixio", require "nixio.util"
 local server = nixio.bind(nil, arg[1] or 8082)
 local stat = server:listen(32)
 
+local function remapipv6(adr)
+	local map = "::ffff:"
+	if adr:sub(1, #map) == map then
+		return adr:sub(#map+1)
+	else
+		return adr
+	end 
+end
+
 while stat do
 	local client = server:accept()
 	
 	if client then
 		client:setopt("socket", "rcvtimeo", 1)
 		client:setopt("socket", "sndtimeo", 1)
-		local srv = client:getsockname()
+		local srv = remapipv6(client:getsockname())
 
 		client:read(1024)
-		client:writeall("HTTP/1.0 302 Found\r\nLocation: http://" .. srv ..
-		 (arg[2] or "/luci/splash") .. "\r\n\r\n")
+		client:writeall("HTTP/1.1 302 Found\r\nLocation: http://" .. srv ..
+		 (arg[2] or "/luci/splash") .. "\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
 		client:close() 
 	end
 end