X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=6a4f96f60c6f9101e7dd6cae66f0b8d42b7ce1ee;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=a9c521708bc1ddb4fbfdac36d3980a8e1aa84730;hpb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index a9c52170..6a4f96f6 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -15,23 +15,59 @@ package Route; use DXDebug; +use DXChannel; +use Prefix; use strict; -use vars qw(%list %valid); + +use vars qw($VERSION $BRANCH); +$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$main::build += $VERSION; +$main::branch += $BRANCH; + +use vars qw(%list %valid $filterdef); %valid = ( call => "0,Callsign", flags => "0,Flags,phex", + dxcc => '0,Country Code', + itu => '0,ITU Zone', + cq => '0,CQ Zone', ); +$filterdef = bless ([ + # tag, sort, field, priv, special parser + ['channel', 'c', 0], + ['channel_dxcc', 'n', 1], + ['channel_itu', 'n', 2], + ['channel_zone', 'n', 3], + ['call', 'c', 4], + ['call_dxcc', 'n', 5], + ['call_itu', 'n', 6], + ['call_zone', 'n', 7], + ], 'Filter::Cmd'); + + sub new { my ($pkg, $call) = @_; + $pkg = ref $pkg if ref $pkg; + + my $self = bless {call => $call}, $pkg; + dbg("create $pkg with $call") if isdbg('routelow'); - dbg('routelow', "create " . (ref($pkg) || $pkg) ." with $call"); + # add in all the dxcc, itu, zone info + my @dxcc = Prefix::extract($call); + if (@dxcc > 0) { + $self->{dxcc} = $dxcc[1]->dxcc; + $self->{itu} = $dxcc[1]->itu; + $self->{cq} = $dxcc[1]->cq; + } + $self->{flags} = here(1); - return bless {call => $call}, (ref $pkg || $pkg); + return $self; } # @@ -60,7 +96,7 @@ sub _addlist my $call = _getcall($c); unless (grep {$_ eq $call} @{$self->{$field}}) { push @{$self->{$field}}, $call; - dbg('routelow', ref($self) . " adding $call to " . $self->{call} . "->\{$field\}"); + dbg(ref($self) . " adding $call to " . $self->{call} . "->\{$field\}") if isdbg('routelow'); } } return $self->{$field}; @@ -74,7 +110,7 @@ sub _dellist my $call = _getcall($c); if (grep {$_ eq $call} @{$self->{$field}}) { $self->{$field} = [ grep {$_ ne $call} @{$self->{$field}} ]; - dbg('routelow', ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}"); + dbg(ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}") if isdbg('routelow'); } } return $self->{$field}; @@ -83,15 +119,21 @@ sub _dellist # # flag field constructors/enquirers # +# These can be called in various ways:- +# +# Route::here or $ref->here returns 1 or 0 depending on value of the here flag +# Route::here(1) returns 2 (the bit value of the here flag) +# $ref->here(1) or $ref->here(0) sets the here flag +# sub here { my $self = shift; my $r = shift; return $self ? 2 : 0 unless ref $self; - return $self->{flags} & 2 unless $r; + return ($self->{flags} & 2) ? 1 : 0 unless defined $r; $self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0)); - return $r; + return $r ? 1 : 0; } sub conf @@ -99,9 +141,15 @@ sub conf my $self = shift; my $r = shift; return $self ? 1 : 0 unless ref $self; - return $self->{flags} & 1 unless $r; + return ($self->{flags} & 1) ? 1 : 0 unless defined $r; $self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0)); - return $r; + return $r ? 1 : 0; +} + +sub parents +{ + my $self = shift; + return @{$self->{parent}}; } # @@ -120,52 +168,143 @@ sub config my $self = shift; my $nodes_only = shift; my $level = shift; + my $seen = shift; my @out; my $line; my $call = $self->user_call; + my $printit = 1; - $line = ' ' x ($level*2) . "$call"; - $call = ' ' x length $call; - unless ($nodes_only) { - if (@{$self->{users}}) { - $line .= '->'; - foreach my $ucall (sort @{$self->{users}}) { - my $uref = Route::User::get($ucall); - my $c; - if ($uref) { - $c = $uref->user_call; - } else { - $c = "$ucall?"; - } - if ((length $line) + (length $c) + 1 < 79) { - $line .= $c . ' '; - } else { - $line =~ s/\s+$//; - push @out, $line; - $line = ' ' x ($level*2) . "$call->"; + # allow ranges + if (@_) { + $printit = grep $call =~ m|$_|, @_; + } + + if ($printit) { + $line = ' ' x ($level*2) . "$call"; + $call = ' ' x length $call; + + # recursion detector + if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) { + $line .= ' ...'; + push @out, $line; + return @out; + } + push @$seen, $self->{call}; + + # print users + unless ($nodes_only) { + if (@{$self->{users}}) { + $line .= '->'; + foreach my $ucall (sort @{$self->{users}}) { + my $uref = Route::User::get($ucall); + my $c; + if ($uref) { + $c = $uref->user_call; + } else { + $c = "$ucall?"; + } + if ((length $line) + (length $c) + 1 < 79) { + $line .= $c . ' '; + } else { + $line =~ s/\s+$//; + push @out, $line; + $line = ' ' x ($level*2) . "$call->$c "; + } } } } + $line =~ s/->$//g; + $line =~ s/\s+$//; + push @out, $line if length $line; } - $line =~ s/->$//g; - $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); - next if @_ && !grep $ncall =~ m|$_|, @_; - + if ($nref) { my $c = $nref->user_call; - push @out, $nref->config($nodes_only, $level+1, @_); +# 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?"; + push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); } } return @out; } +sub cluster +{ + my $nodes = Route::Node::count(); + my $tot = Route::User::count(); + 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"; +} + +# +# routing things +# + +sub get +{ + my $call = shift; + return Route::Node::get($call) || Route::User::get($call); +} + +# find all the possible dxchannels which this object might be on +sub alldxchan +{ + my $self = shift; + my @dxchan; +# dbg("Trying node $self->{call}") if isdbg('routech'); + my $dxchan = DXChannel->get($self->{call}); + push @dxchan, $dxchan if $dxchan; + + # 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 + my $dxchan = DXChannel->get($p); + if ($dxchan) { + push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan; + } else { + next if grep $p eq $_, @_; + my $ref = Route::Node::get($p); +# dbg("Next node $p " . ($ref ? 'Found' : 'NOT Found') if isdbg('routech') ); + push @dxchan, $ref->alldxchan($self->{call}, @_) if $ref; + } + } + } +# dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) ); + return @dxchan; +} + +sub dxchan +{ + my $self = shift; + my @dxchan = $self->alldxchan; + return undef unless @dxchan; + + # determine the minimum ping channel + my $minping = 99999999; + my $dxchan; + foreach my $dxc (@dxchan) { + my $p = $dxc->pingave; + if (defined $p && $p < $minping) { + $minping = $p; + $dxchan = $dxc; + } + } + $dxchan = shift @dxchan unless $dxchan; + return $dxchan; +} + # # track destruction # @@ -175,7 +314,7 @@ sub DESTROY my $self = shift; my $pkg = ref $self; - dbg('routelow', "$pkg $self->{call} destroyed"); + dbg("$pkg $self->{call} destroyed") if isdbg('routelow'); } no strict; @@ -187,7 +326,8 @@ sub fields { my $pkg = shift; $pkg = ref $pkg if ref $pkg; - my @out, keys %$pkg::valid; + my $val = "${pkg}::valid"; + my @out = keys %$val; push @out, keys %valid; return @out; } @@ -200,7 +340,8 @@ sub field_prompt { my ($self, $ele) = @_; my $pkg = ref $self; - return $pkg::valid{$ele} || $valid{$ele}; + my $val = "${pkg}::valid"; + return $val->{$ele} || $valid{$ele}; } #