vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 23:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix captive portal issue when moving a device to the default pool

Browse source
This commit is contained in:
emanuele-f 2017-12-08 13:30:42 +01:00
parent 5b4aa461d9
commit d2deb32105
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/lua/modules/host_pools_utils.lua
View file

@ -71,7 +71,13 @@ function host_pools_utils.setPoolDetail(ifid, pool_id, detail, value)
return ntop.setHashCache(details_key, detail, tostring(value))
end
local function addMemberToRedisPool(members_key, member_key)
local function addMemberToRedisPool(ifid, pool_id, member_key)
if pool_id == host_pools_utils.DEFAULT_POOL_ID then
-- avoid adding default pool members explicitly
return true
end
local members_key = get_pool_members_key(ifid, pool_id)
local n = table.len(ntop.getMembersCache(members_key) or {})
if n >= host_pools_utils.LIMITED_NUMBER_POOL_MEMBERS then
@ -183,7 +189,6 @@ function host_pools_utils.changeMemberPool(ifid, member_and_vlan, new_pool, info
end
end
local members_key = get_pool_members_key(ifid, new_pool)
local member_exists, info = getMembershipInfo(member_and_vlan)
local prev_pool
@ -200,18 +205,17 @@ function host_pools_utils.changeMemberPool(ifid, member_and_vlan, new_pool, info
end
host_pools_utils.deletePoolMember(ifid, prev_pool, info.key)
addMemberToRedisPool(members_key, info.key)
addMemberToRedisPool(ifid, new_pool, info.key)
return true
end
function host_pools_utils.addPoolMember(ifid, pool_id, member_and_vlan)
local members_key = get_pool_members_key(ifid, pool_id)
local member_exists, info = getMembershipInfo(member_and_vlan)
if member_exists then
return false, info
else
local rv = addMemberToRedisPool(members_key, info.key)
local rv = addMemberToRedisPool(ifid, pool_id, info.key)
return rv, info
end
end