projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add crontab entries for crontab in Changes
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index eb83af11f8e16d6c1cb55e7e6429ddf6905911af..a8820ea4fd228510d28f345ecc6913184ee2abd5 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";
}
#
}
#
@@
-375,7
+384,6
@@
sub delete_interface
}
}
-
#
# track destruction
#
#
# track destruction
#