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
index 5551ba6..e8c2752 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/lua
 
 require("socket")
 #!/usr/bin/lua
 
 require("socket")
-require("luci.sys")
+require("luci.ip")
 require("luci.model.uci")
 
 luci.model.uci.set_savedir(luci.model.uci.savedir_state)
 require("luci.model.uci")
 
 luci.model.uci.set_savedir(luci.model.uci.savedir_state)
@@ -14,13 +14,13 @@ while true do
        
        if client then
                client:settimeout(1)
        
        if client then
                client:settimeout(1)
-               local ip = client:getpeername()
                local srv
                local srv
+               local ip = luci.ip.IPv4(client:getpeername())
                luci.model.uci.foreach("network", "interface",
                        function (section)
                            if section.ipaddr then
                luci.model.uci.foreach("network", "interface",
                        function (section)
                            if section.ipaddr then
-                               local p = luci.sys.net.mask4prefix(section.netmask)
-                               if luci.sys.net.belongs(ip, section.ipaddr, p) then
+                               local net = luci.ip.IPv4(section.ipaddr, section.netmask)
+                               if ip and net and net:contains(ip) then
                                    srv = section.ipaddr
                                    return
                                end
                                    srv = section.ipaddr
                                    return
                                end