X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=54a2c6f3c04768f9584de08f62d879e5deb90cf4;hb=14f2cd924047e8d99aa2f5796f8f34ee80802651;hp=88371ed787a3e08119d4c2a22a42af7a0a5d487b;hpb=ed8842a3d38de2c171329e51612d2dc520ffcc99;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 88371ed7..54a2c6f3 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -15,25 +15,28 @@
 
 package DXMsg;
 
-@ISA = qw(DXProt DXChannel);
-
 use DXUtil;
 use DXChannel;
 use DXUser;
 use DXM;
-use DXCluster;
 use DXProtVars;
 use DXProtout;
 use DXDebug;
 use DXLog;
 use IO::File;
 use Fcntl;
-use Carp;
 
 use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
 			@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
-		    $queueinterval $lastq $importfn);
+		    $queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);
 
 %work = ();						# outstanding jobs
 @msg = ();						# messages we have
@@ -49,6 +52,10 @@ $waittime = 30*60;              # time an aborted outgoing message waits before
 $queueinterval = 1*60;          # run the queue every 1 minute
 $lastq = 0;
 
+$minchunk = 4800;               # minimum chunk size for a split message
+$maxchunk = 6000;               # maximum chunk size
+$bulltopriv = 1;				# convert msgs with callsigns to private if they are bulls
+
 
 $badmsgfn = "$msgdir/badmsg.pl";    # list of TO address we wont store
 $forwardfn = "$msgdir/forward.pl";  # the forwarding table
@@ -62,10 +69,10 @@ $importfn = "$msgdir/import";       # import directory
 		  to => '0,To',
 		  from => '0,From',
 		  t => '0,Msg Time,cldatetime',
-		  private => '5,Private',
+		  private => '5,Private,yesno',
 		  subject => '0,Subject',
 		  linesreq => '0,Lines per Gob',
-		  rrreq => '5,Read Confirm',
+		  rrreq => '5,Read Confirm,yesno',
 		  origin => '0,Origin',
 		  lines => '5,Data',
 		  stream => '9,Stream No',
@@ -79,15 +86,9 @@ $importfn = "$msgdir/import";       # import directory
 		  keep => '0,Keep this?,yesno',
 		  lastt => '5,Last processed,cldatetime',
 		  waitt => '5,Wait until,cldatetime',
+		  delete => '5,Awaiting Delete,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                  
@@ -108,25 +109,13 @@ sub alloc
 	$self->{'read'} = shift;
 	$self->{rrreq} = shift;
 	$self->{gotit} = [];
-	$self->{lastt} = $main::systime;
+#	$self->{lastt} = $main::systime;
+	$self->{lines} = [];
+	$self->{private} = 1 if $bulltopriv && DXUser->get_current($self->{to});
     
 	return $self;
 }
 
