Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: fix parsing of ethers(5)

Browse source 
The /etc/ethers file may contain any number of white space characters
between the mac address and the IP/hostname field, so extend the pattern
to allow for that.

Man ethers(5) also states that the IP field may be a symbolic hostname,
so test whether the name is an IP address or hostname before adding it
to the hints structure.

Fixes #1674.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-03-11 18:16:24 +01:00
parent bf04031171
commit 62630fbf88
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/luci-base/luasrc/sys.lua
View file

@ -146,9 +146,13 @@ local function _nethints(what, callback)
if fs.access("/etc/ethers") then if fs.access("/etc/ethers") then
for e in io.lines("/etc/ethers") do for e in io.lines("/etc/ethers") do
mac, ip = e:match("^([a-f0-9]%S+) (%S+)") mac, name = e:match("^([a-fA-F0-9:]+)%s+(%S+)")
if mac and ip then if mac and name then
_add(what, mac:upper(), ip, nil, nil) if luci.ip.IPv4(name) then
_add(what, mac:upper(), name, nil, nil)
else
_add(what, mac:upper(), nil, nil, name)
end
end end
end end
end end