X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=3c1c453e523a2a4088423576441b5730c771dade;hb=b2dfa977515995b8ab19611b88cfc999ad78591b;hp=f637539c0c41c11f5ffa531b485789430a2fc4da;hpb=d638bda3f73da1b09d029105a0f3c95093c50df5;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index f637539c..3c1c453e 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -297,7 +297,7 @@ sub findroutes my $dxchan = DXChannel::get($call); if ($dxchan) { dbg("ROUTE: findroutes $call -> directly connected") if isdbg('findroutes'); - return $dxchan; + return [99, $dxchan]; } my $nref = Route::get($call); @@ -311,7 +311,7 @@ sub findroutes $dxchan = DXChannel::get($p); if ($dxchan) { dbg("ROUTE: findroutes $call -> connected direct via parent $p") if isdbg('findroutes'); - return $dxchan; + return [99, $dxchan]; } my $r = Route::Node::get($p); @@ -331,10 +331,10 @@ sub findroutes } # get a sorted list of dxchannels with the highest hop count first - my @nout = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @out; + my @nout = sort {$b->[0] <=> $a->[0]} @out; if (isdbg('findroutes')) { - if (@out) { - foreach (sort {$b->[0] <=> $a->[0]} @out) { + if (@nout) { + for (@nout) { dbg("ROUTE: findroutes $call -> $_->[0] " . $_->[1]->call); } } @@ -348,7 +348,7 @@ sub alldxchan { my $self = shift; my @dxchan = findroutes($self->{call}); - return @dxchan; + return map {$_->[1]} @dxchan; } sub dxchan