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

Implement configsets target hosts CIDR match

Browse source
This commit is contained in:
emanuele-f 2019-12-20 14:26:59 +01:00
parent 7199364854
commit c6c6c46132
7 changed files with 135 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/lua/modules/user_scripts.lua
View file

@ -1127,7 +1127,7 @@ function user_scripts.loadDefaultConfig()
for type_id, script_type in pairs(user_scripts.script_types) do
for _, subdir in pairs(script_type.subdirs) do
local configsets = user_scripts.getConfigsets()
local configsets = user_scripts.getConfigsets(subdir)
local default_conf = configsets[user_scripts.DEFAULT_CONFIGSET_ID] or {}
local scripts = user_scripts.load(ifid, script_type, subdir, {return_all = true})
@ -1188,8 +1188,7 @@ end
local fast_target_lookup = nil
-- NOTE: this only works for exact searches. For hosts a different
-- approach will be used, see scripts/callbacks/interface/host.lua
-- NOTE: this only works for exact searches. For hosts see user_scripts.getHostTargetConfiset
function user_scripts.getTargetConfiset(configsets, target)
if(fast_target_lookup == nil) then
fast_target_lookup = {}
@ -1206,4 +1205,24 @@ end
-- ##############################################
local host_confsets_ptree_initialized = false
-- Performs an IP based match by using a patricia tree
function user_scripts.getHostTargetConfiset(configsets, ip_target)
if(not host_confsets_ptree_initialized) then
for _, configset in pairs(configsets) do
for _, conf_target in pairs(configset.targets) do
ntop.ptreeInsert(conf_target, configset.id)
end
end
host_confsets_ptree_initialized = true
end
local match_id = ntop.ptreeMatch(ip_target) or user_scripts.DEFAULT_CONFIGSET_ID
return(configsets[match_id])
end
-- ##############################################
return(user_scripts)