From 9bf5146be770d5123ebfc397b007255018742e6b Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Mon, 9 Feb 2015 16:06:39 +0100
Subject: [PATCH] smazano nastaveni lib; odmazany prazdne znaky; oprava volani
funkce c2s
---
src/warden-client/lib/WardenClient.pm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/warden-client/lib/WardenClient.pm b/src/warden-client/lib/WardenClient.pm
index 37f1e6c..4c86c0a 100755
--- a/src/warden-client/lib/WardenClient.pm
+++ b/src/warden-client/lib/WardenClient.pm
@@ -12,7 +12,6 @@ use warnings;
use SOAP::Lite;
use File::Basename;
my $lib = File::Basename::dirname(__FILE__);
-use lib $lib;
use WardenClientCommon;
@@ -66,9 +65,9 @@ sub saveNewEvent
# check if obsolete event attribute 'Timeout' is used
if ((defined $timeout) && ($timeout >= 0)) {
WardenClientCommon::errMsg("Event attribute 'Timeout' is now obsolete and will be removed in Warden client v.3.0", "warn");
- }
+ }
# end of Issue #596
-
+
# create SOAP data object
my $event;
eval {
@@ -91,8 +90,8 @@ sub saveNewEvent
my $result = WardenClientCommon::c2s("saveNewEvent", $event);
- defined $result ? return 1 : return 0;
-
+ defined $result ? return 1 : return 0;
+
} # End of saveNewEvent
@@ -135,11 +134,11 @@ sub getNewEvents
)
)
} or return WardenClientCommon::errMsg('Unknown error when creating SOAP data object, ' . $@);
-
+
# call server method getNewEvents
my $response = WardenClientCommon::c2s("getNewEvents", $request_data);
defined $response or return;
-
+
# parse server response (SOAP data object)
my @events;
my ($id, $hostname, $service, $detected, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout);
@@ -164,7 +163,7 @@ sub getNewEvents
@event = ($id, $hostname, $service, $detected, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout);
push (@events, \@event);
-
+
# set maximum received ID from current batch
if ($id > $last_id) {
$last_id = $id;
@@ -188,7 +187,7 @@ sub getNewEvents
sub getClientInfo
{
# obtain information about clients on Warden server
- my $response = c2s("getClientInfo");
+ my $response = WardenClientCommon::c2s("getClientInfo");
defined $response or return; # receive data or return undef
# parse server response (SOAP data object)
--
GitLab