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

Added category renaming cleanup at startup

Browse source
This commit is contained in:
Matteo Biscosi 2024-01-31 10:14:37 +00:00
parent 878d514ba8
commit 80b5b9fb3c
3 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/lua/modules/protos_utils.lua
View file

@ -77,6 +77,7 @@ function protos_utils.parseProtosTxt()
local f = io.open(path, "r")
local defined_protos = {}
local rules = {}
local app_id_mapping = {}
local function addRule(proto, rule)
if (rules[proto] == nil) then
@ -107,6 +108,7 @@ function protos_utils.parseProtosTxt()
if (tmp ~= nil) and (#tmp == 2) then
proto = tmp[1]
app_id_mapping[tmp[2]] = proto
end
for _, rule in ipairs(rules) do
@ -153,7 +155,7 @@ function protos_utils.parseProtosTxt()
f:close()
return rules, defined_protos
return rules, defined_protos, app_id_mapping
end
-- ##############################################
@ -288,6 +290,28 @@ end
-- ##############################################
-- In order to have a clean startup, remove the old mappings
-- between protocols no more defined and categories
function protos_utils.clearOldApplications()
local current_rules, defined_protos, app_id_mapping = protos_utils.parseProtosTxt()
local key = getCustomnDPIProtoCategoriesKey()
local app_cat_mapping = ntop.getHashAllCache(key) or {}
if app_id_mapping then
for application_id, category_id in pairs(app_cat_mapping) do
if not app_id_mapping[application_id] then
traceError(TRACE_NORMAL, TRACE_CONSOLE, string.format("Removing Application - Category old mapping: %s %s", application_id, category_id))
ntop.delHashCache(key, application_id)
end
end
else
for application_id, category_id in pairs(app_cat_mapping) do
ntop.delHashCache(key, application_id)
end
end
end
-- ##############################################
-- Generates a protos.txt file based on the supplied rules
-- The defined_protos is used to ensure that the protocols are written
-- in the specified order as nDPI assigns IDs sequentially and existing