projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional changes to spider-web. Also add the ding.au file to stop
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 7276c6979fc7f08510cb1d2df8328dae7a470996..16ee88cb52b76b92af3f45f035cf26616a560751 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-40,13
+40,13
@@
use vars qw(%list %valid $filterdef);
$filterdef = bless ([
# tag, sort, field, priv, special parser
['channel', 'c', 0],
$filterdef = bless ([
# tag, sort, field, priv, special parser
['channel', 'c', 0],
- ['channel_dxcc', 'n', 1],
- ['channel_itu', 'n', 2],
- ['channel_zone', 'n', 3],
+ ['channel_dxcc', 'n
c
', 1],
+ ['channel_itu', 'n
i
', 2],
+ ['channel_zone', 'n
z
', 3],
['call', 'c', 4],
['call', 'c', 4],
- ['call_dxcc', 'n', 5],
- ['call_itu', 'n', 6],
- ['call_zone', 'n', 7],
+ ['call_dxcc', 'n
c
', 5],
+ ['call_itu', 'n
i
', 6],
+ ['call_zone', 'n
z
', 7],
], 'Filter::Cmd');
], 'Filter::Cmd');
@@
-274,6
+274,7
@@
sub alldxchan
my $self = shift;
my @dxchan;
# dbg("Trying node $self->{call}") if isdbg('routech');
my $self = shift;
my @dxchan;
# dbg("Trying node $self->{call}") if isdbg('routech');
+
my $dxchan = DXChannel->get($self->{call});
push @dxchan, $dxchan if $dxchan;
my $dxchan = DXChannel->get($self->{call});
push @dxchan, $dxchan if $dxchan;
@@
-301,12
+302,16
@@
sub alldxchan
sub dxchan
{
my $self = shift;
sub dxchan
{
my $self = shift;
+
+ # ALWAYS return the locally connected channel if present;
+ my $dxchan = DXChannel->get($self->call);
+ return $dxchan if $dxchan;
+
my @dxchan = $self->alldxchan;
return undef unless @dxchan;
# determine the minimum ping channel
my $minping = 99999999;
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) {
foreach my $dxc (@dxchan) {
my $p = $dxc->pingave;
if (defined $p && $p < $minping) {
@@
-318,6
+323,8
@@
sub dxchan
return $dxchan;
}
return $dxchan;
}
+
+
#
# track destruction
#
#
# track destruction
#