X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=fbc63bc09ed2df2a5c2304ecf627ca86a0851be7;hb=4ed8f51684c6f2183ffd5e46f1fc69dc4f52ebd9;hp=a6982f1f2bf53a47025e22200556f58c7ba39522;hpb=28b2bbdfbc91fc224d33cc53d122190974ca0b75;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index a6982f1f..fbc63bc0 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -717,27 +717,32 @@ sub send_local_config my $self = shift; my $n; my @nodes; - + my @localnodes; + my @remotenodes; + # send our nodes if ($self->{isolate}) { - @nodes = (DXCluster->get_exact($main::mycall)); + @localnodes = (DXCluster->get_exact($main::mycall)); } else { # create a list of all the nodes that are not connected to this connection # and are not themselves isolated, this to make sure that isolated nodes # don't appear outside of this node - @nodes = DXNode::get_all(); + @nodes = DXNode::get_all(); @nodes = grep { $_->dxchan != $self } @nodes; - @nodes = grep { !($_->dxchan && $_->dxchan->isolate) } @nodes; + @nodes = grep { $_->{call} ne $main::mycall } @nodes; + @localnodes = grep { $_->dxchan->{call} eq $_->{call} && !$_->dxchan->{isolate} } @nodes if @nodes; + unshift @localnodes, DXCluster->get_exact($main::mycall); + @remotenodes = grep { $_->dxchan->{call} ne $_->{call} } @nodes if @nodes; } - my @s = $me->pc19(@nodes); + my @s = $me->pc19(@localnodes, @remotenodes); for (@s) { my $routeit = adjust_hops($self, $_); $self->send($routeit) if $routeit; } # get all the users connected on the above nodes and send them out - foreach $n (@nodes) { + foreach $n (@localnodes, @remotenodes) { my @users = values %{$n->list}; my @s = pc16($n, @users); for (@s) {