projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libs/sys: use 100ms timeouts for name resolution of host hints
[project/luci.git]
/
libs
/
sys
/
luasrc
/
sys.lua
diff --git
a/libs/sys/luasrc/sys.lua
b/libs/sys/luasrc/sys.lua
index
c0fb528
..
825092f
100644
(file)
--- a/
libs/sys/luasrc/sys.lua
+++ b/
libs/sys/luasrc/sys.lua
@@
-342,17
+342,17
@@
end
function net.mac_hints(callback)
if callback then
_nethints(1, function(mac, v4, v6, name)
function net.mac_hints(callback)
if callback then
_nethints(1, function(mac, v4, v6, name)
- name = name or nixio.getnameinfo(v4 or v6) or v4
+ name = name or nixio.getnameinfo(v4 or v6
, nil, 100
) or v4
if name and name ~= mac then
if name and name ~= mac then
- callback(mac, name or nixio.getnameinfo(v4 or v6) or v4)
+ callback(mac, name or nixio.getnameinfo(v4 or v6
, nil, 100
) or v4)
end
end)
else
local rv = { }
_nethints(1, function(mac, v4, v6, name)
end
end)
else
local rv = { }
_nethints(1, function(mac, v4, v6, name)
- name = name or nixio.getnameinfo(v4 or v6) or v4
+ name = name or nixio.getnameinfo(v4 or v6
, nil, 100
) or v4
if name and name ~= mac then
if name and name ~= mac then
- rv[#rv+1] = { mac, name or nixio.getnameinfo(v4 or v6) or v4 }
+ rv[#rv+1] = { mac, name or nixio.getnameinfo(v4 or v6
, nil, 100
) or v4 }
end
end)
return rv
end
end)
return rv
@@
-366,7
+366,7
@@
end
function net.ipv4_hints(callback)
if callback then
_nethints(2, function(mac, v4, v6, name)
function net.ipv4_hints(callback)
if callback then
_nethints(2, function(mac, v4, v6, name)
- name = name or nixio.getnameinfo(v4) or mac
+ name = name or nixio.getnameinfo(v4
, nil, 100
) or mac
if name and name ~= v4 then
callback(v4, name)
end
if name and name ~= v4 then
callback(v4, name)
end
@@
-374,7
+374,7
@@
function net.ipv4_hints(callback)
else
local rv = { }
_nethints(2, function(mac, v4, v6, name)
else
local rv = { }
_nethints(2, function(mac, v4, v6, name)
- name = name or nixio.getnameinfo(v4) or mac
+ name = name or nixio.getnameinfo(v4
, nil, 100
) or mac
if name and name ~= v4 then
rv[#rv+1] = { v4, name }
end
if name and name ~= v4 then
rv[#rv+1] = { v4, name }
end
@@
-390,7
+390,7
@@
end
function net.ipv6_hints(callback)
if callback then
_nethints(3, function(mac, v4, v6, name)
function net.ipv6_hints(callback)
if callback then
_nethints(3, function(mac, v4, v6, name)
- name = name or nixio.getnameinfo(v6) or mac
+ name = name or nixio.getnameinfo(v6
, nil, 100
) or mac
if name and name ~= v6 then
callback(v6, name)
end
if name and name ~= v6 then
callback(v6, name)
end
@@
-398,7
+398,7
@@
function net.ipv6_hints(callback)
else
local rv = { }
_nethints(3, function(mac, v4, v6, name)
else
local rv = { }
_nethints(3, function(mac, v4, v6, name)
- name = name or nixio.getnameinfo(v6) or mac
+ name = name or nixio.getnameinfo(v6
, nil, 100
) or mac
if name and name ~= v6 then
rv[#rv+1] = { v6, name }
end
if name and name ~= v6 then
rv[#rv+1] = { v6, name }
end
@@
-836,6
+836,7
@@
function wifi.getiwinfo(ifname)
local u = uci.cursor_state()
local d, n = ifname:match("^(%w+)%.network(%d+)")
if d and n then
local u = uci.cursor_state()
local d, n = ifname:match("^(%w+)%.network(%d+)")
if d and n then
+ ifname = d
n = tonumber(n)
u:foreach("wireless", "wifi-iface",
function(s)
n = tonumber(n)
u:foreach("wireless", "wifi-iface",
function(s)