From: Steven Barth <steven@midlink.org>
Date: Tue, 16 Jun 2009 14:27:43 +0000 (+0000)
Subject: Catchall workaround for strange sockaddresses by Jow
X-Git-Tag: 0.10.0~1548
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=b3a7ff9f8f0569e2c091f1738e7231be242a6dab;p=project%2Fluci.git

Catchall workaround for strange sockaddresses by Jow
---

diff --git a/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua b/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua
index 30af84ba2..a5cdce534 100644
--- a/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua
+++ b/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua
@@ -14,6 +14,8 @@ $Id$
 local srv = require "luci.lucid.http.server"
 local proto = require "luci.http.protocol"
 local util = require "luci.util"
+local ip = require "luci.ip"
+local ipairs = ipairs
 
 --- Catchall Handler
 -- @cstyle instance
@@ -37,7 +39,21 @@ end
 function Redirect.handle_GET(self, request)
 	local target = self.target
 	local protocol = request.env.HTTPS and "https://" or "http://"
-	local server = request.env.SERVER_ADDR
+	local server
+
+	if request.env.REMOTE_ADDR and not request.env.REMOTE_ADDR:find(":") then
+		local compare = ip.IPv4(request.env.REMOTE_ADDR)
+		for _, iface in ipairs(request.server.interfaces) do
+			if iface.family == "inet" and iface.addr and iface.netmask then
+				if ip.IPv4(iface.addr, iface.netmask):contains(compare) then
+					server = iface.addr
+					break
+				end
+			end
+		end
+	else
+		server = request.env.SERVER_ADDR
+	end
 	if server:find(":") then
 		server = "[" .. server .. "]"
 	end