use strict;
-use vars qw(%list %valid $filterdef);
+use vars qw(%list %valid $filterdef $maxlevel);
%valid = (
+ parent => '0,Parent Calls,parray',
call => "0,Callsign",
flags => "0,Flags,phex",
dxcc => '0,Country Code',
cq => '0,CQ Zone',
state => '0,State',
city => '0,City',
+ ip => '0,IP Address',
);
$filterdef = bless ([
['by_state', 'ns', 9],
], 'Filter::Cmd');
+$maxlevel = 25; # maximum recursion level in Route::config
sub new
{
$pcall = ' ' x length $pcall;
# recursion detector
- if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+ if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
$line .= ' ...';
push @out, $line;
return @out;
my $c;
if ($uref) {
$c = $uref->user_call;
- } else {
+ }
+ else {
$c = "$ucall?";
}
if ((length $line) + (length $c) + 1 < $width) {
$line .= $c . ' ';
- } else {
+ }
+ else {
$line =~ s/\s+$//;
push @out, $line;
$line = ' ' x ($level*2) . "$pcall->$c ";
$line =~ s/->$//g;
$line =~ s/\s+$//;
push @out, $line if length $line;
- } else {
+ }
+ else {
# recursion detector
- if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+ if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
return @out;
}
$seen->{$call}++;
{
my $nodes = Route::Node::count();
my $tot = Route::User::count();
- my $users = scalar DXCommandmode::get_all();
+ my ($users, $maxlocalusers) = DXCommandmode::user_count(); # the user count is wrong because of skimmers
my $maxusers = Route::User::max();
my $uptime = main::uptime();
+ my $localnodes = $DXChannel::count - $users; # this is now wrong because of skimmers
+
+ return ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes);
+
- return " $nodes nodes, $users local / $tot total users Max users $maxusers Uptime $uptime";
}
#
sub findroutes
{
my $call = shift;
+ my %cand;
my @out;
dbg("ROUTE: findroutes $call") if isdbg('findroutes');
- # return immediately if we are directly connected
+ 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');
- return $dxchan;
+ $cand{$call} = 99;
}
- my $nref = Route::get($call);
- return () unless $nref;
-
# obtain the dxchannels that have seen this thingy
my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
- my %cand;
foreach my $p (@parent) {
- # return immediately if we are directly connected or a user's parent node is
+ 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');
- return $dxchan;
+ $cand{$p} = 99;
+ next;
}
my $r = Route::Node::get($p);
}
# 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) {
+ 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
}
-
#
# track destruction
#