X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=304b9c6830b97f77bde4767cc64ad954c2a310e1;hb=d235b0d777f1a90c65d5dcf8cd6adaeb9f2b7e99;hp=ef76c9e8b5a793201e871b28a776ee2277c42f82;hpb=f18ba64dd93bbf7c47e6b5143bfc99af817888e8;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index ef76c9e8..304b9c68 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -25,6 +25,7 @@ use strict; use vars qw(%list %valid $filterdef $maxlevel); %valid = ( + parent => '0,Parent Calls,parray', call => "0,Callsign", flags => "0,Flags,phex", dxcc => '0,Country Code', @@ -32,7 +33,7 @@ use vars qw(%list %valid $filterdef $maxlevel); cq => '0,CQ Zone', state => '0,State', city => '0,City', - ip => '0,IP Address,piplist', + ip => '0,IP Address', ); $filterdef = bless ([ @@ -223,12 +224,14 @@ sub config 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 "; @@ -239,7 +242,8 @@ sub config $line =~ s/->$//g; $line =~ s/\s+$//; push @out, $line if length $line; - } else { + } + else { # recursion detector if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) { return @out; @@ -271,10 +275,10 @@ sub cluster { my $nodes = Route::Node::count(); my $tot = Route::User::count(); - my ($users, $maxlocalusers) = DXCommandmode::user_count(); + 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; + my $localnodes = $DXChannel::count - $users; # this is now wrong because of skimmers return ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes); @@ -375,21 +379,6 @@ sub dxchan 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 {