X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=dce9c04f28f0b8df2b902ece0ba6c12d145968a9;hb=29cfbdc85ae44c73dd0a036ab3f19d6040505fba;hp=bd6baf2fd5935d2bbf3f7bc91047583610537fb5;hpb=6a7585fe8df540f3dba6e0d09d115ce70d8b1aff;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index bd6baf2f..dce9c04f 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -144,6 +144,7 @@ sub process
 				my $ref = $busy{$_};
 				if (exists $ref->{lastt} && $main::systime >= $ref->{lastt} + $timeout) {
 					dbg('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
+					Log('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
 					$ref->stop_msg($node);
 					
 					# delay any outgoing messages that fail
@@ -202,7 +203,7 @@ sub process
 
 			# 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");
 			}
@@ -635,7 +636,7 @@ sub queue_msg
 		# guess, use (to, from, time, subject) tuple?
 		foreach $dxchan (@nodelist) {
 			next if $dxchan->call eq $main::mycall;
-			next if grep { $_ eq $dxchan->call } @{$ref->{gotit}};
+			next if ref $ref->{gotit} && grep $_ eq $dxchan->call, @{$ref->{gotit}};
 			next unless $ref->forward_it($dxchan->call);           # check the forwarding file
 
 			# if we are here we have a node that doesn't have this message
@@ -669,7 +670,7 @@ sub start_msg
 	my ($self, $dxchan) = @_;
 	
 	dbg('msg', "start msg $self->{msgno}\n");
-	$self->{linesreq} = 5;
+	$self->{linesreq} = 10;
 	$self->{count} = 0;
 	$self->{tonode} = $dxchan->call;
 	$self->{fromnode} = $main::mycall;