From 5f61a122730802ef5a1097449d9ff772bc7f78ec Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Thu, 9 Oct 2014 15:25:14 +0200
Subject: [PATCH] bugfix: server receiverum odesilal udalosti po jedne, namisto
aby poslal celou davku - zmena nazvu promenne sth na sth2 aby nedochazelo k
jejimu prepisovani #1931
---
src/warden-server/lib/Warden.pm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/warden-server/lib/Warden.pm b/src/warden-server/lib/Warden.pm
index 90d2d49..faeae35 100755
--- a/src/warden-server/lib/Warden.pm
+++ b/src/warden-server/lib/Warden.pm
@@ -283,7 +283,7 @@ sub saveNewEvent
sub getNewEvents
{
my ($class, $data) = @_;
- my ($sth, $rc, @events, $event, @ids);
+ my ($sth, $sth2, $rc, @events, $event, @ids);
my ($id, $hostname, $service, $detected, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout, $client_id);
# client network information
@@ -357,7 +357,7 @@ sub getNewEvents
$sth = $DBH->prepare("SELECT * FROM events e, clients c WHERE e.type != 'test' AND e.id > ? AND e.type = ? AND e.valid = 't' AND e.client_id = c.client_id AND c.hostname NOT LIKE ? ORDER BY id ASC LIMIT ?;");
if (!defined $sth) {
sendMsg("err",
- "Cannot prepare statement in function '$function_name': $DBH->errstr\n",
+ "Cannot prepare statement in function '$function_name': $DBH->errstr",
"Internal 'prepare' server error");
}
my ($domain) = $cn =~ /([^\.]+\.[^\.]+)$/;
@@ -387,19 +387,19 @@ sub getNewEvents
$client_id = $result[13];
# obtain hostname and service of events based on client_id from clients table
- $sth = $DBH->prepare("SELECT hostname, service FROM clients WHERE client_id = ?;");
- if (!defined $sth) {
+ $sth2 = $DBH->prepare("SELECT hostname, service FROM clients WHERE client_id = ?;");
+ if (!defined $sth2) {
sendMsg("err",
- "Cannot prepare statement in function '$function_name': $DBH->errstr\n",
+ "Cannot prepare statement in function '$function_name': $DBH->errstr",
"Internal 'prepare' server error");
}
- $rc = $sth->execute($client_id);
+ $rc = $sth2->execute($client_id);
if (!$rc) {
sendMsg("err",
"Cannot execute statement in function '$function_name': $DBH->errstr",
"Internal 'execute' server error");
}
- ($hostname, $service) = $sth->fetchrow();
+ ($hostname, $service) = $sth2->fetchrow();
# create SOAP data object
$event = SOAP::Data->name(event => \SOAP::Data->value(
--
GitLab