X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=d4fb95d4205eae5143959c9c6efd130b0da1eb43;hb=0bf3741541e019f34e3723649cf487e9982d978d;hp=8f354524e492f07ad6c98fb2f3993fafafe7fde3;hpb=b9dffeff7239952814342dad19db3a51def6fab7;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index 8f354524..d4fb95d4 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -1,22 +1,23 @@ #!/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; @@ -34,7 +35,7 @@ use vars qw(%list %valid $filterdef); ); $filterdef = bless ([ - # tag, sort, field, priv, special parser + # tag, sort, field, priv, special parser ['channel', 'c', 0], ['channel_dxcc', 'nc', 1], ['channel_itu', 'ni', 2], @@ -66,8 +67,8 @@ sub new 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,6 +285,34 @@ sub get return Route::Node::get($call) || Route::User::get($call); } +sub findroutes +{ + 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}; + if (my $dxchan = DXChannel::get($call)) { + $seen->{$call}++; + push @out, $level ? [$level, $dxchan] : $dxchan; + return @out; + } + + # deal with more nodes + my $nref = Route::get($call); + foreach my $ncall (@{$nref->{parent}}) { + dbg("recursing from $call -> $ncall") if isdbg('routec'); + my @rout = findroutes($ncall, $level+1, $seen); + push @out, @rout; + } + + return $level == 0 ? map {$_->[1]} sort {$a->[0] <=> $b->[0]} @out : @out; +} + # find all the possible dxchannels which this object might be on sub alldxchan { @@ -277,8 +322,8 @@ sub alldxchan my $dxchan = DXChannel::get($self->{call}); push @dxchan, $dxchan if $dxchan; - - # it isn't, build up a list of dxchannels and possible ping times + + # it isn't, build up a list of dxchannels and possible ping times # for all the candidates. unless (@dxchan) { foreach my $p (@{$self->{parent}}) { @@ -302,14 +347,14 @@ sub alldxchan sub dxchan { my $self = shift; - + # ALWAYS return the locally connected channel if present; 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) { @@ -333,14 +378,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 { @@ -357,7 +402,7 @@ sub fields # sub field_prompt -{ +{ my ($self, $ele) = @_; my $pkg = ref $self; my $val = "${pkg}::valid"; @@ -373,7 +418,7 @@ sub AUTOLOAD my $name = $AUTOLOAD; return if $name =~ /::DESTROY$/; $name =~ s/^.*:://o; - + confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; # this clever line of code creates a subroutine which takes over from autoload