X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=13af2cc02eac81e6bb85369add0fa39b3ce4a75e;hb=97315924f561c56cef3b581691409d4217f5c1b5;hp=8dcb09924630aab7de7c3a3547b6988f54dd75fc;hpb=4647d4d8a9a97117b29c7b3a0477de2e76c01194;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 8dcb0992..13af2cc0 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -11,6 +11,7 @@
 #
 # PC28 field 11 is the RR required flag
 # PC28 field 12 is a VIA routing (ie it is a node call) 
+#
 
 package DXMsg;
 
@@ -25,11 +26,13 @@ use DXProtVars;
 use DXProtout;
 use DXDebug;
 use DXLog;
-use FileHandle;
+use IO::File;
+use Fcntl;
 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 $forwardfn @forward);
 
 %work = ();						# outstanding jobs
 @msg = ();						# messages we have
@@ -37,6 +40,10 @@ use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean);
 $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
+@forward = ();                  # msg forward table
+
+$badmsgfn = "$msgdir/badmsg.pl";  # list of TO address we wont store
+$forwardfn = "$msgdir/forward.pl";  # the forwarding table
 
 %valid = (
 		  fromnode => '9,From Node',
@@ -61,6 +68,13 @@ $last_clean = 0;				# last time we did a clean
 		  keep => '0,Keep this?,yesno',
 		 );
 
+sub DESTROY
+{
+	my $self = shift;
+	undef $self->{lines};
+	undef $self->{gotit};
+}
+
 # allocate a new object
 # called fromnode, tonode, from, to, datetime, private?, subject, nolinesper  
 sub alloc                  
@@ -70,7 +84,7 @@ sub alloc
 	$self->{msgno} = shift;
 	my $to = shift;
 	#  $to =~ s/-\d+$//o;
-	$self->{to} = $to;
+	$self->{to} = ($to eq $main::mycall) ? $main::myalias : $to;
 	my $from = shift;
 	$from =~ s/-\d+$//o;
 	$self->{from} = uc $from;
@@ -101,7 +115,7 @@ sub workclean
 sub process
 {
 	my ($self, $line) = @_;
-	my @f = split /[\^\~]/, $line;
+	my @f = split /\^/, $line;
 	my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
 	
  SWITCH: {
@@ -195,6 +209,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
@@ -239,7 +261,7 @@ sub process
 			$f[3] =~ s/^\///o;   # remove the leading /
 			$f[3] = lc $f[3];	# to lower case;
 			dbg('msg', "incoming file $f[3]\n");
-			last SWITCH if $f[3] =~ /^(perl|cmd|local|src|lib|include|sys|msg|connect)/; # prevent access to executables
+			$f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
 			
 			# create any directories
 			my @part = split /\//, $f[3];
@@ -309,7 +331,7 @@ sub store
 	if ($ref->{file}) {			# a file
 		dbg('msg', "To be stored in $ref->{to}\n");
 		
-		my $fh = new FileHandle "$ref->{to}", "w";
+		my $fh = new IO::File "$ref->{to}", "w";
 		if (defined $fh) {
 			my $line;
 			foreach $line (@{$lines}) {
@@ -329,7 +351,7 @@ sub store
 		dbg('msg', "To be stored in $fn\n");
 		
 		# now save the file, overwriting what's there, YES I KNOW OK! (I will change it if it's a problem)
-		my $fh = new FileHandle "$fn", "w";
+		my $fh = new IO::File "$fn", "w";
 		if (defined $fh) {
 			my $rr = $ref->{rrreq} ? '1' : '0';
 			my $priv = $ref->{private} ? '1': '0';
@@ -398,7 +420,7 @@ sub read_msg_header
 	my @f;
 	my $size;
 	
-	$file = new FileHandle;
+	$file = new IO::File;
 	if (!open($file, $fn)) {
 		print "Error reading $fn $!\n";
 		return undef;
@@ -443,7 +465,7 @@ sub read_msg_body
 	my $fn = filename($msgno);
 	my @out;
 	
-	$file = new FileHandle;
+	$file = new IO::File;
 	if (!open($file, $fn)) {
 		print "Error reading $fn $!\n";
 		return undef;
@@ -515,8 +537,10 @@ sub queue_msg
 			my $noderef;
 			foreach $noderef (@nodelist) {
 				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 unless $ref->forward_it($noderef->call);           # check the forwarding file
+				# next if $noderef->isolate;               # maybe add code for stuff originated here?
+				# 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';
@@ -599,7 +623,7 @@ sub next_transno
 	my $fn = "$msgdir/$name";
 	my $msgno;
 	
-	my $fh = new FileHandle;
+	my $fh = new IO::File;
 	if (sysopen($fh, $fn, O_RDWR|O_CREAT, 0666)) {
 		$fh->autoflush(1);
 		$msgno = $fh->getline;
@@ -618,10 +642,16 @@ sub next_transno
 # initialise the message 'system', read in all the message headers
 sub init
 {
-	my $dir = new FileHandle;
+	my $dir = new IO::File;
 	my @dir;
 	my $ref;
-	
+
+	# load various control files
+	my @in = load_badmsg();
+	print "@in\n" if @in;
+	@in = load_forward();
+	print "@in\n" if @in;
+
 	# read in the directory
 	opendir($dir, $msgdir) or confess "can't open $msgdir $!";
 	@dir = readdir($dir);
@@ -629,15 +659,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); 
-		
 	}
 }
 
@@ -772,6 +808,57 @@ sub dir
 			$ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
 }
 
+# load the forward table
+sub load_forward
+{
+	my @out;
+	do "$forwardfn" if -e "$forwardfn";
+	push @out, $@ if $@;
+	return @out;
+}
+
+# load the bad message table
+sub load_badmsg
+{
+	my @out;
+	do "$badmsgfn" if -e "$badmsgfn";
+	push @out, $@ if $@;
+	return @out;
+}
+
+#
+# forward that message or not according to the forwarding table
+# returns 1 for forward, 0 - to ignore
+#
+
+sub forward_it
+{
+	my $ref = shift;
+	my $call = shift;
+	my $i;
+	
+	for ($i = 0; $i < @forward; $i += 5) {
+		my ($sort, $field, $pattern, $action, $bbs) = @forward[$i..($i+4)]; 
+		my $tested;
+		
+		# are we interested?
+		last if $ref->{private} && $sort ne 'P';
+		last if !$ref->{private} && $sort ne 'B';
+		
+		# select field
+		$tested = $ref->{to} if $field eq 'T';
+		$tested = $ref->{from} if $field eq 'F';
+		$tested = $ref->{origin} if $field eq 'O';
+		$tested = $ref->{subject} if $field eq 'S';
+
+		if (!$pattern || $tested =~ m{$pattern}i) {
+			return 0 if $action eq 'I';
+			return 1 if !$bbs || grep $_ eq $call, @{$bbs};
+		}
+	}
+	return 0;
+}
+
 no strict;
 sub AUTOLOAD
 {