From f1f2c2f7e897d931771c35f42bb8252005877aaa Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Wed, 12 Aug 2015 10:43:14 +0200
Subject: [PATCH] Merged some changes from 6.0 that affect incremental modules.

---
 pandora_server/lib/PandoraFMS/Core.pm | 43 ++++++++++++++++++---------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index bc58f7cda6..91974f6b87 100755
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1142,9 +1142,8 @@ sub pandora_process_module ($$$$$$$$$;$) {
 	}
 	
 	# Process data
-	my $processed_data = process_data ($pa_config, $data_object, $module, $module_type, $utimestamp, $dbh);
+	my $processed_data = process_data ($pa_config, $data_object, $agent, $module, $module_type, $utimestamp, $dbh);
 	if (! defined ($processed_data)) {
-		logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
 		pandora_update_module_on_error ($pa_config, $module, $dbh);
 		return;
 	}
@@ -3279,8 +3278,9 @@ sub on_demand_macro($$$$$$) {
 ##########################################################################
 # Process module data.
 ##########################################################################
-sub process_data ($$$$$$) {
-	my ($pa_config, $data_object, $module, $module_type, $utimestamp, $dbh) = @_;
+sub process_data ($$$$$$$) {
+	my ($pa_config, $data_object, $agent, $module,
+	    $module_type, $utimestamp, $dbh) = @_;
 
 	if ($module_type eq "log4x") {
 		return log4x_get_severity_num($data_object);
@@ -3292,13 +3292,17 @@ sub process_data ($$$$$$) {
 	if ($module_type =~ m/_string$/) {
 
 		# Empty strings are not allowed
-		return undef if ($data eq '');
+		if ($data eq '') {
+			logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
+			return undef;
+		}
 
 		return $data;
 	}
 
 	# Not a number
 	if (! is_numeric ($data)) {
+		logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
 		return undef;
 	}
 
@@ -3306,12 +3310,14 @@ sub process_data ($$$$$$) {
 	$data =~ s/\,/\./;
 
 	# Out of bounds
-	return undef if (($module->{'max'} != $module->{'min'}) &&
-			($data > $module->{'max'} || $data < $module->{'min'}));
+	if (($module->{'max'} != $module->{'min'}) && ($data > $module->{'max'} || $data < $module->{'min'})) {
+		logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
+		return undef;
+	}
 
 	# Process INC modules
 	if ($module_type =~ m/_inc$/) {
-		$data = process_inc_data ($pa_config, $data, $module, $utimestamp, $dbh);
+		$data = process_inc_data ($pa_config, $data, $agent, $module, $utimestamp, $dbh);
 		
 		# No previous data or error.
 		return undef unless defined ($data);
@@ -3335,7 +3341,7 @@ sub process_data ($$$$$$) {
 # Process data of type *_inc.
 ##########################################################################
 sub process_inc_data ($$$$$) {
-	my ($pa_config, $data, $module, $utimestamp, $dbh) = @_;
+	my ($pa_config, $data, $agent, $module, $utimestamp, $dbh) = @_;
 
 	my $data_inc = get_db_single_row ($dbh, 'SELECT * FROM tagente_datos_inc WHERE id_agente_modulo = ?', $module->{'id_agente_modulo'});
 
@@ -3348,10 +3354,22 @@ sub process_inc_data ($$$$$) {
 		return undef;
 	}
 
+	# Out of order data
+	if ($utimestamp < $data_inc->{'utimestamp'}) {
+		logger($pa_config, "Received old data for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 3);
+		return undef;
+	}
+
+	# Should not happen
+	if ($utimestamp == $data_inc->{'utimestamp'}) {
+		logger($pa_config, "Duplicate timestamp for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 3);
+		return undef;
+	}
+
 	# Negative increment, reset inc data
-	if ($data < $data_inc->{'datos'} || $utimestamp < $data_inc->{'utimestamp'}) {
+	if ($data < $data_inc->{'datos'}) {
 		db_do ($dbh, 'UPDATE tagente_datos_inc SET datos = ?, utimestamp = ? WHERE id_agente_modulo = ?', $data, $utimestamp, $module->{'id_agente_modulo'});
-		logger($pa_config, "Discarding data and resetting counter for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 10);
+		logger($pa_config, "Discarding data and resetting counter for incremental module " . $module->{'nombre'} . "(module id " . $module->{'id_agente_modulo'} . ").", 3);
 
 		# Prevent the module from becoming unknown!
 		db_do ($dbh, 'UPDATE tagente_estado SET utimestamp = ? WHERE id_agente_modulo = ?', time(), $module->{'id_agente_modulo'});
@@ -3359,9 +3377,6 @@ sub process_inc_data ($$$$$) {
 		return undef;
 	}
 
-	# Should not happen
-	return undef if ($utimestamp == $data_inc->{'utimestamp'});
-
 	# Update inc data
 	db_do ($dbh, 'UPDATE tagente_datos_inc SET datos = ?, utimestamp = ? WHERE id_agente_modulo = ?', $data, $utimestamp, $module->{'id_agente_modulo'});