projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
47603a3
)
applications/luci-splash: fix fac02283137f6ff59363695bb07a3f9cec58e577 | ipt module...
author
Manuel Munz
<munz@comuno.net>
Fri, 20 Feb 2015 13:20:55 +0000
(14:20 +0100)
committer
Manuel Munz
<munz@comuno.net>
Fri, 20 Feb 2015 13:20:55 +0000
(14:20 +0100)
applications/luci-app-splash/root/usr/sbin/luci-splash
patch
|
blob
|
history
diff --git
a/applications/luci-app-splash/root/usr/sbin/luci-splash
b/applications/luci-app-splash/root/usr/sbin/luci-splash
index
e566e9b
..
2870dbe
100755
(executable)
--- a/
applications/luci-app-splash/root/usr/sbin/luci-splash
+++ b/
applications/luci-app-splash/root/usr/sbin/luci-splash
@@
-7,6
+7,7
@@
ipc = require "luci.ip"
-- Init state session
local uci = require "luci.model.uci".cursor_state()
-- Init state session
local uci = require "luci.model.uci".cursor_state()
+local ipt = require "luci.sys.iptparser".IptParser()
local fs = require "nixio.fs"
local ip = require "luci.ip"
local fs = require "nixio.fs"
local ip = require "luci.ip"
@@
-137,27
+138,33
@@
function ipvalid(ipaddr)
end
function mac_to_ip(mac)
end
function mac_to_ip(mac)
+ local ipaddr = nil
ipc.neighbors({ family = 4 }, function(n)
if n.mac == mac and n.dest then
ipc.neighbors({ family = 4 }, function(n)
if n.mac == mac and n.dest then
-
return
n.dest:string()
+
ipaddr =
n.dest:string()
end
end)
end
end)
+ return ipaddr
end
function mac_to_dev(mac)
end
function mac_to_dev(mac)
+ local dev = nil
ipc.neighbors({ family = 4 }, function(n)
if n.mac == mac and n.dev then
ipc.neighbors({ family = 4 }, function(n)
if n.mac == mac and n.dev then
-
return
n.dev
+
dev =
n.dev
end
end)
end
end)
+ return dev
end
function ip_to_mac(ip)
end
function ip_to_mac(ip)
+ local mac = nil
ipc.neighbors({ family = 4 }, function(n)
if n.mac and n.dest and n.dest:equal(ip) then
ipc.neighbors({ family = 4 }, function(n)
if n.mac and n.dest and n.dest:equal(ip) then
-
return
n.mac
+
mac =
n.mac
end
end)
end
end)
+ return mac
end
function main(argv)
end
function main(argv)