X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=76048eee9c30873fb7b07848c9a6be950fc3324f;hb=e21257f7fb3b92795787575094e69a7cd804ce55;hp=8dcb09924630aab7de7c3a3547b6988f54dd75fc;hpb=4647d4d8a9a97117b29c7b3a0477de2e76c01194;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 8dcb0992..76048eee 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -29,7 +29,8 @@ use FileHandle;
 use Carp;
 
 use strict;
-use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean);
+use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
+			@badmsg $badmsgfn);
 
 %work = ();						# outstanding jobs
 @msg = ();						# messages we have
@@ -38,6 +39,8 @@ $msgdir = "$main::root/msg";	# directory contain the msgs
 $maxage = 30 * 86400;			# the maximum age that a message shall live for if not marked 
 $last_clean = 0;				# last time we did a clean
 
+$badmsgfn = "$main::data/badmsg.pl";  # list of TO address we wont store
+
 %valid = (
 		  fromnode => '9,From Node',
 		  tonode => '9,To Node',
@@ -195,6 +198,14 @@ sub process
 								return;
 							}
 						}
+							
+						# look for 'bad' to addresses 
+						if (grep $ref->{to} eq $_, @badmsg) {
+							$ref->stop_msg($self);
+							dbg('msg', "'Bad' TO address $ref->{to}");
+							Log('msg', "'Bad' TO address $ref->{to}");
+							return;
+						}
 
 						$ref->{msgno} = next_transno("Msgno");
 						push @{$ref->{gotit}}, $f[2]; # mark this up as being received
@@ -517,6 +528,7 @@ sub queue_msg
 				next if $noderef->call eq $main::mycall;
 				next if $noderef->isolate;               # maybe add code for stuff originated here?
 				next if grep { $_ eq $noderef->call } @{$ref->{gotit}};
+				next if DXUser->get( ${$ref->{gotit}}[0] )->isolate;  # is the origin isolated?
 				
 				# if we are here we have a node that doesn't have this message
 				$ref->start_msg($noderef) if !get_busy($noderef->call)  && $noderef->state eq 'normal';
@@ -621,7 +633,10 @@ sub init
 	my $dir = new FileHandle;
 	my @dir;
 	my $ref;
-	
+
+	do "$badmsgfn" if -e "$badmsgfn";
+	print "$@\n" if $@;
+
 	# read in the directory
 	opendir($dir, $msgdir) or confess "can't open $msgdir $!";
 	@dir = readdir($dir);
@@ -629,15 +644,21 @@ sub init
 
 	@msg = ();
 	for (sort @dir) {
-		next if /^\./o;
-		next if ! /^m\d+/o;
+		next unless /^m\d+/o;
 		
 		$ref = read_msg_header("$msgdir/$_");
-		next if !$ref;
+		next unless $ref;
 		
+		# delete any messages to 'badmsg.pl' places
+		if (grep $ref->{to} eq $_, @badmsg) {
+			dbg('msg', "'Bad' TO address $ref->{to}");
+			Log('msg', "'Bad' TO address $ref->{to}");
+			$ref->del_msg;
+			next;
+		}
+
 		# add the message to the available queue
 		add_dir($ref); 
-		
 	}
 }