use strict;
-use vars qw(%list %valid $filterdef);
+use vars qw(%list %valid $filterdef $maxlevel);
%valid = (
call => "0,Callsign",
cq => '0,CQ Zone',
state => '0,State',
city => '0,City',
+ ip => '0,IP Address,piplist',
);
$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;
push @out, $line if length $line;
} 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();
my $maxusers = Route::User::max();
my $uptime = main::uptime();
+ my $localnodes = $DXChannel::count - $users;
+
+ return ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes);
+
- return " $nodes nodes, $users local / $tot total users Max users $maxusers Uptime $uptime";
}
#
return $dxchan[0];
}
+# IP address handling
+# this allows one to ask whether an IP address has been used with this node or let's one set an IP address for this node.
+sub ip
+{
+ my $self = shift;
+ my $node = shift;
+ my $ipin = shift;
+
+ $self->{ip} = {} unless ref $self->{ip};
+ my $ref = $self->{ip};
+ my $ip = $ref->{$node}->[0];
+ $ip = $ref->{$node} = [$ipin, $main::systime] if $ipin;
+ return $ip;
+}
+
sub delete_interface
{