sub findroutes
{
my $call = shift;
+ my %cand;
my @out;
- dbg("ROUTE: findroutes: $call") if isdbg('findroutes');
-
- # return immediately if we are directly connected
- if (my $dxchan = DXChannel::get($call)) {
- return $dxchan;
- }
+ dbg("ROUTE: findroutes $call") if isdbg('findroutes');
my $nref = Route::get($call);
return () unless $nref;
+ # we are directly connected, force "best possible" priority, but
+ # carry on in case user is connected on other nodes.
+ my $dxchan = DXChannel::get($call);
+ if ($dxchan) {
+ dbg("ROUTE: findroutes $call -> directly connected") if isdbg('findroutes');
+ $cand{$call} = 99;
+ }
+
# obtain the dxchannels that have seen this thingy
my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
- my %cand;
foreach my $p (@parent) {
+ next if $p eq $main::mycall; # this is dealt with above
+
+ # deal with directly connected nodes, again "best priority"
+ $dxchan = DXChannel::get($p);
+ if ($dxchan) {
+ dbg("ROUTE: findroutes $call -> connected direct via parent $p") if isdbg('findroutes');
+ $cand{$p} = 99;
+ next;
+ }
+
my $r = Route::Node::get($p);
if ($r) {
my %r = $r->PC92C_dxchan;
}
# get a sorted list of dxchannels with the highest hop count first
- my @nout = map {$_->[1]} sort {$b->[0] <=> $a->[0]} @out;
+ my @nout = sort {$b->[0] <=> $a->[0]} @out;
if (isdbg('findroutes')) {
- if (@out) {
- foreach (sort {$b->[0] <=> $a->[0]} @out) {
- dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call);
+ if (@nout) {
+ for (@nout) {
+ dbg("ROUTE: findroutes $call -> $_->[0] " . $_->[1]->call);
}
}
}
{
my $self = shift;
my @dxchan = findroutes($self->{call});
- return @dxchan;
+ return map {$_->[1]} @dxchan;
}
sub dxchan