X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=262a4155c92cd4deab28b8f832cec1ac8e519cf4;hb=cce161221036760959ff1d0b7628a55942bf558a;hp=d8096075bdc0f106be0a754cb95baf4142bcd6b2;hpb=2a65593f255071174485afba2ef7f7c27e235f75;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index d8096075..262a4155 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -50,7 +50,7 @@ $last_clean = 0;				# last time we did a clean
 		  file => '9,File?,yesno',
 		  gotit => '9,Got it Nodes,parray',
 		  lines => '9,Lines,parray',
-		  read => '9,Times read',
+		  'read' => '9,Times read',
 		  size => '0,Size',
 		  msgno => '0,Msgno',
 		  keep => '0,Keep this?,yesno',
@@ -73,7 +73,7 @@ sub alloc
 	$self->{private} = shift;
 	$self->{subject} = shift;
 	$self->{origin} = shift;
-	$self->{read} = shift;
+	$self->{'read'} = shift;
 	$self->{rrreq} = shift;
 	$self->{gotit} = [];
     
@@ -135,16 +135,20 @@ sub process
 		
 		if ($pcno == 30) {		# this is a incoming subject ack
 			my $ref = $work{$f[2]};	# note no stream at this stage
-			delete $work{$f[2]};
-			$ref->{stream} = $f[3];
-			$ref->{count} = 0;
-			$ref->{linesreq} = 5;
-			$work{"$f[2]$f[3]"} = $ref;	# new ref
-			dbg('msg', "incoming subject ack stream $f[3]\n");
-			$busy{$f[2]} = $ref; # interlock
-			$ref->{lines} = [];
-			push @{$ref->{lines}}, ($ref->read_msg_body);
-			$ref->send_tranche($self);
+			if ($ref) {
+				delete $work{$f[2]};
+				$ref->{stream} = $f[3];
+				$ref->{count} = 0;
+				$ref->{linesreq} = 5;
+				$work{"$f[2]$f[3]"} = $ref;	# new ref
+				dbg('msg', "incoming subject ack stream $f[3]\n");
+				$busy{$f[2]} = $ref; # interlock
+				$ref->{lines} = [];
+				push @{$ref->{lines}}, ($ref->read_msg_body);
+				$ref->send_tranche($self);
+			} else {
+				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
+			} 
 			last SWITCH;
 		}
 		
@@ -171,20 +175,37 @@ sub process
 				# remove it from the work in progress vector
 				# stuff it on the msg queue
 				if ($ref->{lines} && @{$ref->{lines}} > 0) { # ignore messages with 0 lines
-					$ref->{msgno} = next_transno("Msgno") if !$ref->{file};
-					push @{$ref->{gotit}}, $f[2]; # mark this up as being received
-					$ref->store($ref->{lines});
-					add_dir($ref);
-					my $dxchan = DXChannel->get($ref->{to});
-					$dxchan->send("New mail has arrived for you") if $dxchan;
-					Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
+					if ($ref->{file}) {
+						$ref->store($ref->{lines});
+					} else {
+
+						# 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->stop_msg($self);
+								my $msgno = $m->{msgno};
+								dbg('msg', "duplicate message to $msgno\n");
+								Log('msg', "duplicate message to $msgno");
+								return;
+							}
+						}
+
+						$ref->{msgno} = next_transno("Msgno");
+						push @{$ref->{gotit}}, $f[2]; # mark this up as being received
+						$ref->store($ref->{lines});
+						add_dir($ref);
+						my $dxchan = DXChannel->get($ref->{to});
+						$dxchan->send("New mail has arrived for you") if $dxchan;
+						Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
+					}
 				}
 				$ref->stop_msg($self);
-				queue_msg();
+				queue_msg(0);
 			} else {
 				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
 			}
-			queue_msg();
+			queue_msg(0);
 			last SWITCH;
 		}
 		
@@ -203,7 +224,7 @@ sub process
 			} else {
 				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
 			} 
-			queue_msg();
+			queue_msg(0);
 			last SWITCH;
 		}
 		
@@ -252,9 +273,18 @@ sub process
 			
 			last SWITCH;
 		}
