Formatting changes only.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index c0079f0..d01a9e8 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.62 2007-02-22 11:51:58 mike Exp $
+# $Id: IRSpy.pm,v 1.65 2007-02-23 13:14:13 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -427,14 +427,19 @@ sub check {
        eval { $conn->_check() };
        if ($@ &&
            ($ev == ZOOM::Event::RECV_DATA ||
-            $ev == ZOOM::Event::ZEND)) {
+            $ev == ZOOM::Event::ZEND ||
+            ($ev == ZOOM::Event::RECV_APDU &&
+             !$task->isa("ZOOM::IRSpy::Task::Connect")))) {
            # An error in, say, a search response, becomes visible to
            # ZOOM before the Receive Data event is sent and persists
            # until after the End, which means that successive events
            # each report the same error.  So we just ignore errors on
-           # "unimportant" events.  ### But this doesn't work for,
-           # say, a Connection Refused, as the only event that shows
-           # us this error is the ZEND.
+           # "unimportant" events.  We can also ignore errors on
+           # RECV_APDU in most cases, but since there is no RECV_INIT
+           # event, we need to avoid doing this if the task is
+           # Connect.  Yuck -- special cases.
+           # ### But this doesn't work for, say, a Connection Refused,
+           # as the only event that shows us this error is the ZEND.
            $conn->log("irspy_event", "ignoring error ",
                       "on event $ev ($evstr): $@");
            next;
@@ -497,11 +502,13 @@ sub check {
     $this->log("irspy", "exiting main loop");
     # Sanity checks: none of the following should ever happen
     my $finished = 1;
-    foreach my $conn (@{ $this->{connections} }) {
+    @conn = @{ $this->{connections} };
+    foreach my $conn (@conn) {
        my $test = $conn->option("current_test_address");
        my $next = $this->_next_test($test);
        if (defined $next) {
-           $this->log("irspy", "$conn (in test '$test') has queued test '$next'");
+           $this->log("irspy",
+                      "$conn (in test '$test') has queued test '$next'");
            $finished = 0;
        }
        if (my $task = $conn->current_task()) {
@@ -513,7 +520,8 @@ sub check {
            $finished = 0;
        }
        if (!$conn->is_idle()) {
-           $this->log("irspy", "$conn still has ZOOM-C level tasks queued: see below");
+           $this->log("irspy",
+                      "$conn still has ZOOM-C level tasks queued: see below");
            $finished = 0;
        }
        my $ev = $conn->peek_event();
@@ -529,8 +537,8 @@ sub check {
     }
 
     # This really shouldn't be necessary, and in practice it rarely
-    # helps, but it's belt and braces.  For now, we don't do this
-    # (hence the zero in the $nruns check).
+    # helps, but it's belt and braces.  (For now, we don't do this
+    # hence the zero in the $nruns check).
     if (!$finished) {
        if (++$nruns < 0) {
            $this->log("irspy", "back into main loop, ${nruns}th time");
@@ -541,12 +549,12 @@ sub check {
     }
 
     # This shouldn't happen emit anything either:
-    @conn = @{ $this->{connections} };
     while ((my $i1 = ZOOM::event(\@conn)) > 0) {
        my $conn = $conn[$i1-1];
        my $ev = $conn->last_event();
        my $evstr = ZOOM::event_str($ev);
-       warn "$conn still has ZOOM-C level task queued: $ev ($evstr)"
+       $this->log("irspy",
+                  "$conn still has ZOOM-C level task queued: $ev ($evstr)")
            if $ev != ZOOM::Event::ZEND;
     }