X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=45bd7213e147eceb93bf3458f294b2dbd0b67a1c;hb=9a31104f31ce5d80a659dea3de9dbf9a5d46ef8e;hp=a9f80fea4e3afe8b1e546c88444fd202467141f8;hpb=7b616aeabce92e3cb416a5fe6640a288adfe5410;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index a9f80fea..45bd7213 100644 --- 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 ([ @@ -68,14 +69,9 @@ sub new dbg("create $pkg with $call") if isdbg('routelow'); # add in all the dxcc, itu, zone info - my @dxcc = Prefix::extract($call); - if (@dxcc > 0) { - $self->{dxcc} = $dxcc[1]->dxcc; - $self->{itu} = $dxcc[1]->itu; - $self->{cq} = $dxcc[1]->cq; - $self->{state} = $dxcc[1]->state; - $self->{city} = $dxcc[1]->city; - } + ($self->{dxcc}, $self->{itu}, $self->{cq}, $self->{state}, $self->{city}) = + Prefix::cty_data($call); + $self->{flags} = here(1); return $self; @@ -156,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; } @@ -166,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 # @@ -292,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) { @@ -310,7 +302,7 @@ sub alldxchan return @dxchan; } -sub dxchan +sub bestdxchan { my $self = shift; @@ -318,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 #