#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
-# $Id$
+#
#
package Route;
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) {
- my $pcall = $call;
- $pcall .= ":" . $self->obscount if $self->via_pc92;
+ my $pcall = $self->user_call;
+ $pcall .= ":" . $self->obscount if isdbg('obscount');
- $line = ' ' x ($level*2) . "$pcall";
- $call = ' ' x length $pcall;
+ $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) {
} else {
$line =~ s/\s+$//;
push @out, $line;
- $line = ' ' x ($level*2) . "$call->$c ";
+ $line = ' ' x ($level*2) . "$pcall->$c ";
}
}
}
$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
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|$_|, @_);
}
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;
}
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];
}
projects / spider.git / blobdiff