more wip and a nearly working basic thing

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 0f52e39b4023285ad994ad533feb18d66ad11f19..45bd7213e147eceb93bf3458f294b2dbd0b67a1c 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -37,6 +37,7 @@ use vars qw(%list %valid $filterdef);
                  cq => '0,CQ Zone',
                  state => '0,State',
                  city => '0,City',
+                 lastseen => 'Last Seen,atime',
                 );
 
 $filterdef = bless ([
@@ -151,7 +152,8 @@ sub here
        my $r = shift;
        return $self ? 2 : 0 unless ref $self;
        return ($self->{flags} & 2) ? 1 : 0 unless defined $r;
-       $self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0));
+       $self->{flags} &= ~2;
+       $self->{flags} |= $r ? 2 : 0;
        return $r ? 1 : 0;
 }
 
@@ -161,16 +163,11 @@ sub conf
        my $r = shift;
        return $self ? 1 : 0 unless ref $self;
        return ($self->{flags} & 1) ? 1 : 0 unless defined $r;
-       $self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
+       $self->{flags} &= ~1;
+       $self->{flags} |= $r ? 1 : 0;
        return $r ? 1 : 0;
 }
 
-sub parents
-{
-       my $self = shift;
-       return @{$self->{parent}};
-}
-
 # 
 # display routines
 #
@@ -287,8 +284,8 @@ sub alldxchan
        # it isn't, build up a list of dxchannels and possible ping times 
        # for all the candidates.
        unless (@dxchan) {
-               foreach my $p (@{$self->{parent}}) {
-#                      dbg("Trying parent $p") if isdbg('routech');
+               foreach my $p (@{$self->{dxchan}}) {
+#                      dbg("Trying dxchan $p") if isdbg('routech');
                        next if $p eq $main::mycall; # the root
                        my $dxchan = DXChannel->get($p);
                        if ($dxchan) {
@@ -305,7 +302,7 @@ sub alldxchan
        return @dxchan;
 }
 
-sub dxchan
+sub bestdxchan
 {
        my $self = shift;
        
@@ -313,24 +310,12 @@ sub dxchan
        my $dxchan = DXChannel->get($self->call);
        return $dxchan if $dxchan;
        
-       my @dxchan = $self->alldxchan;
+       my @dxchan = sort { ($a->pingave || 9999999) <=> ($b->pingave || 9999999) } $self->alldxchan;
        return undef unless @dxchan;
        
-       # determine the minimum ping channel
-       my $minping = 99999999;
-       foreach my $dxc (@dxchan) {
-               my $p = $dxc->pingave;
-               if (defined $p  && $p < $minping) {
-                       $minping = $p;
-                       $dxchan = $dxc;
-               }
-       }
-       $dxchan = shift @dxchan unless $dxchan;
-       return $dxchan;
+       return shift @dxchan;
 }
 
-
-
 #
 # track destruction
 #