projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow synonyms for localhost
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 3c1c453e523a2a4088423576441b5730c771dade..99b4b2b1e73d42fd1bc9cdfe2b4b68e43c036dc9 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-22,16
+22,18
@@
use DXUtil;
use strict;
use strict;
-use vars qw(%list %valid $filterdef);
+use vars qw(%list %valid $filterdef
$maxlevel
);
%valid = (
call => "0,Callsign",
%valid = (
call => "0,Callsign",
- flags => "0,Flags,phex",
+ city => '0,City',
+ cq => '0,CQ Zone',
dxcc => '0,Country Code',
dxcc => '0,Country Code',
+ flags => "0,Flags,phex",
+ ip => '0,IP Address',
itu => '0,ITU Zone',
itu => '0,ITU Zone',
-
cq => '0,CQ Zone
',
+
parent => '0,Parent Calls,parray
',
state => '0,State',
state => '0,State',
- city => '0,City',
);
$filterdef = bless ([
);
$filterdef = bless ([
@@
-53,6
+55,7
@@
$filterdef = bless ([
['by_state', 'ns', 9],
], 'Filter::Cmd');
['by_state', 'ns', 9],
], 'Filter::Cmd');
+$maxlevel = 25; # maximum recursion level in Route::config
sub new
{
sub new
{
@@
-205,7
+208,7
@@
sub config
$pcall = ' ' x length $pcall;
# recursion detector
$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;
$line .= ' ...';
push @out, $line;
return @out;
@@
-221,12
+224,14
@@
sub config
my $c;
if ($uref) {
$c = $uref->user_call;
my $c;
if ($uref) {
$c = $uref->user_call;
- } else {
+ }
+ else {
$c = "$ucall?";
}
if ((length $line) + (length $c) + 1 < $width) {
$line .= $c . ' ';
$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/\s+$//;
push @out, $line;
$line = ' ' x ($level*2) . "$pcall->$c ";
@@
-237,9
+242,10
@@
sub config
$line =~ s/->$//g;
$line =~ s/\s+$//;
push @out, $line if length $line;
$line =~ s/->$//g;
$line =~ s/\s+$//;
push @out, $line if length $line;
- } else {
+ }
+ else {
# recursion detector
# recursion detector
- if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+ if ((DXChannel::get($call) && $level > 1) || $seen->{$call}
|| $level > $maxlevel
) {
return @out;
}
$seen->{$call}++;
return @out;
}
$seen->{$call}++;
@@
-269,11
+275,14
@@
sub cluster
{
my $nodes = Route::Node::count();
my $tot = Route::User::count();
{
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 $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";
}
#
}
#
@@
-289,29
+298,33
@@
sub get
sub findroutes
{
my $call = shift;
sub findroutes
{
my $call = shift;
+ my %cand;
my @out;
dbg("ROUTE: findroutes $call") if isdbg('findroutes');
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');
my $dxchan = DXChannel::get($call);
if ($dxchan) {
dbg("ROUTE: findroutes $call -> directly connected") if isdbg('findroutes');
-
return [99, $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;
# obtain the dxchannels that have seen this thingy
my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
- my %cand;
foreach my $p (@parent) {
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');
$dxchan = DXChannel::get($p);
if ($dxchan) {
dbg("ROUTE: findroutes $call -> connected direct via parent $p") if isdbg('findroutes');
- return [99, $dxchan];
+ $cand{$p} = 99;
+ next;
}
my $r = Route::Node::get($p);
}
my $r = Route::Node::get($p);
@@
-371,7
+384,6
@@
sub delete_interface
}
}
-
#
# track destruction
#
#
# track destruction
#
@@
-411,6
+423,18
@@
sub field_prompt
return $val->{$ele} || $valid{$ele};
}
return $val->{$ele} || $valid{$ele};
}
+sub write_cache
+{
+ Route::Node::write_cache();
+ Route::User::write_cache();
+}
+
+sub read_cache
+{
+ Route::Node::read_cache();
+ Route::User::read_cache();
+}
+
#
# generic AUTOLOAD for accessors
#
#
# generic AUTOLOAD for accessors
#