libs/core: Cleaned up luci.sys in favor of the new luci.ip module

[project/luci.git] / applications / luci-splash / root / usr / bin / luci-splashd

diff --git a/applications/luci-splash/root/usr/bin/luci-splashd b/applications/luci-splash/root/usr/bin/luci-splashd
index 33391cc..e8c2752 100755 (executable)
--- a/applications/luci-splash/root/usr/bin/luci-splashd
+++ b/applications/luci-splash/root/usr/bin/luci-splashd
@@ -1,5 +1,10 @@
 #!/usr/bin/lua
 #!/usr/bin/lua

+

 require("socket")
 require("socket")

+require("luci.ip")
+require("luci.model.uci")
+
+luci.model.uci.set_savedir(luci.model.uci.savedir_state)

 
 local server = socket.bind("0.0.0.0", arg[1] or 8082)
 server:settimeout(0, "t")
 
 local server = socket.bind("0.0.0.0", arg[1] or 8082)
 server:settimeout(0, "t")


@@ -9,7 +14,19 @@ while true do
        
        if client then
                client:settimeout(1)
        
        if client then
                client:settimeout(1)

-               local srv = client:getsockname()
+               local srv
+               local ip = luci.ip.IPv4(client:getpeername())
+               luci.model.uci.foreach("network", "interface",
+                       function (section)
+                           if section.ipaddr then
+                               local net = luci.ip.IPv4(section.ipaddr, section.netmask)
+                               if ip and net and net:contains(ip) then
+                                   srv = section.ipaddr
+                                   return
+                               end
+                           end
+                       end)
+

                client:receive()
                client:send("HTTP/1.0 302 Found\r\nLocation: http://" .. srv ..
                 (arg[2] or "/luci/splash") .. "\r\n\r\n")
                client:receive()
                client:send("HTTP/1.0 302 Found\r\nLocation: http://" .. srv ..
                 (arg[2] or "/luci/splash") .. "\r\n\r\n")