X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=abc098471e7edaf0e7a721887a778359a77b3571;hb=709a22cc74af221af2b60494866c5a01e5ac1a6c;hp=ee84c1508b3bdd47e07edad8597845760a34ac19;hpb=dea6cbc282b2c101672139c9369af8c9bba7122e;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index ee84c150..abc09847 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -1,32 +1,27 @@ #!/usr/bin/perl # # This module impliments the abstracted routing for all protocols and -# is probably what I SHOULD have done the first time. +# is probably what I SHOULD have done the first time. # # Heyho. # -# This is just a container class which I expect to subclass +# This is just a container class which I expect to subclass # # Copyright (c) 2001 Dirk Koopman G1TLH # -# $Id$ -# +# +# package Route; use DXDebug; use DXChannel; use Prefix; +use DXUtil; use strict; -use vars qw($VERSION $BRANCH); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; -$main::build += $VERSION; -$main::branch += $BRANCH; - use vars qw(%list %valid $filterdef); %valid = ( @@ -35,18 +30,27 @@ use vars qw(%list %valid $filterdef); dxcc => '0,Country Code', itu => '0,ITU Zone', cq => '0,CQ Zone', + state => '0,State', + city => '0,City', ); $filterdef = bless ([ - # tag, sort, field, priv, special parser + # tag, sort, field, priv, special parser ['channel', 'c', 0], - ['channel_dxcc', 'n', 1], - ['channel_itu', 'n', 2], - ['channel_zone', 'n', 3], + ['channel_dxcc', 'nc', 1], + ['channel_itu', 'ni', 2], + ['channel_zone', 'nz', 3], ['call', 'c', 4], - ['call_dxcc', 'n', 5], - ['call_itu', 'n', 6], - ['call_zone', 'n', 7], + ['by', 'c', 4], + ['call_dxcc', 'nc', 5], + ['by_dxcc', 'nc', 5], + ['call_itu', 'ni', 6], + ['by_itu', 'ni', 6], + ['call_zone', 'nz', 7], + ['by_zone', 'nz', 7], + ['channel_state', 'ns', 8], + ['call_state', 'ns', 9], + ['by_state', 'ns', 9], ], 'Filter::Cmd'); @@ -59,15 +63,12 @@ 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->{dxcc}, $self->{itu}, $self->{cq}, $self->{state}, $self->{city}) = + Prefix::cty_data($call); + $self->{flags} = here(1); - - return $self; + + return $self; } # @@ -84,7 +85,7 @@ sub _getcall return $thingy; } -# +# # add and delete a callsign to/from a list # @@ -95,7 +96,7 @@ sub _addlist my @out; foreach my $c (@_) { confess "Need a ref here" unless ref($c); - + my $call = $c->{call}; unless (grep $_ eq $call, @{$self->{$field}}) { push @{$self->{$field}}, $call; @@ -165,7 +166,7 @@ sub parents return @{$self->{parent}}; } -# +# # display routines # @@ -179,30 +180,36 @@ sub user_call sub config { my $self = shift; - my $nodes_only = shift; + my $nodes_only = shift || 0; my $level = shift; my $seen = shift; my @out; my $line; - my $call = $self->user_call; + my $call = $self->{call}; my $printit = 1; + dbg("config: $call nodes: $nodes_only level: $level calls: " . join(',', @_)) if isdbg('routec'); + # allow ranges if (@_) { $printit = grep $call =~ m|$_|, @_; } if ($printit) { - $line = ' ' x ($level*2) . "$call"; - $call = ' ' x length $call; - + my $pcall = $self->user_call; + $pcall .= ":" . $self->obscount if isdbg('obscount'); + + + $line = ' ' x ($level*2) . $pcall; + $pcall = ' ' x length $pcall; + # recursion detector - if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) { + if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) { $line .= ' ...'; push @out, $line; return @out; } - push @$seen, $self->{call}; + $seen->{$call}++; # print users unless ($nodes_only) { @@ -221,7 +228,7 @@ sub config } else { $line =~ s/\s+$//; push @out, $line; - $line = ' ' x ($level*2) . "$call->$c "; + $line = ' ' x ($level*2) . "$pcall->$c "; } } } @@ -229,18 +236,28 @@ sub config $line =~ s/->$//g; $line =~ s/\s+$//; push @out, $line if length $line; + } else { + # recursion detector + if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) { + return @out; + } + $seen->{$call}++; } - + # deal with more nodes foreach my $ncall (sort @{$self->{nodes}}) { my $nref = Route::Node::get($ncall); if ($nref) { my $c = $nref->user_call; -# dbg("recursing from $call -> $c") if isdbg('routec'); - push @out, $nref->config($nodes_only, $level+1, $seen, @_); + dbg("recursing from $call -> $c") if isdbg('routec'); + my @rout = $nref->config($nodes_only, $level+1, $seen, @_); + if (@rout && @_) { + push @out, ' ' x ($level*2) . $self->user_call unless grep /^\s+$call/, @out; + } + push @out, @rout; } else { - push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); + push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); } } @@ -254,7 +271,7 @@ sub cluster my $users = scalar DXCommandmode::get_all(); my $maxusers = Route::User::max(); my $uptime = main::uptime(); - + return " $nodes nodes, $users local / $tot total users Max users $maxusers Uptime $uptime"; } @@ -268,61 +285,106 @@ sub get return Route::Node::get($call) || Route::User::get($call); } -# find all the possible dxchannels which this object might be on -sub alldxchan +sub findroutes { - my $self = shift; - my @dxchan; -# dbg("Trying node $self->{call}") if isdbg('routech'); - - my $dxchan = DXChannel->get($self->{call}); - push @dxchan, $dxchan if $dxchan; - - # 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'); - next if $p eq $main::mycall; # the root - my $dxchan = DXChannel->get($p); - if ($dxchan) { - push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan; + my $call = shift; + my $level = shift || 0; + my $seen = shift || {}; + my @out; + + dbg("findroutes: $call level: $level calls: " . join(',', @_)) if isdbg('routec'); + + # 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; + return @out; + } + $seen->{$call}++; + + # deal with more nodes + my $nref = Route::get($call); + return () unless $nref; + foreach my $ncall (@{$nref->{parent}}) { + unless ($seen->{$ncall}) { + + # put non-pc9x nodes to the back of the queue + 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; + } + } + + if ($level == 0) { + my @nout = map {$_->[1]} sort {$a->[0] <=> $b->[0]} @out; + my $last; + if ($nref->isa('Route::Node')) { + my $ncall = $nref->PC92C_dxchan; + $last = DXChannel::get($ncall) if $ncall; + } else { + my $pcall = $nref->{parent}->[0]; + my ($ref, $ncall); + $ref = Route::Node::get($pcall) if $pcall; + $ncall = $ref->PC92C_dxchan if $ref; + $last = DXChannel::get($ncall) if $ncall; + } + + if (isdbg('findroutes')) { + if (@out) { + foreach (sort {$a->[0] <=> $b->[0]} @out) { + dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call); + } } else { - next if grep $p eq $_, @_; - my $ref = Route::Node::get($p); -# dbg("Next node $p " . ($ref ? 'Found' : 'NOT Found') if isdbg('routech') ); - push @dxchan, $ref->alldxchan($self->{call}, @_) if $ref; + dbg("ROUTE: findroute $call -> PC92C_dxchan " . $last->call) if $last; } } + push @nout, $last if @out == 0 && $last; + return @nout; + } else { + return @out; } -# dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) ); +} + +# find all the possible dxchannels which this object might be on +sub alldxchan +{ + my $self = shift; + my @dxchan = findroutes($self->{call}); return @dxchan; } sub dxchan { my $self = shift; - + # ALWAYS return the locally connected channel if present; - my $dxchan = DXChannel->get($self->call); + my $dxchan = DXChannel::get($self->call); return $dxchan if $dxchan; - + my @dxchan = $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; +# 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; + + # dxchannels are now returned in order of "closeness" + return $dxchan[0]; } + + # # track destruction # @@ -331,14 +393,14 @@ sub DESTROY { my $self = shift; my $pkg = ref $self; - + dbg("$pkg $self->{call} destroyed") if isdbg('routelow'); } no strict; # -# return a list of valid elements -# +# return a list of valid elements +# sub fields { @@ -355,7 +417,7 @@ sub fields # sub field_prompt -{ +{ my ($self, $ele) = @_; my $pkg = ref $self; my $val = "${pkg}::valid"; @@ -367,17 +429,18 @@ sub field_prompt # sub AUTOLOAD { - my $self = shift; + no strict; my $name = $AUTOLOAD; return if $name =~ /::DESTROY$/; - $name =~ s/.*:://o; - + $name =~ s/^.*:://o; + confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; # this clever line of code creates a subroutine which takes over from autoload # from OO Perl - Conway -# *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ; - @_ ? $self->{$name} = shift : $self->{$name} ; + *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}}; + goto &$AUTOLOAD; + } 1;