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

Implements CIDR search in flow explorer

Browse source 
partially implements #574
This commit is contained in:
Simone Mainardi 2016-12-20 15:32:52 +01:00
parent 4cef4e9782
commit 413e22e889
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scripts/lua/modules/db_utils.lua
View file

@ -22,14 +22,18 @@ end
function expandIpV4Network(net)
local prefix = net:match("/(.+)")
address = net:gsub("/.+","")
local prefix = tonumber(net:match("/(.+)"))
local address = net:gsub("/.+","")
if(prefix == nil) then prefix = 32 end
if(prefix == nil or prefix > 32 or prefix <= 0) then prefix = 32 end
local num_hosts = 2^(32-prefix)
local addr = iptonumber(address)
for i=1,32-prefix do
addr = clearbit(addr, bit(i))
end
return({ addr, addr+num_hosts-1 })
end
@ -162,7 +166,16 @@ function getNumFlows(interface_id, version, host, protocol, port, l7proto, info,
if((host ~= nil) and (host ~= "")) then
if(version == 4) then
sql = sql .." AND (IP_SRC_ADDR=INET_ATON('"..host.."') OR IP_DST_ADDR=INET_ATON('"..host.."'))"
local ip_range = expandIpV4Network(host)
local ip_lowest = ip_range[1]
local ip_highest = ip_range[2]
if ip_lowest == ip_highest then
sql = sql .." AND (IP_SRC_ADDR='"..ip_highest.."' OR IP_DST_ADDR='"..ip_highest.."')"
else
sql = sql .." AND ((IP_SRC_ADDR>='"..ip_lowest.."' AND IP_SRC_ADDR<='"..ip_highest.."')"
sql = sql .." OR (IP_DST_ADDR>='"..ip_lowest.."' AND IP_DST_ADDR<='"..ip_highest.."'))"
end
else
sql = sql .." AND (IP_SRC_ADDR='"..host.."' OR IP_DST_ADDR='"..host.."')"
end