X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=3262a44df98f7c13af304c97c8ece3d735154b0c;hb=11056ea11fce910aa0e0d183a1cce73cf0de1c21;hp=5ab8d4af5dbc60804707884f9001f15fd714283f;hpb=e4a83830dc7e9f06779967a5cb8b837a39872c70;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 5ab8d4af..3262a44d 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -186,6 +186,13 @@ sub process
 			$busy{$f[2]} = $ref; # set interlock
 			$self->send(DXProt::pc30($f[2], $f[1], $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) {
+				$ref->{private} = 1;
+				dbg('msg', "set bull to $ref->{to} to private");
+			}
 			last SWITCH;
 		}
 		
@@ -581,7 +588,7 @@ sub queue_msg
 
 		# ignore 'delayed' messages until their waiting time has expired
 		if (exists $ref->{waitt}) {
-			next if $ref->{waitt} < $main::systime;
+			next if $ref->{waitt} > $main::systime;
 			delete $ref->{waitt};
 		}