projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not go back into main loop if peek_event() is either 0 or ZEND.
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy.pm
diff --git
a/lib/ZOOM/IRSpy.pm
b/lib/ZOOM/IRSpy.pm
index
ff85dec
..
03952fe
100644
(file)
--- a/
lib/ZOOM/IRSpy.pm
+++ b/
lib/ZOOM/IRSpy.pm
@@
-1,4
+1,4
@@
-# $Id: IRSpy.pm,v 1.55 2006-12-18 15:32:32 mike Exp $
+# $Id: IRSpy.pm,v 1.60 2007-02-13 15:02:35 mike Exp $
package ZOOM::IRSpy;
package ZOOM::IRSpy;
@@
-248,15
+248,22
@@
sub _render_record {
sub _irspy_to_zeerex {
my ($this, $conn) = @_;
my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
sub _irspy_to_zeerex {
my ($this, $conn) = @_;
my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
- #open FH, '>/tmp/irspy_orig.xml';
- #print FH $irspy_doc->toString();
- #close FH;
+ my $save_xml = 0;
+
+ if ($save_xml) {
+ unlink('/tmp/irspy_orig.xml');
+ open FH, '>/tmp/irspy_orig.xml';
+ print FH $irspy_doc->toString();
+ close FH;
+ }
my %params = ();
my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
my %params = ();
my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
-
- #open FH, '>/tmp/irspy_transformed.xml';
- #print FH $result->toString();
- #close FH;
+ if ($save_xml) {
+ unlink('/tmp/irspy_transformed.xml');
+ open FH, '>/tmp/irspy_transformed.xml';
+ print FH $result->toString();
+ close FH;
+ }
return $result->documentElement();
}
return $result->documentElement();
}
@@
-397,7
+404,11
@@
sub check {
my $i0 = ZOOM::event(\@conn);
$this->log("irspy_event",
"ZOOM_event(", scalar(@conn), " connections) = $i0");
my $i0 = ZOOM::event(\@conn);
$this->log("irspy_event",
"ZOOM_event(", scalar(@conn), " connections) = $i0");
- last if $i0 == 0 || $i0 == -3; # no events or no connections
+ if ($i0 == -3 || $i0 == 0) {
+ # no connections left, or no events on those that remain
+ $this->log("irspy", "no events remain");
+ last;
+ }
my $conn = $conn[$i0-1];
my $ev = $conn->last_event();
my $evstr = ZOOM::event_str($ev);
my $conn = $conn[$i0-1];
my $ev = $conn->last_event();
my $evstr = ZOOM::event_str($ev);
@@
-408,7
+419,6
@@
sub check {
eval { $conn->_check() };
if ($@ &&
($ev == ZOOM::Event::RECV_DATA ||
eval { $conn->_check() };
if ($@ &&
($ev == ZOOM::Event::RECV_DATA ||
- $ev == ZOOM::Event::RECV_APDU ||
$ev == ZOOM::Event::ZEND)) {
# An error in, say, a search response, becomes visible to
# ZOOM before the Receive Data event is sent and persists
$ev == ZOOM::Event::ZEND)) {
# An error in, say, a search response, becomes visible to
# ZOOM before the Receive Data event is sent and persists
@@
-416,7
+426,7
@@
sub check {
# 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
# 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 End.
+ # us this error is the ZEND.
$conn->log("irspy_event", "ignoring error ",
"on event $ev ($evstr): $@");
next;
$conn->log("irspy_event", "ignoring error ",
"on event $ev ($evstr): $@");
next;
@@
-498,15
+508,22
@@
sub check {
$this->log("irspy", "$conn still has ZOOM-C level tasks queued: see below");
$finished = 0;
}
$this->log("irspy", "$conn still has ZOOM-C level tasks queued: see below");
$finished = 0;
}
+ my $ev = $conn->peek_event();
+ if ($ev != 0 && $ev != ZOOM::Event::ZEND) {
+ my $evstr = ZOOM::event_str($ev);
+ $this->log("irspy", "$conn has event $ev ($evstr) waiting");
+ $finished = 0;
+ }
if (!$conn->option("rewrote_record")) {
$this->log("irspy", "$conn did not rewrite its ZeeRex record");
$finished = 0;
}
}
if (!$conn->option("rewrote_record")) {
$this->log("irspy", "$conn did not rewrite its ZeeRex record");
$finished = 0;
}
}
- # This really shouldn't be necessary, but it's belt and braces
+ # This really shouldn't be necessary, and in practice it rarely
+ # helps, but it's belt and braces
if (!$finished) {
if (!$finished) {
- if (++$nruns < 10) {
+ if (++$nruns < 3) {
$this->log("irspy", "back into main loop, ${nruns}th time");
goto ROUND_AND_ROUND_WE_GO;
} else {
$this->log("irspy", "back into main loop, ${nruns}th time");
goto ROUND_AND_ROUND_WE_GO;
} else {