mirror of
https://github.com/ntop/ntopng.git
synced 2026-04-29 07:29:32 +00:00
Fixes for protocol policies integrations in nEdge
This commit is contained in:
parent
fa55e23a13
commit
2749c08dcf
4 changed files with 34 additions and 4 deletions
|
|
@ -2422,8 +2422,8 @@ function formatSuspiciousDeviceProtocolAlert(flowstatus_info)
|
|||
|
||||
local label = discover.devtype2string(devtype)
|
||||
return i18n(msg, {proto=flowstatus_info["proto.ndpi"], devtype=label,
|
||||
url=ntop.getHttpPrefix().."/lua/admin/edit_device_protocols.lua?device_type="..
|
||||
devtype.."&l7proto="..flowstatus_info["proto.ndpi_id"]})
|
||||
url=getDeviceProtocolPoliciesUrl("device_type="..
|
||||
devtype.."&l7proto="..flowstatus_info["proto.ndpi_id"])})
|
||||
end
|
||||
|
||||
-- ###############################################
|
||||
|
|
@ -2754,6 +2754,9 @@ function label2criteriakey(what)
|
|||
return what, format_utils.formatValue
|
||||
end
|
||||
|
||||
-- Merges table a and table b into a new table. If some elements are presents in
|
||||
-- both a and b, b elements will have precedence.
|
||||
-- NOTE: this does *not* perform a deep merge. Only first level is merged.
|
||||
function table.merge(a, b)
|
||||
local merged = {}
|
||||
|
||||
|
|
@ -2766,6 +2769,7 @@ function table.merge(a, b)
|
|||
return merged
|
||||
end
|
||||
|
||||
-- Performs a deep copy of the table.
|
||||
function table.clone(orig)
|
||||
local orig_type = type(orig)
|
||||
local copy
|
||||
|
|
@ -3368,6 +3372,26 @@ end
|
|||
|
||||
-- ###########################################
|
||||
|
||||
function getDeviceProtocolPoliciesUrl(params_str)
|
||||
local url, sep
|
||||
|
||||
if ntop.isnEdge() then
|
||||
url = "/lua/pro/nedge/admin/nf_edit_user.lua?page=device_protocols"
|
||||
sep = "&"
|
||||
else
|
||||
url = "/lua/admin/edit_device_protocols.lua"
|
||||
sep = "?"
|
||||
end
|
||||
|
||||
if not isEmptyString(params_str) then
|
||||
return ntop.getHttpPrefix() .. url .. sep .. params_str
|
||||
end
|
||||
|
||||
return ntop.getHttpPrefix() .. url
|
||||
end
|
||||
|
||||
-- ###########################################
|
||||
|
||||
--
|
||||
-- IMPORTANT
|
||||
-- Leave it at the end so it can use the functions
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue