Ignore errors detected on RECV_APDU except when the task is Connect.

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

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index fa7606a..6ea8910 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.61 2007-02-21 17:57:59 mike Exp $
+# $Id: IRSpy.pm,v 1.64 2007-02-22 17:46:23 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -404,11 +404,19 @@ sub check {
        my $i0 = ZOOM::event(\@conn);
        $this->log("irspy_event",
                   "ZOOM_event(", scalar(@conn), " connections) = $i0");
-       if ($i0 == -3 || $i0 == 0) {
-           # no connections left, or no events on those that remain
-           $this->log("irspy", "no events remain");
+       if ($i0 < 1) {
+           my %messages = (
+                           0 => "no events remain",
+                           -1 => "ZOOM::event() argument not a reference",
+                           -2 => "ZOOM::event() reference not an array",
+                           -3 => "no connections remain",
+                           -4 => "too many connections for ZOOM::event()",
+                           );
+           my $message = $messages{$i0} || "ZOOM::event() returned $i0";
+           $this->log("irspy", $message);
            last;
        }
+
        my $conn = $conn[$i0-1];
        my $ev = $conn->last_event();
        my $evstr = ZOOM::event_str($ev);
@@ -419,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;
@@ -521,9 +534,10 @@ sub check {
     }
 
     # This really shouldn't be necessary, and in practice it rarely
-    # helps, but it's belt and braces
+    # 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 < 3) {
+       if (++$nruns < 0) {
            $this->log("irspy", "back into main loop, ${nruns}th time");
            goto ROUND_AND_ROUND_WE_GO;
        } else {
@@ -533,11 +547,12 @@ sub check {
 
     # This shouldn't happen emit anything either:
     @conn = @{ $this->{connections} };
-    while (my $i1 = ZOOM::event(\@conn)) {
+    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;
     }