-sub workclean
-{
-	my $ref = shift;
-	delete $ref->{lines};
-	delete $ref->{linesreq};
-	delete $ref->{tonode};
-	delete $ref->{fromnode};
-	delete $ref->{stream};
-	delete $ref->{lines};
-	delete $ref->{file};
-	delete $ref->{count};
-	delete $ref->{lastt} if exists $ref->{lastt};
-	delete $ref->{waitt} if exists $ref->{waitt};
-}
 
 sub process
 {
@@ -135,20 +124,7 @@ sub process
 	# this is periodic processing
 	if (!$self || !$line) {
 
-		if ($main::systime > $lastq + $queueinterval) {
-
-			# wander down the work queue stopping any messages that have timed out
-			for (keys %busy) {
-				my $node = $_;
-				my $ref = $busy{$_};
-				if (exists $ref->{lastt} && $main::systime >= $ref->{lastt} + $timeout) {
-					dbg('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
-					$ref->stop_msg($node);
-					
-					# delay any outgoing messages that fail
-					$ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
-				}
-			}
+		if ($main::systime >= $lastq + $queueinterval) {
 
 			# queue some message if the interval timer has gone off
 			queue_msg(0);
@@ -166,103 +142,112 @@ sub process
 
 	my @f = split /\^/, $line;
 	my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
+	my ($tonode, $fromnode) = @f[1, 2];
+	my $stream = $f[3] if $pcno > 29 && $pcno <= 33;
 
  SWITCH: {
 		if ($pcno == 28) {		# incoming message
 
+			# sort out various extant protocol errors that occur
+			my $origin = $f[13];
+			$origin = $self->call unless $origin && $origin gt ' ';
+
 			# first look for any messages in the busy queue 
 			# and cancel them this should both resolve timed out incoming messages
 			# and crossing of message between nodes, incoming messages have priority
-			if (exists $busy{$f[2]}) {
-				my $ref = $busy{$f[2]};
-				my $tonode = $ref->{tonode};
-				dbg('msg', "Busy, stopping msgno: $ref->{msgno} -> $f[2]");
-				$ref->stop_msg($self->call);
+
+			my $ref = get_busy($fromnode);
+			if ($ref) {
+				my $otonode = $ref->{tonode} || "unknown";
+				dbg("Busy, stopping msgno: $ref->{msgno} $fromnode->$otonode") if isdbg('msg');
+				$ref->stop_msg($fromnode);
 			}
 
 			my $t = cltounix($f[5], $f[6]);
-			my $stream = next_transno($f[2]);
-			my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]);
+			$stream = next_transno($fromnode);
+			$ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $origin, '0', $f[11]);
 			
 			# fill in various forwarding state variables
-			$ref->{fromnode} = $f[2];
-			$ref->{tonode} = $f[1];
+			$ref->{fromnode} = $fromnode;
+			$ref->{tonode} = $tonode;
 			$ref->{rrreq} = $f[11];
 			$ref->{linesreq} = $f[10];
 			$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");
-			$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
+			dbg("new message from $f[4] to $f[3] '$f[8]' stream $fromnode/$stream\n") if isdbg('msg');
+			Log('msg', "Incoming message $f[4] to $f[3] '$f[8]' origin: $origin" );
+			set_fwq($fromnode, $stream, $ref); # store in work
+			set_busy($fromnode, $ref); # set interlock
+			$self->send(DXProt::pc30($fromnode, $tonode, $stream)); # send ack
 			$ref->{lastt} = $main::systime;
 
 			# look to see whether this is a non private message sent to a known callsign
 			my $uref = DXUser->get_current($ref->{to});
-			if (iscallsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
+			if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
 				$ref->{private} = 1;
-				dbg('msg', "set bull to $ref->{to} to private");
+				dbg("set bull to $ref->{to} to private") if isdbg('msg');
+				Log('msg', "set bull to $ref->{to} to private");
 			}
 			last SWITCH;
 		}
 		
 		if ($pcno == 29) {		# incoming text
-			my $ref = $work{"$f[2]$f[3]"};
+			my $ref = get_fwq($fromnode, $stream);
 			if ($ref) {
+				$f[4] =~ s/\%5E/^/g;
 				push @{$ref->{lines}}, $f[4];
 				$ref->{count}++;
 				if ($ref->{count} >= $ref->{linesreq}) {
-					$self->send(DXProt::pc31($f[2], $f[1], $f[3]));
-					dbg('msg', "stream $f[3]: $ref->{count} lines received\n");
+					$self->send(DXProt::pc31($fromnode, $tonode, $stream));
+					dbg("stream $stream: $ref->{count} lines received\n") if isdbg('msg');
 					$ref->{count} = 0;
 				}
 				$ref->{lastt} = $main::systime;
 			} else {
-				dbg('msg', "PC29 from unknown stream $f[3] from $f[2]" );
-				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
+				dbg("PC29 from unknown stream $stream from $fromnode") if isdbg('msg');
+				$self->send(DXProt::pc42($fromnode, $tonode, $stream));	# unknown stream
 			}
 			last SWITCH;
 		}
 		
 		if ($pcno == 30) {		# this is a incoming subject ack
-			my $ref = $work{$f[2]};	# note no stream at this stage
+			my $ref = get_fwq($fromnode);	# note no stream at this stage
 			if ($ref) {
-				delete $work{$f[2]};
-				$ref->{stream} = $f[3];
+				del_fwq($fromnode);
+				$ref->{stream} = $stream;
 				$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);
+				set_fwq($fromnode, $stream, $ref);	# new ref
+				set_busy($fromnode, $ref); # interlock
+				dbg("incoming subject ack stream $stream\n") if isdbg('msg');
+				$ref->{lines} = [ $ref->read_msg_body ];
 				$ref->send_tranche($self);
 				$ref->{lastt} = $main::systime;
 			} else {
-				dbg('msg', "PC30 from unknown stream $f[3] from $f[2]" );
-				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
+				dbg("PC30 from unknown stream $stream from $fromnode") if isdbg('msg');
+				$self->send(DXProt::pc42($fromnode, $tonode, $stream));	# unknown stream
 			} 
 			last SWITCH;
 		}
 		
 		if ($pcno == 31) {		# acknowledge a tranche of lines
-			my $ref = $work{"$f[2]$f[3]"};
+			my $ref = get_fwq($fromnode, $stream);
 			if ($ref) {
-				dbg('msg', "tranche ack stream $f[3]\n");
+				dbg("tranche ack stream $stream\n") if isdbg('msg');
 				$ref->send_tranche($self);
 				$ref->{lastt} = $main::systime;
 			} else {
-				dbg('msg', "PC31 from unknown stream $f[3] from $f[2]" );
-				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
+				dbg("PC31 from unknown stream $stream from $fromnode") if isdbg('msg');
+				$self->send(DXProt::pc42($fromnode, $tonode, $stream));	# unknown stream
 			} 
 			last SWITCH;
 		}
 		
 		if ($pcno == 32) {		# incoming EOM
-			dbg('msg', "stream $f[3]: EOM received\n");
-			my $ref = $work{"$f[2]$f[3]"};
+			dbg("stream $stream: EOM received\n") if isdbg('msg');
+			my $ref = get_fwq($fromnode, $stream);
 			if ($ref) {
-				$self->send(DXProt::pc33($f[2], $f[1], $f[3]));	# acknowledge it
+				$self->send(DXProt::pc33($fromnode, $tonode, $stream));	# acknowledge it
 				
 				# get the next msg no - note that this has NOTHING to do with the stream number in PC protocol
 				# store the file or message
@@ -278,10 +263,10 @@ sub process
 						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}) {
-								$ref->stop_msg($self->call);
+								$ref->stop_msg($fromnode);
 								my $msgno = $m->{msgno};
-								dbg('msg', "duplicate message to $msgno\n");
-								Log('msg', "duplicate message to $msgno");
+								dbg("duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno") if isdbg('msg');
+								Log('msg', "duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno");
 								return;
 							}
 						}
@@ -290,47 +275,63 @@ sub process
 						$ref->swop_it($self->call);
 						
 						# look for 'bad' to addresses 
-#						if (grep $ref->{to} eq $_, @badmsg) {
 						if ($ref->dump_it($self->call)) {
-							$ref->stop_msg($self->call);
-							dbg('msg', "'Bad' message $ref->{to}");
+							$ref->stop_msg($fromnode);
+							dbg("'Bad' message $ref->{to}") if isdbg('msg');
 							Log('msg', "'Bad' message $ref->{to}");
 							return;
 						}
 
+						# check the message for bad words 
+						my @words;
+						for (@{$ref->{lines}}) {
+							push @words, BadWords::check($_);
+						}
+						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);
+							Log('msg',"subject: $ref->{subject}");
+							for (@{$ref->{lines}}) {
+								Log('msg', "line: $_");
+							}
+							$ref->stop_msg($fromnode);
+							return;
+						}
+							
 						$ref->{msgno} = next_transno("Msgno");
