X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXMsg.pm;h=f9ede90c4c167f9445019e243dc346d7bd565cfc;hb=4f444f8dd0c7a7bf53a8d40e4e0fbadf57d32ffb;hp=9e4893b23485c386f00f3cda79931247b0a5d2f0;hpb=de987b900c04d852acec5e1af9a4326b16533253;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 9e4893b2..f9ede90c 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -28,7 +28,6 @@ use DXDebug;
 use DXLog;
 use IO::File;
 use Fcntl;
-use Carp;
 
 use strict;
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
@@ -137,7 +136,7 @@ sub process
 	# this is periodic processing
 	if (!$self || !$line) {
 
-		if ($main::systime > $lastq + $queueinterval) {
+		if ($main::systime >= $lastq + $queueinterval) {
 
 			# wander down the work queue stopping any messages that have timed out
 			for (keys %busy) {
@@ -184,6 +183,7 @@ sub process
 
 			my $t = cltounix($f[5], $f[6]);
 			my $stream = next_transno($f[2]);
+			$f[13] = $self->call unless $f[13] && $f[13] gt ' ';
 			my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]);
 			
 			# fill in various forwarding state variables
@@ -194,6 +194,7 @@ sub process
 			$ref->{stream} = $stream;
 			$ref->{count} = 0;	# no of lines between PC31s
 			dbg('msg', "new message from $f[4] to $f[3] '$f[8]' stream $stream\n");
+			Log('msg', "Incoming message $f[4] to $f[3] '$f[8]'" );
 			$work{"$f[2]$stream"} = $ref; # store in work
 			$busy{$f[2]} = $ref; # set interlock
 			$self->send(DXProt::pc30($f[2], $f[1], $stream)); # send ack
@@ -211,6 +212,7 @@ sub process
 		if ($pcno == 29) {		# incoming text
 			my $ref = $work{"$f[2]$f[3]"};
 			if ($ref) {
+				$f[4] =~ s/\%5E/^/g;
 				push @{$ref->{lines}}, $f[4];
 				$ref->{count}++;
 				if ($ref->{count} >= $ref->{linesreq}) {
@@ -282,8 +284,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('msg', "duplicate message to $msgno\n");
-								Log('msg', "duplicate message to $msgno");
+								dbg('msg', "duplicate message from $ref->{from} -> $ref->{to} to $msgno");
+								Log('msg', "duplicate message from $ref->{from} -> $ref->{to} to $msgno");
 								return;
 							}
 						}
@@ -504,17 +506,24 @@ sub read_msg_header
 	my @f;
 	my $size;
 	
-	$file = new IO::File;
-	if (!open($file, $fn)) {
-		print "Error reading $fn $!\n";
+	$file = new IO::File "$fn";
+	if (!$file) {
+	    dbg('err', "Error reading $fn $!");
+	    Log('err', "Error reading $fn $!");
 		return undef;
 	}
 	$size = -s $fn;
 	$line = <$file>;			# first line
+	if ($size == 0 || !$line) {
+	    dbg('err', "Empty $fn $!");
+	    Log('err', "Empty $fn $!");
+		return undef;
+	}
 	chomp $line;
 	$size -= length $line;
 	if (! $line =~ /^===/o) {
-		print "corrupt first line in $fn ($line)\n";
+		dbg('err', "corrupt first line in $fn ($line)");
+		Log('err', "corrupt first line in $fn ($line)");
 		return undef;
 	}
 	$line =~ s/^=== //o;
@@ -525,7 +534,8 @@ sub read_msg_header
 	chomp $line;
 	$size -= length $line;
 	if (! $line =~ /^===/o) {
-		print "corrupt second line in $fn ($line)\n";
+	    dbg('err', "corrupt second line in $fn ($line)");
+	    Log('err', "corrupt second line in $fn ($line)");
 		return undef;
 	}
 	$line =~ s/^=== //o;
@@ -551,7 +561,8 @@ sub read_msg_body
 	
 	$file = new IO::File;
 	if (!open($file, $fn)) {
-		print "Error reading $fn $!\n";
+		dbg('err' ,"Error reading $fn $!");
+		Log('err' ,"Error reading $fn $!");
 		return undef;
 	}
 	@out = map {chomp; $_} <$file>;
@@ -590,12 +601,12 @@ sub queue_msg
 	my $call = shift;
 	my $ref;
 	my $clref;
-	my @nodelist = DXChannel::get_all_ak1a();
 	
 	# bat down the message list looking for one that needs to go off site and whose
 	# nearest node is not busy.
 
 	dbg('msg', "queue msg ($sort)\n");
+	my @nodelist = DXChannel::get_all_nodes;
 	foreach $ref (@msg) {
 		# firstly, is it private and unread? if so can I find the recipient
 		# in my cluster node list offsite?
@@ -612,7 +623,7 @@ sub queue_msg
 			next if $ref->{'read'};           # if it is read, it is stuck here
 			$clref = DXCluster->get_exact($ref->{to});
 			unless ($clref) {             # otherwise look for a homenode
-				my $uref = DXUser->get($ref->{to});
+				my $uref = DXUser->get_current($ref->{to});
 				my $hnode =  $uref->homenode if $uref;
 				$clref = DXCluster->get_exact($hnode) if $hnode;
 			}
@@ -740,9 +751,9 @@ sub init
 	my $ref;
 		
 	# load various control files
-	print "load badmsg: ", (load_badmsg() or "Ok"), "\n";
-	print "load forward: ", (load_forward() or "Ok"), "\n";
-	print "load swop: ", (load_swop() or "Ok"), "\n";
+	dbg('err', "load badmsg: " . (load_badmsg() or "Ok"));
+	dbg('err', "load forward: " . (load_forward() or "Ok"));
+	dbg('err', "load swop: " . (load_swop() or "Ok"));
 
 	# read in the directory
 	opendir($dir, $msgdir) or confess "can't open $msgdir $!";
@@ -751,10 +762,15 @@ sub init
 
 	@msg = ();
 	for (sort @dir) {
-		next unless /^m\d+$/o;
+		next unless /^m\d\d\d\d\d\d$/;
 		
 		$ref = read_msg_header("$msgdir/$_");
-		next unless $ref;
+		unless ($ref) {
+			dbg('err', "Deleting $_");
+			Log('err', "Deleting $_");
+			unlink "$msgdir/$_";
+			next;
+		}
 		
 		# delete any messages to 'badmsg.pl' places
 		if (grep $ref->{to} eq $_, @badmsg) {
@@ -1231,6 +1247,9 @@ sub AUTOLOAD
 	$name =~ s/.*:://o;
 	
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+	# this clever line of code creates a subroutine which takes over from autoload
+	# from OO Perl - Conway
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
 	@_ ? $self->{$name} = shift : $self->{$name} ;
 }