change the looping protoection for PC16/17/19/21 and also be more rigorous

[spider.git] / perl / DXMsg.pm

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index c87fd2e4ec5b316433e9749f28aa525a0098cb8d..45de0f9fa3d6a5682c52d0ee412e2805aa4df076 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -27,6 +27,13 @@ use IO::File;
 use Fcntl;
 
 use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
                        @badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
                    $queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);
@@ -168,7 +175,7 @@ sub process
 
                        if (exists $busy{$fromnode}) {
                                my $ref = $busy{$fromnode};
-                               my $tonode = $ref->{tonode};
+                               my $tonode = $ref->{tonode} || "unknown";
                                dbg("Busy, stopping msgno: $ref->{msgno} $fromnode->$tonode") if isdbg('msg');
                                $ref->stop_msg($self->call);
                        }
@@ -274,8 +281,8 @@ sub process
                                                        if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
                                                                $ref->stop_msg($self->call);
                                                                my $msgno = $m->{msgno};
-                                                               dbg("duplicate message from $ref->{from} -> $ref->{to} to $msgno") if isdbg('msg');
-                                                               Log('msg', "duplicate message from $ref->{from} -> $ref->{to} to $msgno");
+                                                               dbg("duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno") if isdbg('msg');
+                                                               Log('msg', "duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno");
                                                                return;
                                                        }
                                                }
@@ -382,7 +389,7 @@ sub process
                                if ($_->{from} eq $f[1] && $_->{subject} eq $f[2]) {
                                        $_->del_msg();
                                        Log('msg', "Message $_->{msgno} from $_->{from} ($_->{subject}) fully deleted");
-                                       DXProt::broadcast_ak1a($line, $self);
+                                       DXChannel::broadcast_nodes($line, $self);
                                }
                        }
                }
@@ -580,7 +587,6 @@ sub send_tranche
 sub queue_msg
 {
        my $sort = shift;
-       my $call = shift;
        my $ref;
        my $clref;
        
@@ -634,23 +640,26 @@ sub queue_msg
                                        dbg("Route: No dxchan for $ref->{to} " . ref($clref) ) if isdbg('msg');
                                }
                        }
-               }
-               
-               # otherwise we are dealing with a bulletin or forwarded private message
-               # compare the gotit list with
-               # the nodelist up above, if there are sites that haven't got it yet
-               # then start sending it - what happens when we get loops is anyone's
-               # guess, use (to, from, time, subject) tuple?
-               foreach $dxchan (@nodelist) {
-                       my $call = $dxchan->call;
-                       next unless $call;
-                       next if $call eq $main::mycall;
-                       next if ref $ref->{gotit} && grep $_ eq $call, @{$ref->{gotit}};
-                       next unless $ref->forward_it($call);           # check the forwarding file
-
-                       # if we are here we have a node that doesn't have this message
-                       $ref->start_msg($dxchan) if !get_busy($call)  && $dxchan->state eq 'normal';
-                       last;
+               } else {
+                       
+                       # otherwise we are dealing with a bulletin or forwarded private message
+                       # compare the gotit list with
+                       # the nodelist up above, if there are sites that haven't got it yet
+                       # then start sending it - what happens when we get loops is anyone's
+                       # guess, use (to, from, time, subject) tuple?
+                       foreach $dxchan (@nodelist) {
+                               my $call = $dxchan->call;
+                               next unless $call;
+                               next if $call eq $main::mycall;
+                               next if ref $ref->{gotit} && grep $_ eq $call, @{$ref->{gotit}};
+                               next unless $ref->forward_it($call);           # check the forwarding file
+                               
+                               # if we are here we have a node that doesn't have this message
+                               if (!get_busy($call)  && $dxchan->state eq 'normal') {
+                                       $ref->start_msg($dxchan);
+                                       last;
+                               }
+                       }
                }
 
                # if all the available nodes are busy then stop
@@ -1102,7 +1111,7 @@ sub import_msgs
                my @msg = map { chomp; $_ } <MSG>;
                close(MSG);
                unlink($fn);
-               my @out = import_one($DXProt::me, \@msg, $splitit);
+               my @out = import_one($main::me, \@msg, $splitit);
                Log('msg', @out);
        }
 }