-						push @{$ref->{gotit}}, $f[2]; # mark this up as being received
+						push @{$ref->{gotit}}, $fromnode; # mark this up as being received
 						$ref->store($ref->{lines});
 						add_dir($ref);
 						my $dxchan = DXChannel->get($ref->{to});
 						$dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
-						Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
+						Log('msg', "Message $ref->{msgno} from $ref->{from} received from $fromnode for $ref->{to}");
 					}
 				}
-				$ref->stop_msg($self->call);
+				$ref->stop_msg($fromnode);
 			} else {
-				dbg('msg', "PC32 from unknown stream $f[3] from $f[2]" );
-				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
+				dbg("PC32 from unknown stream $stream from $fromnode") if isdbg('msg');
+				$self->send(DXProt::pc42($fromnode, $tonode, $stream));	# unknown stream
 			}
 			# queue_msg(0);
 			last SWITCH;
 		}
 		
 		if ($pcno == 33) {		# acknowledge the end of message
-			my $ref = $work{"$f[2]$f[3]"};
+			my $ref = get_fwq($fromnode, $stream);
 			if ($ref) {
 				if ($ref->{private}) { # remove it if it private and gone off site#
-					Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $f[2] and deleted");
-					$ref->del_msg;
+					Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode and deleted");
+					$ref->{delete}++;
 				} else {
-					Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $f[2]");
-					push @{$ref->{gotit}}, $f[2]; # mark this up as being received
+					Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode");
+					push @{$ref->{gotit}}, $fromnode; # mark this up as being received
 					$ref->store($ref->{lines});	# re- store the file
 				}
-				$ref->stop_msg($self->call);
+				$ref->stop_msg($fromnode);
 			} else {
-				dbg('msg', "PC33 from unknown stream $f[3] from $f[2]" );
-				$self->send(DXProt::pc42($f[2], $f[1], $f[3]));	# unknown stream
+				dbg("PC33 from unknown stream $stream from $fromnode") if isdbg('msg');
+				$self->send(DXProt::pc42($fromnode, $tonode, $stream));	# unknown stream
 			} 
 
 			# send next one if present
@@ -343,7 +344,7 @@ sub process
 			$f[3] =~ s/\.//og;	# remove dots
 			$f[3] =~ s/^\///o;   # remove the leading /
 			$f[3] = lc $f[3];	# to lower case;
-			dbg('msg', "incoming file $f[3]\n");
+			dbg("incoming file $f[3]\n") if isdbg('msg');
 			$f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
 			
 			# create any directories
@@ -355,30 +356,30 @@ sub process
 				$fn .= "/$part";
 				next if -e $fn;
 				last SWITCH if !mkdir $fn, 0777;
-				dbg('msg', "created directory $fn\n");
+				dbg("created directory $fn\n") if isdbg('msg');
 			}
