From 74dc73f744607f45eabd41e5dd69444df764d452 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 6 Feb 2017 09:29:13 +0100
Subject: [PATCH] Added new fitler option to netflow. Ticket #207

---
 pandora_console/include/functions_netflow.php      | 4 +++-
 pandora_console/operation/netflow/nf_live_view.php | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index e9fe2ac895..04d85d3be4 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -914,7 +914,6 @@ function netflow_get_command ($filter) {
  *
  */
 function netflow_get_filter_arguments ($filter) {
-	
 	// Advanced filter
 	$filter_args = '';
 	if ($filter['advanced_filter'] != '') {
@@ -922,6 +921,9 @@ function netflow_get_filter_arguments ($filter) {
 		return ' "(' . $filter_args . ')"';
 	}
 	
+	if ($filter['router_ip'] != "") {
+		$filter_args .=' "(router ip ' . $filter['router_ip'] . ')';
+	}
 	// Normal filter
 	if ($filter['ip_dst'] != '') {
 		$filter_args .= ' "(';
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index 6486b46998..990f3d9b65 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -79,6 +79,7 @@ $filter['ip_src'] = get_parameter('ip_src','');
 $filter['dst_port'] = get_parameter('dst_port','');
 $filter['src_port'] = get_parameter('src_port','');
 $filter['advanced_filter'] = get_parameter('advanced_filter','');
+$filter['router_ip'] = get_parameter('router_ip');
 
 // Read chart configuration
 $chart_type = get_parameter('chart_type', 'netflow_area');
@@ -386,6 +387,9 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
 	$aggregate_list = array ('none' => __('None'), 'proto' => __('Protocol'), 'srcip' =>__('Src Ip Address'), 'dstip' =>__('Dst Ip Address'), 'srcport' =>__('Src Port'), 'dstport' =>__('Dst Port') );
 	echo "<td colspan='2'>" . html_print_select ($aggregate_list, "aggregate", $filter['aggregate'], '', '', 0, true, false, true, '', false) . "</td>";
 	
+	echo "<td>" . '<b>'.__('Router ip').'</b>' . "</td>";
+	echo "<td colspan='2'>" . html_print_input_text ('router_ip', $filter['router_ip'], false, 30, 80, true) . "</td>";
+
 	echo "<td>" . '<b>'.__('Output format').'</b>' . "</td>";
 	$show_output = array ('bytes' => __('Bytes'), 'bytespersecond' => __('Bytes per second'), 'kilobytes' => __('Kilobytes'), 'megabytes' => __('Megabytes'), 'kilobytespersecond' => __('Kilobytes per second'), 'megabytespersecond' => __('Megabytes per second'));
 	echo "<td colspan='2'>" . html_print_select ($show_output, 'output', $filter['output'], '', '', 0, true, false, true, '', false) . "</td>";