tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#8024 fixed router ip

This commit is contained in:
Daniel Maya 2021-09-28 13:42:30 +02:00
parent 9beda8eada
commit d237fab6a6
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pandora_console/include/functions_netflow.php
View File

@ -910,17 +910,24 @@ function netflow_get_filter_arguments($filter, $safe_input=false)
// Normal filter. // Normal filter.
if ($filter['ip_dst'] != '') { if ($filter['ip_dst'] != '') {
$filter_args .= ' ('; if ($filter_args != '') {
$filter_args .= ' AND (';
} else {
$filter_args .= ' (';
}
$val_ipdst = explode(',', io_safe_output($filter['ip_dst'])); $val_ipdst = explode(',', io_safe_output($filter['ip_dst']));
for ($i = 0; $i < count($val_ipdst); $i++) { for ($i = 0; $i < count($val_ipdst); $i++) {
if ($i > 0) { if (!empty($val_ipdst[$i])) {
$filter_args .= ' or '; if ($i > 0) {
} $filter_args .= ' or ';
}
if (netflow_is_net($val_ipdst[$i]) == 0) { if (netflow_is_net($val_ipdst[$i]) == 0) {
$filter_args .= 'dst ip '.$val_ipdst[$i]; $filter_args .= 'dst ip '.$val_ipdst[$i];
} else { } else {
$filter_args .= 'dst net '.$val_ipdst[$i]; $filter_args .= 'dst net '.$val_ipdst[$i];
}
} }
} }
@ -1734,7 +1741,9 @@ function netflow_update_second_level_filter(&$filter, $aggregate, $sources)
$filter[$extra_filter] .= ','; $filter[$extra_filter] .= ',';
} }
$filter[$extra_filter] = implode(',', $sources); if (!empty($sources)) {
$filter[$extra_filter] = implode(',', $sources);
}
} }