X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=04239f16b6777581ade86c2cb0f036f087d1f42b;hb=66581498212e2d0643c50369b1f39b85d7dc4dce;hp=75a0c452c0e9034d830afc042820dc02be28b801;hpb=732e58eaf2e7ef261102aed4f03185fcc775668f;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 75a0c452..04239f16 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -110,6 +110,8 @@ sub alloc
 	$self->{origin} = shift;
 	$self->{'read'} = shift;
 	$self->{rrreq} = shift;
+	$self->{delete} = shift;
+	$self->{deletetime} = shift;
 	$self->{gotit} = [];
 #	$self->{lastt} = $main::systime;
 	$self->{lines} = [];
@@ -280,7 +282,7 @@ sub process
 						# does an identical message already exist?
 						my $m;
 						for $m (@msg) {
-							if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
+							if (substr($ref->{subject},0,28) eq substr($m->{subject},0,28) && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
 								$ref->stop_msg($fromnode);
 								my $msgno = $m->{msgno};
 								dbg("duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno") if isdbg('msg');
@@ -307,8 +309,8 @@ sub process
 						}
 						push @words, BadWords::check($ref->{subject});
 						if (@words) {
-							dbg("message with badwords '@words' $ref->{from} -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $self->call) if isdbg('msg');
-							Log('msg',"message with badwords '@words' $ref->{from} -> $ref->{to} origin: $ref->{origin} via " . $self->call);
+							dbg("$ref->{from} swore: '@words' -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $self->call) if isdbg('msg');
+							Log('msg',"$ref->{from} swore: '@words' -> $ref->{to} origin: $ref->{origin} via " . $self->call);
 							Log('msg',"subject: $ref->{subject}");
 							for (@{$ref->{lines}}) {
 								Log('msg', "line: $_");
@@ -340,8 +342,7 @@ sub process
 			if ($ref) {
 				if ($ref->{private}) { # remove it if it private and gone off site#
 					Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode and deleted");
-					$ref->{delete}++;
-					$ref->{deletetime} = $main::systime + $residencetime;
+					$ref->mark_delete;
 				} else {
 					Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode");
 					push @{$ref->{gotit}}, $fromnode; # mark this up as being received
@@ -407,8 +408,7 @@ sub process
 		if ($pcno == 49) {      # global delete on subject
 			for (@msg) {
 				if ($_->{from} eq $f[1] && $_->{subject} eq $f[2]) {
-					$_->{delete}++;
-					$_->{deletetime} = $main::systime + $residencetime;
+					$_->mark_delete;
 					Log('msg', "Message $_->{msgno} from $_->{from} ($_->{subject}) fully deleted");
 					DXChannel::broadcast_nodes($line, $self);
 				}
@@ -453,7 +453,9 @@ sub store
 		if (defined $fh) {
 			my $rr = $ref->{rrreq} ? '1' : '0';
 			my $priv = $ref->{private} ? '1': '0';
-			print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr\n";
+			my $del = $ref->{delete} ? '1' : '0';
+			my $delt = $ref->{deletetime} || '0';
+			print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt\n";
 			print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
 			my $line;
 			$ref->{size} = 0;
@@ -480,21 +482,29 @@ sub del_msg
 		$self->{delete}++;
 		$self->{deletetime} = 0;
 	} else {
-		my $call;
-		if ($dxchan) {
-			$call = " by " . $dxchan->call;
-		} else {
-			$call = '';
-		}
-
 		# remove it from the active message list
 		@msg = grep { $_ != $self } @msg;
+
+		my $call = '';
+		$call = ' by ' . $dxchan->call if $dxchan;
+		Log('msg', "Msgno $self->{msgno} expunged$call");
 		
 		# remove the file
 		unlink filename($self->{msgno});
 	}
 }
 
+sub mark_delete
+{
+	my $ref = shift;
+	my $t = shift;
+	$t = $main::systime + $residencetime unless defined $t;
+	
+	$ref->{delete}++;
+	$ref->{deletetime} = $t;
+	$ref->store( [$ref->read_msg_body] );
+}
+
 # clean out old messages from the message queue
 sub clean_old
 {
@@ -503,7 +513,9 @@ sub clean_old
 	# mark old messages for deletion
 	foreach $ref (@msg) {
 		if (ref($ref) && !$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
-			$ref->{delete} = 1;
+
+			# this is for IMMEDIATE destruction
+			$ref->{delete}++;
 			$ref->{deletetime} = 0;
 		}
 	}
@@ -644,10 +656,11 @@ sub queue_msg
 		next if $ref->{tonode};	          # ignore it if it already being processed
 		
 		# is it awaiting deletion?
-		if ($ref->{delete} && $main::systime > $ref->{deletetime}) {
+		if ($ref->{delete} && $main::systime >= $ref->{deletetime}) {
 			$ref->del_msg;
 			next;
 		}
+		next if $ref->{delete};
 		
 		# firstly, is it private and unread? if so can I find the recipient
 		# in my cluster node list offsite?
@@ -946,7 +959,7 @@ sub do_send_stuff
 		if (my @ans = BadWords::check($line)) {
 			$self->{badcount} += @ans;
 			Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} in msg");
-			return ($self->msg('e17', @ans), $self->msg('m1'));
+			$loc->{reject}++;
 		}
 		$loc->{subject} = $line;
 		$loc->{lines} = [];
@@ -958,33 +971,36 @@ sub do_send_stuff
 		my $loc = $self->{loc};
 		if ($line eq "\032" || $line eq '%1A' || uc $line eq "/EX") {
 			my $to;
-			
-			foreach $to (@{$loc->{to}}) {
-				my $ref;
-				my $systime = $main::systime;
-				my $mycall = $main::mycall;
-				$ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
-									uc $to,
-									exists $loc->{from} ? $loc->{from} : $self->call, 
-									$systime,
-									$loc->{private}, 
-									$loc->{subject}, 
-									exists $loc->{origin} ? $loc->{origin} : $mycall,
-									'0',
-									$loc->{rrreq});
-				$ref->swop_it($self->call);
-				$ref->store($loc->{lines});
-				$ref->add_dir();
-				push @out, $self->msg('m11', $ref->{msgno}, $to);
-				#push @out, "msgno $ref->{msgno} sent to $to";
-				my $dxchan = DXChannel->get(uc $to);
-				if ($dxchan) {
-					if ($dxchan->is_user()) {
-						$dxchan->send($dxchan->msg('m9'));
+			unless ($loc->{reject}) {
+				foreach $to (@{$loc->{to}}) {
+					my $ref;
+					my $systime = $main::systime;
+					my $mycall = $main::mycall;
+					$ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
+										uc $to,
+										exists $loc->{from} ? $loc->{from} : $self->call, 
+										$systime,
+										$loc->{private}, 
+										$loc->{subject}, 
+										exists $loc->{origin} ? $loc->{origin} : $mycall,
+										'0',
+										$loc->{rrreq});
+					$ref->swop_it($self->call);
+					$ref->store($loc->{lines});
+					$ref->add_dir();
+					push @out, $self->msg('m11', $ref->{msgno}, $to);
+					#push @out, "msgno $ref->{msgno} sent to $to";
+					my $dxchan = DXChannel->get(uc $to);
+					if ($dxchan) {
+						if ($dxchan->is_user()) {
+							$dxchan->send($dxchan->msg('m9'));
+						}
 					}
 				}
+			} else {
+				Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
 			}
-
+			
 			delete $loc->{lines};
 			delete $loc->{to};
 			delete $self->{loc};
@@ -1002,9 +1018,9 @@ sub do_send_stuff
 		} else {
 			if (my @ans = BadWords::check($line)) {
 				$self->{badcount} += @ans;
-				Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg");
+				Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg") unless $loc->{reject};
 				Log('msg', "line: $line");
-				return ($self->msg('e17', @ans));
+				$loc->{reject}++;
 			}
 			
 			# i.e. it ain't and end or abort, therefore store the line
@@ -1202,7 +1218,6 @@ sub import_msgs
 		my @out = import_one($main::me, \@msg, $splitit);
 		Log('msg', @out);
 	}
-	queue_msg(0);
 }
 
 # import one message as a list in bbs (as extended) mode
@@ -1222,7 +1237,7 @@ sub import_one
 				
 	# first line;
 	my $line = shift @$ref;
-	my @f = split /\b/, $line;
+	my @f = split /([\s\@\$])/, $line;
 	@f = map {s/\s+//g; length $_ ? $_ : ()} @f;
 
  	unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
@@ -1310,7 +1325,18 @@ sub import_one
 	} else {
 		push @chunk, $ref;
 	}
-				  
+
+	# does an identical message already exist?
+	my $m;
+	for $m (@msg) {
+		if (substr($subject,0,28) eq substr($m->{subject},0,28) && $from eq $m->{from} && grep $m->{to} eq $_, @to) {
+			my $msgno = $m->{msgno};
+			dbg("duplicate message from $from -> $m->{to} to msg: $msgno") if isdbg('msg');
+			Log('msg', "duplicate message from $from -> $m->{to} to msg: $msgno");
+			return;
+		}
+	}
+
     # write all the messages away
 	my $i;
 	for ( $i = 0;  $i < @chunk; $i++) {