-			my $stream = next_transno($f[2]);
+			my $stream = next_transno($fromnode);
 			my $ref = DXMsg->alloc($stream, "$main::root/$f[3]", $self->call, time, !$f[4], $f[3], ' ', '0', '0');
 			
 			# forwarding variables
-			$ref->{fromnode} = $f[1];
-			$ref->{tonode} = $f[2];
+			$ref->{fromnode} = $tonode;
+			$ref->{tonode} = $fromnode;
 			$ref->{linesreq} = $f[5];
 			$ref->{stream} = $stream;
 			$ref->{count} = 0;	# no of lines between PC31s
 			$ref->{file} = 1;
 			$ref->{lastt} = $main::systime;
-			$work{"$f[2]$stream"} = $ref; # store in work
-			$self->send(DXProt::pc30($f[2], $f[1], $stream)); # send ack 
+			set_fwq($fromnode, $stream, $ref); # store in work
+			$self->send(DXProt::pc30($fromnode, $tonode, $stream)); # send ack 
 			
 			last SWITCH;
 		}
 		
 		if ($pcno == 42) {		# abort transfer
-			dbg('msg', "stream $f[3]: abort received\n");
-			my $ref = $work{"$f[2]$f[3]"};
+			dbg("stream $stream: abort received\n") if isdbg('msg');
+			my $ref = get_fwq($fromnode, $stream);
 			if ($ref) {
-				$ref->stop_msg($self->call);
+				$ref->stop_msg($fromnode);
 				$ref = undef;
 			}
 			last SWITCH;
@@ -387,9 +388,9 @@ sub process
 		if ($pcno == 49) {      # global delete on subject
 			for (@msg) {
 				if ($_->{from} eq $f[1] && $_->{subject} eq $f[2]) {
-					$_->del_msg();
+					$_->{delete}++;
 					Log('msg', "Message $_->{msgno} from $_->{from} ($_->{subject}) fully deleted");
-					DXProt::broadcast_ak1a($line, $self);
+					DXChannel::broadcast_nodes($line, $self);
 				}
 			}
 		}
@@ -404,14 +405,9 @@ sub store
 {
 	my $ref = shift;
 	my $lines = shift;
-	
-	# we only proceed if there are actually any lines in the file
-#	if (!$lines || @{$lines} == 0) {
-#		return;
-#	}
-	
+
 	if ($ref->{file}) {			# a file
-		dbg('msg', "To be stored in $ref->{to}\n");
+		dbg("To be stored in $ref->{to}\n") if isdbg('msg');
 		
 		my $fh = new IO::File "$ref->{to}", "w";
 		if (defined $fh) {
@@ -420,7 +416,7 @@ sub store
 				print $fh "$line\n";
 			}
 			$fh->close;
-			dbg('msg', "file $ref->{to} stored\n");
+			dbg("file $ref->{to} stored\n") if isdbg('msg');
 			Log('msg', "file $ref->{to} from $ref->{from} stored" );
 		} else {
 			confess "can't open file $ref->{to} $!";  
@@ -430,7 +426,7 @@ sub store
 		# attempt to open the message file
 		my $fn = filename($ref->{msgno});
 		
-		dbg('msg', "To be stored in $fn\n");
+		dbg("To be stored in $fn\n") if isdbg('msg');
 		
 		# now save the file, overwriting what's there, YES I KNOW OK! (I will change it if it's a problem)
 		my $fh = new IO::File "$fn", "w";
@@ -446,7 +442,7 @@ sub store
 				print $fh "$line\n";
 			}
 			$fh->close;
-			dbg('msg', "msg $ref->{msgno} stored\n");
+			dbg("msg $ref->{msgno} stored\n") if isdbg('msg');
 			Log('msg', "msg $ref->{msgno} from $ref->{from} to $ref->{to} stored" );
 		} else {
 			confess "can't open msg file $fn $!";  
@@ -458,17 +454,24 @@ sub store
 sub del_msg
 {
 	my $self = shift;
+	my $dxchan = shift;
 	
-	# remove it from the active message list
-	@msg = map { $_ != $self ? $_ : () } @msg;
-	
-	# belt and braces (one day I will ask someone if this is REALLY necessary)
-	delete $self->{gotit};
-	delete $self->{list};
-	
-	# remove the file
-	unlink filename($self->{msgno});
-	dbg('msg', "deleting $self->{msgno}\n");
+	if ($self->{tonode}) {
+		$self->{delete}++;
+	} else {
+		my $call;
+		if ($dxchan) {
+			$call = " by " . $dxchan->call;
+		} else {
+			$call = '';
+		}
+
+		# remove it from the active message list
+		@msg = grep { $_ != $self } @msg;
+		
+		# remove the file
+		unlink filename($self->{msgno});
+	}
 }
 
 # clean out old messages from the message queue
@@ -477,18 +480,18 @@ sub clean_old
 	my $ref;
 	
 	# mark old messages for deletion
+	dbg("\@msg = " . scalar @msg . " before delete") if isdbg('msg');
 	foreach $ref (@msg) {
-		if (!$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
+		if (ref($ref) && !$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
 			$ref->{deleteme} = 1;
-			delete $ref->{gotit};
-			delete $ref->{list};
 			unlink filename($ref->{msgno});
-			dbg('msg', "deleting old $ref->{msgno}\n");
+			dbg("deleting old $ref->{msgno}\n") if isdbg('msg');
 		}
 	}
 	
 	# remove them all from the active message list
-	@msg = map { $_->{deleteme} ? () : $_ } @msg;
+	@msg = grep { !$_->{deleteme} } @msg;
+	dbg("\@msg = " . scalar @msg . " after delete") if isdbg('msg');
 	$last_clean = $main::systime;
 }
 
@@ -502,17 +505,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("Error reading $fn $!");
+	    Log('err', "Error reading $fn $!");
 		return undef;
 	}
 	$size = -s $fn;
 	$line = <$file>;			# first line
+	if ($size == 0 || !$line) {
+	    dbg("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("corrupt first line in $fn ($line)");
+		Log('err', "corrupt first line in $fn ($line)");
 		return undef;
 	}
 	$line =~ s/^=== //o;
@@ -523,7 +533,8 @@ sub read_msg_header
 	chomp $line;
 	$size -= length $line;
 	if (! $line =~ /^===/o) {
-		print "corrupt second line in $fn ($line)\n";
+	    dbg("corrupt second line in $fn ($line)");
+	    Log('err', "corrupt second line in $fn ($line)");
 		return undef;
 	}
 	$line =~ s/^=== //o;
@@ -549,10 +560,11 @@ sub read_msg_body
 	
 	$file = new IO::File;
 	if (!open($file, $fn)) {
-		print "Error reading $fn $!\n";
-		return undef;
+		dbg("Error reading $fn $!");
+		Log('err' ,"Error reading $fn $!");
+		return ();
 	}
-	chomp (@out = <$file>);
+	@out = map {chomp; $_} <$file>;
 	close($file);
 	
 	shift @out if $out[0] =~ /^=== /;
@@ -585,18 +597,15 @@ sub send_tranche
 sub queue_msg
 {
 	my $sort = shift;
-	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");
+	dbg("queue msg ($sort)\n") if isdbg('msg');
+	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?
 
 		# ignore 'delayed' messages until their waiting time has expired
 		if (exists $ref->{waitt}) {
@@ -604,37 +613,69 @@ sub queue_msg
 			delete $ref->{waitt};
 		} 
 
+		# any time outs?
+		if (exists $ref->{lastt} && $main::systime >= $ref->{lastt} + $timeout) {
+			my $node = $ref->{tonode};
+			dbg("Timeout, stopping msgno: $ref->{msgno} -> $node") if isdbg('msg');
+			Log('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
+			$ref->stop_msg($node);
+			
+			# delay any outgoing messages that fail
+			$ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
+			delete $ref->{lastt};
+			next;
+		}
+
+		# is it being sent anywhere currently?
+		next if $ref->{tonode};	          # ignore it if it already being processed
+		
+		# is it awaiting deletion?
+		if ($ref->{delete}) {
+			$ref->del_msg;
+			next;
+		}
+		
+		# firstly, is it private and unread? if so can I find the recipient
+		# in my cluster node list offsite?
+
 		# deal with routed private messages
-		my $noderef;
+		my $dxchan;
 		if ($ref->{private}) {
 			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 $hnode =  $uref->homenode if $uref;
-				$clref = DXCluster->get_exact($hnode) if $hnode;
+			$clref = Route::get($ref->{to});
+			if ($clref) {
+				$dxchan = $clref->dxchan;
+				if ($dxchan) {
+					if ($dxchan->is_node) {
+						next if $clref->call eq $main::mycall;  # i.e. it lives here
+						$ref->start_msg($dxchan) if !get_busy($dxchan->call)  && $dxchan->state eq 'normal';
+					}
+				} else {
+					dbg("Route: No dxchan for $ref->{to} " . ref($clref) ) if isdbg('msg');
+				}
 			}
-			if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all) {
-				next if $clref->call eq $main::mycall;  # i.e. it lives here
-				$noderef = $clref->{dxchan};
-				$ref->start_msg($noderef) if !get_busy($noderef->call)  && $noderef->state eq 'normal';
+		} else {
+			
+			# otherwise we are dealing with a bulletin or forwarded private message
+			# 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
+			# guess, use (to, from, time, subject) tuple?
+			foreach $dxchan (@nodelist) {
+				my $call = $dxchan->call;
+				next unless $call;
+				next if $call eq $main::mycall;
+				next if ref $ref->{gotit} && grep $_ eq $call, @{$ref->{gotit}};
+				next unless $ref->forward_it($call);           # check the forwarding file
+				next if $ref->{tonode};	          # ignore it if it already being processed
+				
+				# if we are here we have a node that doesn't have this message
+				if (!get_busy($call)  && $dxchan->state eq 'normal') {
+					$ref->start_msg($dxchan);
+					last;
+				}
 			}
 		}
-		
-		# otherwise we are dealing with a bulletin or forwarded private message
-		# 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
-		# guess, use (to, from, time, subject) tuple?
-		foreach $noderef (@nodelist) {
-			next if $noderef->call eq $main::mycall;
-			next if grep { $_ eq $noderef->call } @{$ref->{gotit}};
-			next unless $ref->forward_it($noderef->call);           # check the forwarding file
-
-			# 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';
-			last;
-		}
 
 		# if all the available nodes are busy then stop
 		last if @nodelist == scalar grep { get_busy($_->call) } @nodelist;
@@ -661,15 +702,19 @@ sub start_msg
 {
 	my ($self, $dxchan) = @_;
 	
-	dbg('msg', "start msg $self->{msgno}\n");
-	$self->{linesreq} = 5;
+	confess("trying to start started msg $self->{msgno} nodes: $self->{fromnode} -> $self->{tonode}") if $self->{tonode};
+	dbg("start msg $self->{msgno}\n") if isdbg('msg');
+	$self->{linesreq} = 10;
 	$self->{count} = 0;
 	$self->{tonode} = $dxchan->call;
 	$self->{fromnode} = $main::mycall;
-	$busy{$self->{tonode}} = $self;
-	$work{$self->{tonode}} = $self;
+	set_busy($self->{tonode}, $self);
+	set_fwq($self->{tonode}, undef, $self);
 	$self->{lastt} = $main::systime;
-	$dxchan->send(DXProt::pc28($self->{tonode}, $self->{fromnode}, $self->{to}, $self->{from}, $self->{t}, $self->{private}, $self->{subject}, $self->{origin}, $self->{rrreq}));
+	my ($fromnode, $origin);
+	$fromnode = $self->{fromnode};
+	$origin = $self->{origin};
+	$dxchan->send(DXProt::pc28($self->{tonode}, $fromnode, $self->{to}, $self->{from}, $self->{t}, $self->{private}, $self->{subject}, $origin, $self->{rrreq}));
 }
 
 # get the ref of a busy node
@@ -679,16 +724,52 @@ sub get_busy
 	return $busy{$call};
 }
 
-# get the busy queue
+sub set_busy
+{
+	my $call = shift;
+	return $busy{$call} = shift;
+}
+
+sub del_busy
+{
+	my $call = shift;
+	return delete $busy{$call};
+}
+
+# get the whole busy queue
 sub get_all_busy
 {
-	return values %busy;
+	return keys %busy;
 }
 
-# get the forwarding queue
+# get a forwarding queue entry
 sub get_fwq
 {
-	return values %work;
+	my $call = shift;
+	my $stream = shift || '0';
+	return $work{"$call,$stream"};
+}
+
+# delete a forwarding queue entry
+sub del_fwq
+{
+	my $call = shift;
+	my $stream = shift || '0';
+	return delete $work{"$call,$stream"};
+}
+
+# set a fwq entry
+sub set_fwq
+{
+	my $call = shift;
+	my $stream = shift || '0';
+	return $work{"$call,$stream"} = shift;
+}
+
+# get the whole forwarding queue
+sub get_all_fwq
+{
+	return keys %work;
 }
 
 # stop a message from continuing, clean it out, unlock interlocks etc
@@ -696,14 +777,27 @@ sub stop_msg
 {
 	my $self = shift;
 	my $node = shift;
-	my $stream = $self->{stream} if exists $self->{stream};
+	my $stream = $self->{stream};
 	
 	
-	dbg('msg', "stop msg $self->{msgno} -> node $node\n");
-	delete $work{$node};
-	delete $work{"$node$stream"} if $stream;
+	dbg("stop msg $self->{msgno} -> node $node\n") if isdbg('msg');
+	del_fwq($node, $stream);
 	$self->workclean;
-	delete $busy{$node};
+	del_busy($node);
+}
+
+sub workclean
+{
+	my $ref = shift;
+	delete $ref->{lines};
+	delete $ref->{linesreq};
+	delete $ref->{tonode};
+	delete $ref->{fromnode};
+	delete $ref->{stream};
+	delete $ref->{file};
+	delete $ref->{count};
+	delete $ref->{lastt} if exists $ref->{lastt};
+	delete $ref->{waitt} if exists $ref->{waitt};
 }
 
 # get a new transaction number from the file specified
@@ -717,12 +811,12 @@ sub next_transno
 	my $fh = new IO::File;
 	if (sysopen($fh, $fn, O_RDWR|O_CREAT, 0666)) {
 		$fh->autoflush(1);
-		$msgno = $fh->getline;
+		$msgno = $fh->getline || '0';
 		chomp $msgno;
 		$msgno++;
 		seek $fh, 0, 0;
 		$fh->print("$msgno\n");
-		dbg('msg', "msgno $msgno allocated for $name\n");
+		dbg("msgno $msgno allocated for $name\n") if isdbg('msg');
 		$fh->close;
 	} else {
 		confess "can't open $fn $!";
@@ -738,9 +832,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("load badmsg: " . (load_badmsg() or "Ok"));
+	dbg("load forward: " . (load_forward() or "Ok"));
+	dbg("load swop: " . (load_swop() or "Ok"));
 
 	# read in the directory
 	opendir($dir, $msgdir) or confess "can't open $msgdir $!";
@@ -749,14 +843,19 @@ 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("Deleting $_");
+			Log('err', "Deleting $_");
+			unlink "$msgdir/$_";
+			next;
+		}
 		
 		# delete any messages to 'badmsg.pl' places
-		if (grep $ref->{to} eq $_, @badmsg) {
-			dbg('msg', "'Bad' TO address $ref->{to}");
+		if ($ref->dump_it('')) {
+			dbg("'Bad' TO address $ref->{to}") if isdbg('msg');
 			Log('msg', "'Bad' TO address $ref->{to}");
 			$ref->del_msg;
 			next;
@@ -829,6 +928,11 @@ sub do_send_stuff
 		#  $DB::single = 1;
 		confess "local var gone missing" if !ref $self->{loc};
 		my $loc = $self->{loc};
+		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->{subject} = $line;
 		$loc->{lines} = [];
 		$self->state('sendbody');
@@ -846,13 +950,14 @@ sub do_send_stuff
 				my $mycall = $main::mycall;
 				$ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
 									uc $to,
-									$self->call, 
+									exists $loc->{from} ? $loc->{from} : $self->call, 
 									$systime,
 									$loc->{private}, 
 									$loc->{subject}, 
-									$mycall,
+									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);
@@ -880,20 +985,28 @@ sub do_send_stuff
 			$self->func(undef);
 			$self->state('prompt');
 		} 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', "line: $line");
+				return ($self->msg('e17', @ans));
+			}
 			
 			# i.e. it ain't and end or abort, therefore store the line
 			push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
 		}
 	}
