X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=bd6baf2fd5935d2bbf3f7bc91047583610537fb5;hb=f939c447ca5ef37073054a73e50b48a63533a9bc;hp=2de6a22ad7cdf220b567212e24800071fa88ca51;hpb=b736286d16b3c0e310df106f727ca2143a000e08;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 2de6a22a..bd6baf2f 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -458,7 +458,7 @@ sub del_msg
 	my $self = shift;
 	
 	# remove it from the active message list
-	@msg = grep { $ref($_) && $_ != $self } @msg;
+	@msg = grep { ref($_) && $_ != $self } @msg;
 	
 	# belt and braces (one day I will ask someone if this is REALLY necessary)
 	delete $self->{gotit};
@@ -612,7 +612,7 @@ sub queue_msg
 		} 
 
 		# 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});
@@ -621,10 +621,10 @@ sub queue_msg
 				my $hnode =  $uref->homenode if $uref;
 				$clref = DXCluster->get_exact($hnode) if $hnode;
 			}
-			if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all()) {
+			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';
+				$dxchan = $clref->dxchan;
+				$ref->start_msg($dxchan) if $dxchan && !get_busy($dxchan->call)  && $dxchan->state eq 'normal';
 			}
 		}
 		
@@ -633,13 +633,13 @@ sub queue_msg
 		# 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
+		foreach $dxchan (@nodelist) {
+			next if $dxchan->call eq $main::mycall;
+			next if 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
-			$ref->start_msg($noderef) if !get_busy($noderef->call)  && $noderef->state eq 'normal';
+			$ref->start_msg($dxchan) if !get_busy($dxchan->call)  && $dxchan->state eq 'normal';
 			last;
 		}