vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-22 19:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'dev' of https://github.com/ntop/ntopng into dev

Browse source
This commit is contained in:
Luca Deri 2017-09-21 00:40:05 +02:00
commit e682411abc
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/NetworkInterface.cpp
View file

@ -2979,8 +2979,9 @@ static bool flow_search_walker(GenericHashEntry *h, void *user_data) {
int ndpi_proto;
u_int16_t port;
int16_t local_network_id;
u_int16_t vlan_id;
u_int16_t vlan_id = 0, pool_filter;
u_int8_t ip_version;
u_int8_t *mac_filter;
LocationPolicy client_policy;
LocationPolicy server_policy;
bool unicast, unidirectional, alerted_flows;
@ -3084,6 +3085,20 @@ static bool flow_search_walker(GenericHashEntry *h, void *user_data) {
&& (f->get_srv_host() && (!f->get_srv_host()->get_ip()->isMulticastAddress() && !f->get_srv_host()->get_ip()->isBroadcastAddress()))))))
return(false); /* false = keep on walking */
/* Pool filter */
if(retriever->pag
&& retriever->pag->poolFilter(&pool_filter)
&& !((f->get_cli_host() && f->get_cli_host()->get_host_pool() == pool_filter)
|| (f->get_srv_host() && f->get_srv_host()->get_host_pool() == pool_filter)))
return(false); /* false = keep on walking */
/* Mac filter - NOTE: must stay below the vlan_id filter */
if(retriever->pag
&& retriever->pag->macFilter(&mac_filter)
&& !((f->get_cli_host() && f->get_cli_host()->getMac() && f->get_cli_host()->getMac()->equal(vlan_id, mac_filter))
|| (f->get_srv_host() && f->get_srv_host()->getMac() && f->get_srv_host()->getMac()->equal(vlan_id, mac_filter))))
return(false); /* false = keep on walking */
retriever->elems[retriever->actNumEntries].flow = f;
if(f->match(retriever->allowed_hosts)) {