-	return (1, @out);
+	return @out;
 }
 
 # return the standard directory line for this ref 
 sub dir
 {
 	my $ref = shift;
+	my $flag = $ref->read ? '-' : ' ';
+	$flag = 'D' if $ref->delete;
 	return sprintf "%6d%s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s", 
-		$ref->msgno, $ref->read ? '-' : ' ', $ref->private ? 'p' : ' ', $ref->size,
+		$ref->msgno, $flag, $ref->private ? 'p' : ' ', $ref->size,
 			$ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
 }
 
@@ -985,6 +1098,7 @@ sub dump_it
 		$tested = $ref->{from} if $field eq 'F';
 		$tested = $ref->{origin} if $field eq 'O';
 		$tested = $ref->{subject} if $field eq 'S';
+		$tested = $call if $field eq 'I';
 
 		if (!$pattern || $tested =~ m{$pattern}i) {
 			return 1;
@@ -1048,8 +1162,8 @@ sub import_msgs
 	# are there any to do in this directory?
 	return unless -d $importfn;
 	unless (opendir(DIR, $importfn)) {
-		dbg('msg', "can't open $importfn $!");
-		Log('msg', "can't open $importfn $!");
+		dbg("can\'t open $importfn $!") if isdbg('msg');
+		Log('msg', "can\'t open $importfn $!");
 		return;
 	} 
 
@@ -1057,21 +1171,23 @@ sub import_msgs
 	closedir(DIR);
 	my $name;
 	foreach $name (@names) {
-		next if $name =~ /^./;
+		next if $name =~ /^\./;
+		my $splitit = $name =~ /^split/;
 		my $fn = "$importfn/$name";
 		next unless -f $fn;
 		unless (open(MSG, $fn)) {
-			dbg('msg', "can't open import file $fn $!");
-			Log('msg', "can't open import file $fn $!");
+	 		dbg("can\'t open import file $fn $!") if isdbg('msg');
+			Log('msg', "can\'t open import file $fn $!");
 			unlink($fn);
 			next;
 		}
-		my @msg = map { chomp } <MSG>;
+		my @msg = map { chomp; $_ } <MSG>;
 		close(MSG);
 		unlink($fn);
-		my @out = import_one($DXProt::me, \@msg);
+		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
@@ -1080,6 +1196,7 @@ sub import_one
 {
 	my $dxchan = shift;
 	my $ref = shift;
+	my $splitit = shift;
 	my $private = '1';
 	my $rr = '0';
 	my $notincalls = 1;
@@ -1089,7 +1206,15 @@ sub import_one
 	my @out;
 				
 	# first line;
-	my @f = split /\s+/, shift @$ref;
+	my $line = shift @$ref;
+	my @f = split /\b/, $line;
+	@f = map {s/\s+//g; length $_ ? $_ : ()} @f;
+
+ 	unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
+		my $m = "invalid first line in import '$line'";
+		dbg($m) if isdbg('msg');
+		return (1, $m);
+	}
 	while (@f) {
 		my $f = uc shift @f;
 		next if $f eq 'SEND';
@@ -1101,14 +1226,16 @@ sub import_one
 			;
 		} elsif ($notincalls && ($f eq 'RR')) {
 			$rr = '1';
-		} elsif ($f eq '@' && @f) {       # this is bbs syntax, for origin
-			$origin = uc shift @f;
-		} elsif ($f =~ /^\$/) {     # this is bbs syntax  for a bid
-			next;
-		} elsif ($f =~ /^</) {     # this is bbs syntax  for from call
-			($from) = $f =~ /^<(\S+)$/;
+		} elsif (($f =~ /^[\@\.\#\$]$/ || $f eq '.#') && @f) {       # this is bbs syntax, for AT
+			shift @f;
 		} elsif ($f eq '<' && @f) {     # this is bbs syntax  for from call
 			$from = uc shift @f;
+		} elsif ($f =~ /^\$/) {     # this is bbs syntax  for a bid
+			next;
+		} elsif ($f =~ /^<(\S+)/) {     # this is bbs syntax  for from call
+			$from = $1;
+		} elsif ($f =~ /^\$\S+/) {     # this is bbs syntax for bid
+			;
 		} else {
 
 			# callsign ?
@@ -1131,51 +1258,81 @@ sub import_one
 					}
 				}
 			}
-
+			
 			if (grep $_ eq $f, @DXMsg::badmsg) {
 				push @out, $dxchan->msg('m3', $f);
 			} else {
-				push @to, $f;
+	 			push @to, $f;
 			}
 		}
 	}
-
+	
 	# subject is the next line
 	my $subject = shift @$ref;
 	
 	# strip off trailing lines 
-	pop @$ref while (@$ref && ($$ref[-1] eq '' || $$ref[-1] =~ /^\s+$/));
-
+	pop @$ref while (@$ref && $$ref[-1] =~ /^\s*$/);
+	
 	# strip off /EX or /ABORT
-	return () if (@$ref && $$ref[-1] =~ m{^/ABORT$}i); 
+	return ("aborted") if @$ref && $$ref[-1] =~ m{^/ABORT$}i; 
 	pop @$ref if (@$ref && $$ref[-1] =~ m{^/EX$}i);									 
 
+	# sort out any splitting that needs to be done
+	my @chunk;
+	if ($splitit) {
+		my $lth = 0;
+		my $lines = [];
+		for (@$ref) {
+			if ($lth >= $maxchunk || ($lth > $minchunk && /^\s*$/)) {
+				push @chunk, $lines;
+				$lines = [];
+				$lth = 0;
+			} 
+			push @$lines, $_;
+			$lth += length; 
+		}
+		push @chunk, $lines if @$lines;
+	} else {
+		push @chunk, $ref;
+	}
+				  
     # write all the messages away
-	my $to;
-	foreach $to (@to) {
-		my $systime = $main::systime;
-		my $mycall = $main::mycall;
-		my $mref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
-							$to,
-							$from, 
-							$systime,
-							$private, 
-							$subject, 
-							$origin,
-							'0',
-							$rr);
-		$mref->store($ref);
-		$mref->add_dir();
-		push @out, $dxchan->msg('m11', $ref->{msgno}, $to);
-		#push @out, "msgno $ref->{msgno} sent to $to";
-		my $todxchan = DXChannel->get(uc $to);
-		if ($todxchan) {
-			if ($todxchan->is_user()) {
-				$todxchan->send($dxchan->msg('m9'));
+	my $i;
+	for ( $i = 0;  $i < @chunk; $i++) {
+		my $chunk = $chunk[$i];
+		my $ch_subject;
+		if (@chunk > 1) {
+			my $num = " [" . ($i+1) . "/" . scalar @chunk . "]";
+			$ch_subject = substr($subject, 0, 27 - length $num) .  $num;
+		} else {
+			$ch_subject = $subject;
+		}
+		my $to;
+		foreach $to (@to) {
+			my $systime = $main::systime;
+			my $mycall = $main::mycall;
+			my $mref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
+									$to,
+									$from, 
+									$systime,
+									$private, 
+									$ch_subject, 
+									$origin,
+									'0',
+									$rr);
+			$mref->swop_it($main::mycall);
+			$mref->store($chunk);
+			$mref->add_dir();
+			push @out, $dxchan->msg('m11', $mref->{msgno}, $to);
+			#push @out, "msgno $ref->{msgno} sent to $to";
+			my $todxchan = DXChannel->get(uc $to);
+			if ($todxchan) {
+				if ($todxchan->is_user()) {
+					$todxchan->send($todxchan->msg('m9'));
+				}
 			}
 		}
 	}
-
 	return @out;
 }
 
@@ -1188,6 +1345,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} ;
 }