push non-pc9x and non-spider nodes back for routing

At the moment it appears that we can rely on non-spider nodes routing
stuff correctly for mail and rcmd. So we push those routes to the back
of the list.

diff --git a/perl/Route.pm b/perl/Route.pm
index 0f23d45531c1e40ba6aa9640931b232e01a338eb..abc098471e7edaf0e7a721887a778359a77b3571 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -312,7 +312,7 @@ sub findroutes
                unless ($seen->{$ncall}) {
 
                        # put non-pc9x nodes to the back of the queue
-                       my $l = $level + ($nref->{do_pc9x} ? 0 : 30);
+                       my $l = $level + ($nref->{do_pc9x} && ($nref->{version}||5454) >= 5454 ? 0 : 30);
                        dbg("recursing from $call -> $ncall level $l") if isdbg('routec');
                        my @rout = findroutes($ncall, $l+1, $seen);
                        push @out, @rout;

diff --git a/perl/Version.pm b/perl/Version.pm
index 71aff4a098d1197381d2f49bc67e797cf40de885..42a16ea3712fb80f93158cbcffbf9b63b6b488c6 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '168';
+$build = '169';
 
 1;