change build number calculation to be more accurate

[spider.git] / perl / DXMsg.pm

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index f136b16e7b23750192b817f27055caf0592e8fef..b4470f66c8f3866485dfb9ebfd816ac16a0294ff 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);
@@ -284,7 +291,7 @@ sub process
                                                $ref->swop_it($self->call);
                                                
                                                # look for 'bad' to addresses 
-                                               if ($ref->dump_it) {
+                                               if ($ref->dump_it($self->call)) {
                                                        $ref->stop_msg($self->call);
                                                        dbg("'Bad' message $ref->{to}") if isdbg('msg');
                                                        Log('msg', "'Bad' message $ref->{to}");
@@ -686,7 +693,15 @@ sub start_msg
        $busy{$self->{tonode}} = $self;
        $work{$self->{tonode}} = $self;
        $self->{lastt} = $main::systime;
-       $dxchan->send(DXProt::pc28($self->{tonode}, $self->{fromnode}, $self->{to}, $self->{from}, $self->{t}, $self->{private}, $self->{subject}, $self->{origin}, $self->{rrreq}));
+       my ($fromnode, $origin);
+       if ($dxchan->is_arcluster) {
+               $fromnode = $self->{origin};
+               $origin = $self->{fromnode};
+       } else {
+               $fromnode = $self->{fromnode};
+               $origin = $self->{origin};
+       }
+       $dxchan->send(DXProt::pc28($self->{tonode}, $fromnode, $self->{to}, $self->{from}, $self->{t}, $self->{private}, $self->{subject}, $origin, $self->{rrreq}));
 }
 
 # get the ref of a busy node
@@ -777,7 +792,7 @@ sub init
                }
                
                # delete any messages to 'badmsg.pl' places
-               if ($ref->dump_it) {
+               if ($ref->dump_it('')) {
                        dbg("'Bad' TO address $ref->{to}") if isdbg('msg');
                        Log('msg', "'Bad' TO address $ref->{to}");
                        $ref->del_msg;
@@ -992,6 +1007,7 @@ sub forward_it
 sub dump_it
 {
        my $ref = shift;
+       my $call = shift;
        my $i;
        
        for ($i = 0; $i < @badmsg; $i += 3) {
@@ -1007,6 +1023,7 @@ sub dump_it
                $tested = $ref->{from} if $field eq 'F';
                $tested = $ref->{origin} if $field eq 'O';
                $tested = $ref->{subject} if $field eq 'S';
+               $tested = $call if $field eq 'I';
 
                if (!$pattern || $tested =~ m{$pattern}i) {
                        return 1;