remove Prot.pm, sort %valid fields

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 3301099890e23214948639c8aa28c667bc52dbfd..a8820ea4fd228510d28f345ecc6913184ee2abd5 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -22,16 +22,18 @@ use DXUtil;
 use strict;
 
 
-use vars qw(%list %valid $filterdef);
+use vars qw(%list %valid $filterdef $maxlevel);
 
 %valid = (
                  call => "0,Callsign",
-                 flags => "0,Flags,phex",
+                 city => '0,City',
+                 cq => '0,CQ Zone',
                  dxcc => '0,Country Code',
+                 flags => "0,Flags,phex",
+                 ip => '0,IP Address',
                  itu => '0,ITU Zone',
-                 cq => '0,CQ Zone',
+                 parent => '0,Parent Calls,parray',
                  state => '0,State',
-                 city => '0,City',
                 );
 
 $filterdef = bless ([
@@ -53,6 +55,7 @@ $filterdef = bless ([
                          ['by_state', 'ns', 9],
                         ], 'Filter::Cmd');
 
+$maxlevel = 25;                 # maximum recursion level in Route::config
 
 sub new
 {
@@ -205,7 +208,7 @@ sub config
                $pcall = ' ' x length $pcall;
 
                # recursion detector
-               if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+               if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
                        $line .= ' ...';
                        push @out, $line;
                        return @out;
@@ -221,12 +224,14 @@ sub config
                                        my $c;
                                        if ($uref) {
                                                $c = $uref->user_call;
-                                       } else {
+                                       }
+                                       else {
                                                $c = "$ucall?";
                                        }
                                        if ((length $line) + (length $c) + 1 < $width) {
                                                $line .= $c . ' ';
-                                       } else {
+                                       }
+                                       else {
                                                $line =~ s/\s+$//;
                                                push @out, $line;
                                                $line = ' ' x ($level*2) . "$pcall->$c ";
@@ -237,9 +242,10 @@ sub config
                $line =~ s/->$//g;
                $line =~ s/\s+$//;
                push @out, $line if length $line;
-       } else {
+       }
+       else {
                # recursion detector
-               if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+               if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
                        return @out;
                }
                $seen->{$call}++;
@@ -269,11 +275,14 @@ sub cluster
 {
        my $nodes = Route::Node::count();
        my $tot = Route::User::count();
-       my $users = scalar DXCommandmode::get_all();
+       my ($users, $maxlocalusers) = DXCommandmode::user_count(); # the user count is wrong because of skimmers
        my $maxusers = Route::User::max();
        my $uptime = main::uptime();
+       my $localnodes = $DXChannel::count - $users;   # this is now wrong because of skimmers
+       
+       return ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes);
+       
 
-       return " $nodes nodes, $users local / $tot total users  Max users $maxusers  Uptime $uptime";
 }
 
 #
@@ -289,22 +298,35 @@ sub get
 sub findroutes
 {
        my $call = shift;
+       my %cand;
        my @out;
 
-       dbg("ROUTE: findroutes: $call") if isdbg('findroutes');
-
-       # return immediately if we are directly connected
-       if (my $dxchan = DXChannel::get($call)) {
-               return $dxchan;
-       }
+       dbg("ROUTE: findroutes $call") if isdbg('findroutes');
 
        my $nref = Route::get($call);
        return () unless $nref;
 
+       # we are directly connected, force "best possible" priority, but
+       # carry on in case user is connected on other nodes.
+       my $dxchan = DXChannel::get($call);
+       if ($dxchan) {
+               dbg("ROUTE: findroutes $call -> directly connected") if isdbg('findroutes');
+               $cand{$call} = 99;
+       }
+
        # obtain the dxchannels that have seen this thingy
        my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
-       my %cand;
        foreach my $p (@parent) {
+               next if $p eq $main::mycall; # this is dealt with above
+
+               # deal with directly connected nodes, again "best priority"
+               $dxchan = DXChannel::get($p);
+               if ($dxchan) {
+                       dbg("ROUTE: findroutes $call -> connected direct via parent $p") if isdbg('findroutes');
+                       $cand{$p} = 99;
+                       next;
+               }
+
                my $r = Route::Node::get($p);
                if ($r) {
                        my %r = $r->PC92C_dxchan;
@@ -322,11 +344,11 @@ 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) {
-                               dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call);
+               if (@nout) {
+                       for (@nout) {
+                               dbg("ROUTE: findroutes $call -> $_->[0] " . $_->[1]->call);
                        }
                }
        }
@@ -339,7 +361,7 @@ sub alldxchan
 {
        my $self = shift;
        my @dxchan = findroutes($self->{call});
-       return @dxchan;
+       return map {$_->[1]} @dxchan;
 }
 
 sub dxchan
@@ -362,7 +384,6 @@ sub delete_interface
 
 }
 
-
 #
 # track destruction
 #