push non-pc9x nodes to the back for routing

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 51fceff5928a7b58b8232cb60043b8a904ce2f47..0f23d45531c1e40ba6aa9640931b232e01a338eb 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -296,6 +296,8 @@ sub findroutes
 
        # recursion detector
        return () if $seen->{$call};
+
+       # return immediately if we are directly connected
        if (my $dxchan = DXChannel::get($call)) {
                $seen->{$call}++;
                push @out, $level ? [$level, $dxchan] : $dxchan;
@@ -305,10 +307,14 @@ sub findroutes
 
        # deal with more nodes
        my $nref = Route::get($call);
+       return () unless $nref;
        foreach my $ncall (@{$nref->{parent}}) {
                unless ($seen->{$ncall}) {
-                       dbg("recursing from $call -> $ncall") if isdbg('routec');
-                       my @rout = findroutes($ncall, $level+1, $seen);
+
+                       # put non-pc9x nodes to the back of the queue
+                       my $l = $level + ($nref->{do_pc9x} ? 0 : 30);
+                       dbg("recursing from $call -> $ncall level $l") if isdbg('routec');
+                       my @rout = findroutes($ncall, $l+1, $seen);
                        push @out, @rout;
                }
        }