task #519, kod klienta uzavren do eval bloku

src/warden-client/doc/example-receiver.pl.txt

@@ -18,17 +18,14 @@ use strict;
 # This code should developer add into his/her application.
 
 # Path to warden-client directory
-my $warden_path = '/opt/warden-client';
+my $warden_path = '/home/soukal/client-test/2.0.0_beta/warden-client/';
 
 # Inclusion of warden-client receiving functionality
 require $warden_path . '/lib/WardenClientReceive.pm';
 
 # Definition of requested event type. This attributes is also set on server
 # and must not change.
-my $requested_type = "botnet_c_c";
-
-# Download of new evetns from Warden server
-my @new_events = WardenClientReceive::getNewEvents($warden_path, $requested_type);
+my $requested_type = "portscan";
 
 #------------------------------------------------------------------------------
 # Simple code that prints out new events obtained from Warden server.
@@ -37,9 +34,15 @@ print "+------------------------------------------------------------------------
 print "| id | hostname | service | detected | type | source_type | source | target_proto | target_port | attack_scale | note | priority | timeout |\n";
 print "+------------------------------------------------------------------------------------------------------------------------------------------+\n";
 
-foreach (@new_events) {
-  print "| " . join(' | ', @$_) . " |" . "\n";
+# Download of new evetns from Warden server
+while (my @new_events = WardenClientReceive::getNewEvents($warden_path, $requested_type)) {
+  foreach my $event_ref (@new_events) {
+    my @event = @$event_ref;
+    print "| " . join(' | ', @event) . " |" . "\n";
   }
+print "+------------------------------------------------------------------------------------------------------------------------------------------+\n";
+}
+
 print "+------------------------------------------------------------------------------------------------------------------------------------------+";
 print "\n";
 print "Last events in: " . scalar(localtime(time)) . "\n";

src/warden-client/lib/WardenClientReceive.pm

@@ -81,6 +81,10 @@ sub c2s
 #-------------------------------------------------------------------------------
 sub getNewEvents
 {
+  my @events;  
+
+  eval {
+
     my $warden_path = shift;
     my $requested_type = shift;
 
@@ -132,7 +136,7 @@ sub getNewEvents
 
     # parse returned SOAP data object
     my ($id, $hostname, $service, $detected, $type, $source_type, $source, $target_proto, $target_port, $attack_scale, $note, $priority, $timeout);
-  my @events;
+#    my @events;
     my @response_list = $response->valueof('/Envelope/Body/getNewEventsResponse/event/');
     while (scalar @response_list) {
       my $response_data = shift(@response_list);
@@ -169,6 +173,10 @@ sub getNewEvents
       print ID $last_id;
       close ID;
     }
+  } # End of eval block
+  or do {
+    return;
+  };
 
   return @events;