+
+		if ($pcno == 49) {      # global delete on subject
+			for (@msg) {
+				if ($_->{subject} eq $f[2]) {
+					$_->del_msg();
+					Log('msg', "Message $_->{msgno} fully deleted by $f[1]");
+				}
+			}
+		}
 	}
-	 
-	 clean_old() if $main::systime - $last_clean > 3600 ; # clean the message queue
+	
+	clean_old() if $main::systime - $last_clean > 3600 ; # clean the message queue
 }
 
 
@@ -286,9 +316,8 @@ sub store
 		} else {
 			confess "can't open file $ref->{to} $!";  
 		}
-		#	push @{$ref->{gotit}}, $ref->{fromnode} if $ref->{fromnode};
 	} else {					# a normal message
-		
+
 		# attempt to open the message file
 		my $fn = filename($ref->{msgno});
 		
@@ -299,7 +328,7 @@ 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";
+			print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr\n";
 			print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
 			my $line;
 			$ref->{size} = 0;
@@ -430,41 +459,45 @@ sub send_tranche
 	my $to = $self->{tonode};
 	my $from = $self->{fromnode};
 	my $stream = $self->{stream};
-	my $i;
+	my $lines = $self->{lines};
+	my ($c, $i);
 	
-	for ($i = 0; $i < $self->{linesreq} && $self->{count} < @{$self->{lines}}; $i++, $self->{count}++) {
-		push @out, DXProt::pc29($to, $from, $stream, ${$self->{lines}}[$self->{count}]);
-}
-push @out, DXProt::pc32($to, $from, $stream) if $i < $self->{linesreq};
-$dxchan->send(@out);
+	for ($i = 0, $c = $self->{count}; $i < $self->{linesreq} && $c < @$lines; $i++, $c++) {
+		push @out, DXProt::pc29($to, $from, $stream, $lines->[$c]);
+    }
+    $self->{count} = $c;
+
+    push @out, DXProt::pc32($to, $from, $stream) if $i < $self->{linesreq};
+	$dxchan->send(@out);
 }
 
 	
-	# find a message to send out and start the ball rolling
-	sub queue_msg
+# find a message to send out and start the ball rolling
+sub queue_msg
 {
 	my $sort = shift;
-	my @nodelist = DXProt::get_all_ak1a();
+	my $call = shift;
 	my $ref;
 	my $clref;
 	my $dxchan;
+	my @nodelist = DXProt::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");
 	foreach $ref (@msg) {
 		# firstly, is it private and unread? if so can I find the recipient
 		# in my cluster node list offsite?
 		if ($ref->{private}) {
-			if ($ref->{read} == 0) {
-				$clref = DXCluster->get($ref->{to});
+			if ($ref->{'read'} == 0) {
+				$clref = DXCluster->get_exact($ref->{to});
 				if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all) {
 					$dxchan = $clref->{dxchan};
-					$ref->start_msg($dxchan) if $clref && !get_busy($dxchan->call);
+					$ref->start_msg($dxchan) if $clref && !get_busy($dxchan->call) && $dxchan->state eq 'normal';
 				}
 			}
-		} elsif ($sort == undef) {
+		} elsif (!$sort) {
 			# otherwise we are dealing with a bulletin, compare the gotit list with
 			# the nodelist up above, if there are sites that haven't got it yet
 			# then start sending it - what happens when we get loops is anyone's
@@ -472,12 +505,13 @@ $dxchan->send(@out);
 			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}};
 				
 				# if we are here we have a node that doesn't have this message
-				$ref->start_msg($noderef) if !get_busy($noderef->call);
+				$ref->start_msg($noderef) if !get_busy($noderef->call)  && $noderef->state eq 'normal';
 				last;
-			} 
+			}
 		}
 		
 		# if all the available nodes are busy then stop
@@ -685,7 +719,7 @@ sub do_send_stuff
 			delete $self->{loc};
 			$self->state('prompt');
 			$self->func(undef);
-			DXMsg::queue_msg();
+			DXMsg::queue_msg(0);
 		} elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {
 			#push @out, $self->msg('sendabort');
 			push @out, "aborted";
@@ -697,7 +731,7 @@ sub do_send_stuff
 		} else {
 			
 			# i.e. it ain't and end or abort, therefore store the line
-			push @{$loc->{lines}}, $line;
+			push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
 		}
 	}
 	return (1, @out);