fix some rubbish in dxprot::finish

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index fd47a28a2860afa87f393bc2bc4e309793076272..2677cb7ef56cb3a6df58876d2cbcccec314d793f 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1155,13 +1155,12 @@ 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 @gonenodes = grep { $_->dxchan != $self && $_->dxchan != $me } DXNode::get_all();
        my $node;
        
-       foreach $node (@gonenodes) {
-               next if $node->call eq $call;
-               broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; 
-               $node->del();
+       foreach my $dxchan (DXChannel::get_all_nodes) {
+               next if $dxchan == $self || $dxchan == $me;
+               broadcast_ak1a(pc21($dxchan->call, 'Gone') , $self) unless $self->{isolate}; 
        }
 
        # remove outstanding pings
@@ -1513,6 +1512,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;
        }
@@ -1530,6 +1531,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);
        }
@@ -1564,6 +1567,7 @@ sub broadcast_list
        
        foreach $dxchan (@_) {
                my $filter = 1;
+               next if $dxchan == $me;
                
                if ($sort eq 'dx') {
                    next unless $dxchan->{dx};