X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=a7ef30c2831a5d7e76665f079ad26b6dae6b7317;hb=5d2f2feddd2c756e43868f62f72b3c5033c3d3a7;hp=516779b67458791266a7d00bd25453d30732b1ad;hpb=0a35942621158fae0bca29f3c70c63a97fc4e691;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 516779b6..a7ef30c2 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1148,7 +1148,6 @@ sub finish
 {
 	my $self = shift;
 	my $call = $self->call;
-	my $conn = shift;
 	my $ref = DXCluster->get_exact($call);
 	
 	# unbusy and stop and outgoing mail
@@ -1156,13 +1155,10 @@ sub finish
 	$mref->stop_msg($call) if $mref;
 	
 	# broadcast to all other nodes that all the nodes connected to via me are gone
-	my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
-	my $node;
-	
-	foreach $node (@gonenodes) {
+	foreach my $node (grep { $_->dxchan == $self } DXNode::get_all) {
 		next if $node->call eq $call;
-		broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; 
-		$node->del();
+		next if $node->call eq $main::mycall;
+		broadcast_ak1a(pc21($node->call, 'Gone.'), $self) unless $self->{isolate};
 	}
 
 	# remove outstanding pings
@@ -1514,6 +1510,8 @@ sub broadcast_ak1a
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
+		next if $dxchan == $me;
+		
 		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
 		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
 	}
@@ -1531,6 +1529,8 @@ sub broadcast_all_ak1a
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
+		next if $dxchan == $me;
+
 		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
 		$dxchan->send($routeit);
 	}
@@ -1565,6 +1565,7 @@ sub broadcast_list
 	
 	foreach $dxchan (@_) {
 		my $filter = 1;
+		next if $dxchan == $me;
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};