projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
recover from removal of newline characters!
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 0f52e39b4023285ad994ad533feb18d66ad11f19..cf4eb198e9d664746fb8920717571ceffee79f27 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-1,32
+1,27
@@
#!/usr/bin/perl
#
# This module impliments the abstracted routing for all protocols and
#!/usr/bin/perl
#
# This module impliments the abstracted routing for all protocols and
-# is probably what I SHOULD have done the first time.
+# is probably what I SHOULD have done the first time.
#
# Heyho.
#
#
# Heyho.
#
-# This is just a container class which I expect to subclass
+# This is just a container class which I expect to subclass
#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
# $Id$
#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
# $Id$
-#
+#
package Route;
use DXDebug;
use DXChannel;
use Prefix;
package Route;
use DXDebug;
use DXChannel;
use Prefix;
+use DXUtil;
use strict;
use strict;
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
use vars qw(%list %valid $filterdef);
%valid = (
use vars qw(%list %valid $filterdef);
%valid = (
@@
-40,7
+35,7
@@
use vars qw(%list %valid $filterdef);
);
$filterdef = bless ([
);
$filterdef = bless ([
- # tag, sort, field, priv, special parser
+ # tag, sort, field, priv, special parser
['channel', 'c', 0],
['channel_dxcc', 'nc', 1],
['channel_itu', 'ni', 2],
['channel', 'c', 0],
['channel_dxcc', 'nc', 1],
['channel_itu', 'ni', 2],
@@
-72,8
+67,8
@@
sub new
Prefix::cty_data($call);
$self->{flags} = here(1);
Prefix::cty_data($call);
$self->{flags} = here(1);
-
- return $self;
+
+ return $self;
}
#
}
#
@@
-90,7
+85,7
@@
sub _getcall
return $thingy;
}
return $thingy;
}
-#
+#
# add and delete a callsign to/from a list
#
# add and delete a callsign to/from a list
#
@@
-101,7
+96,7
@@
sub _addlist
my @out;
foreach my $c (@_) {
confess "Need a ref here" unless ref($c);
my @out;
foreach my $c (@_) {
confess "Need a ref here" unless ref($c);
-
+
my $call = $c->{call};
unless (grep $_ eq $call, @{$self->{$field}}) {
push @{$self->{$field}}, $call;
my $call = $c->{call};
unless (grep $_ eq $call, @{$self->{$field}}) {
push @{$self->{$field}}, $call;
@@
-171,7
+166,7
@@
sub parents
return @{$self->{parent}};
}
return @{$self->{parent}};
}
-#
+#
# display routines
#
# display routines
#
@@
-199,11
+194,15
@@
sub config
}
if ($printit) {
}
if ($printit) {
- $line = ' ' x ($level*2) . "$call";
- $call = ' ' x length $call;
-
+ my $pcall = $call;
+ $pcall .= ":" . $self->obscount if $self->via_pc92;
+
+
+ $line = ' ' x ($level*2) . "$pcall";
+ $call = ' ' x length $pcall;
+
# recursion detector
# recursion detector
- if ((DXChannel
->
get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+ if ((DXChannel
::
get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
$line .= ' ...';
push @out, $line;
return @out;
$line .= ' ...';
push @out, $line;
return @out;
@@
-236,7
+235,7
@@
sub config
$line =~ s/\s+$//;
push @out, $line if length $line;
}
$line =~ s/\s+$//;
push @out, $line if length $line;
}
-
+
# deal with more nodes
foreach my $ncall (sort @{$self->{nodes}}) {
my $nref = Route::Node::get($ncall);
# deal with more nodes
foreach my $ncall (sort @{$self->{nodes}}) {
my $nref = Route::Node::get($ncall);
@@
-246,7
+245,7
@@
sub config
# dbg("recursing from $call -> $c") if isdbg('routec');
push @out, $nref->config($nodes_only, $level+1, $seen, @_);
} else {
# dbg("recursing from $call -> $c") if isdbg('routec');
push @out, $nref->config($nodes_only, $level+1, $seen, @_);
} else {
- push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_);
+ push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_);
}
}
}
}
@@
-260,7
+259,7
@@
sub cluster
my $users = scalar DXCommandmode::get_all();
my $maxusers = Route::User::max();
my $uptime = main::uptime();
my $users = scalar DXCommandmode::get_all();
my $maxusers = Route::User::max();
my $uptime = main::uptime();
-
+
return " $nodes nodes, $users local / $tot total users Max users $maxusers Uptime $uptime";
}
return " $nodes nodes, $users local / $tot total users Max users $maxusers Uptime $uptime";
}
@@
-281,16
+280,16
@@
sub alldxchan
my @dxchan;
# dbg("Trying node $self->{call}") if isdbg('routech');
my @dxchan;
# dbg("Trying node $self->{call}") if isdbg('routech');
- my $dxchan = DXChannel
->
get($self->{call});
+ my $dxchan = DXChannel
::
get($self->{call});
push @dxchan, $dxchan if $dxchan;
push @dxchan, $dxchan if $dxchan;
-
- # it isn't, build up a list of dxchannels and possible ping times
+
+ # it isn't, build up a list of dxchannels and possible ping times
# for all the candidates.
unless (@dxchan) {
foreach my $p (@{$self->{parent}}) {
# dbg("Trying parent $p") if isdbg('routech');
next if $p eq $main::mycall; # the root
# for all the candidates.
unless (@dxchan) {
foreach my $p (@{$self->{parent}}) {
# dbg("Trying parent $p") if isdbg('routech');
next if $p eq $main::mycall; # the root
- my $dxchan = DXChannel
->
get($p);
+ my $dxchan = DXChannel
::
get($p);
if ($dxchan) {
push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
} else {
if ($dxchan) {
push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
} else {
@@
-308,14
+307,14
@@
sub alldxchan
sub dxchan
{
my $self = shift;
sub dxchan
{
my $self = shift;
-
+
# ALWAYS return the locally connected channel if present;
# ALWAYS return the locally connected channel if present;
- my $dxchan = DXChannel
->
get($self->call);
+ my $dxchan = DXChannel
::
get($self->call);
return $dxchan if $dxchan;
return $dxchan if $dxchan;
-
+
my @dxchan = $self->alldxchan;
return undef unless @dxchan;
my @dxchan = $self->alldxchan;
return undef unless @dxchan;
-
+
# determine the minimum ping channel
my $minping = 99999999;
foreach my $dxc (@dxchan) {
# determine the minimum ping channel
my $minping = 99999999;
foreach my $dxc (@dxchan) {
@@
-339,14
+338,14
@@
sub DESTROY
{
my $self = shift;
my $pkg = ref $self;
{
my $self = shift;
my $pkg = ref $self;
-
+
dbg("$pkg $self->{call} destroyed") if isdbg('routelow');
}
no strict;
#
dbg("$pkg $self->{call} destroyed") if isdbg('routelow');
}
no strict;
#
-# return a list of valid elements
-#
+# return a list of valid elements
+#
sub fields
{
sub fields
{
@@
-363,7
+362,7
@@
sub fields
#
sub field_prompt
#
sub field_prompt
-{
+{
my ($self, $ele) = @_;
my $pkg = ref $self;
my $val = "${pkg}::valid";
my ($self, $ele) = @_;
my $pkg = ref $self;
my $val = "${pkg}::valid";
@@
-379,7
+378,7
@@
sub AUTOLOAD
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
$name =~ s/^.*:://o;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
$name =~ s/^.*:://o;
-
+
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
# this clever line of code creates a subroutine which takes over from autoload