libs/sys: use 100ms timeouts for name resolution of host hints

This commit is contained in:
Jo-Philipp Wich 2012-08-27 14:39:33 +00:00
parent c755e818c4
commit f66a13dc4d

View file

@ -342,17 +342,17 @@ end
function net.mac_hints(callback) function net.mac_hints(callback)
if callback then if callback then
_nethints(1, function(mac, v4, v6, name) _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
end) end)
else else
local rv = { } local rv = { }
_nethints(1, function(mac, v4, v6, name) _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
end) end)
return rv return rv
@ -366,7 +366,7 @@ end
function net.ipv4_hints(callback) function net.ipv4_hints(callback)
if callback then if callback then
_nethints(2, function(mac, v4, v6, name) _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 if name and name ~= v4 then
callback(v4, name) callback(v4, name)
end end
@ -374,7 +374,7 @@ function net.ipv4_hints(callback)
else else
local rv = { } local rv = { }
_nethints(2, function(mac, v4, v6, name) _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 if name and name ~= v4 then
rv[#rv+1] = { v4, name } rv[#rv+1] = { v4, name }
end end
@ -390,7 +390,7 @@ end
function net.ipv6_hints(callback) function net.ipv6_hints(callback)
if callback then if callback then
_nethints(3, function(mac, v4, v6, name) _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 if name and name ~= v6 then
callback(v6, name) callback(v6, name)
end end
@ -398,7 +398,7 @@ function net.ipv6_hints(callback)
else else
local rv = { } local rv = { }
_nethints(3, function(mac, v4, v6, name) _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 if name and name ~= v6 then
rv[#rv+1] = { v6, name } rv[#rv+1] = { v6, name }
end end