Merge pull request #5403 from lvoegl/luci-app-wireguard-fix-parsing

luci-app-wireguard: fix allowed_ip parsing
This commit is contained in:
Florian Eckert 2021-10-01 17:06:33 +02:00 committed by GitHub
commit fc8a0b4d51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -93,28 +93,27 @@ local methods = {
end end
) )
table.insert( local peer = {
data[line[1]].peers, name = peer_name,
{ public_key = line[2],
name = peer_name, endpoint = line[4],
public_key = line[2], allowed_ips = {},
endpoint = line[4], latest_handshake = line[6],
allowed_ips = {}, transfer_rx = line[7],
latest_handshake = line[6], transfer_tx = line[8],
transfer_rx = line[7], persistent_keepalive = line[9]
transfer_tx = line[8], }
persistent_keepalive = line[9]
}
)
if not (line[4] == "(none)") then if not (line[4] == "(none)") then
local ipkey, ipvalue local ipkey, ipvalue
for ipkey, ipvalue in pairs(string.split(line[5], ",")) do for ipkey, ipvalue in pairs(string.split(line[5], ",")) do
if #ipvalue > 0 then if #ipvalue > 0 then
table.insert(data[line[1]].peers[peer_name]["allowed_ips"], ipvalue) table.insert(peer["allowed_ips"], ipvalue)
end end
end end
end end
table.insert(data[line[1]].peers, peer)
end end
end end
end end