summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-04-26 21:59:45 +0000
committerSteven Barth <steven@midlink.org>2008-04-26 21:59:45 +0000
commitf917c0bb6445794cc94ff895f430db84a9e77ea2 (patch)
tree13b7dd12319d7e85672c539b4ce40d47df443d15
parentf801df7d4d44d8b85ae17fa5d191b96602c1fa9a (diff)
* Minor bugfixes
-rw-r--r--contrib/package/luci-splash/src/luci_splash.init2
-rw-r--r--core/src/ffluci/sys.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/package/luci-splash/src/luci_splash.init b/contrib/package/luci-splash/src/luci_splash.init
index 150f846f2f..10d6411d12 100644
--- a/contrib/package/luci-splash/src/luci_splash.init
+++ b/contrib/package/luci-splash/src/luci_splash.init
@@ -61,7 +61,7 @@ start() {
iptables -t nat -A luci_splash_leases -j DROP
### Start the splash httpd
- httpd -c /etc/luci_splash_httpd.conf -p 8082 -h /usr/lib/luci_splash/htdocs
+ httpd -c /etc/luci_splash_httpd.conf -p 8082 -h /usr/lib/luci-splash/htdocs
### Sync leases
/usr/lib/luci-splash/sync.lua
diff --git a/core/src/ffluci/sys.lua b/core/src/ffluci/sys.lua
index 77d45cfb7a..cde1877ded 100644
--- a/core/src/ffluci/sys.lua
+++ b/core/src/ffluci/sys.lua
@@ -121,8 +121,8 @@ function net.arptable()
end
-- Returns whether an IP-Adress belongs to a certain net
-function net.belongs(ip, net, prefix)
- return (net.ip4bin(ip):sub(1, prefix) == net.ip4bin(net):sub(1, prefix))
+function net.belongs(ip, ipnet, prefix)
+ return (net.ip4bin(ip):sub(1, prefix) == net.ip4bin(ipnet):sub(1, prefix))
end
-- Returns all available network interfaces