use Geomag;
use WCY;
use Time::HiRes qw(gettimeofday tv_interval);
+use BadWords;
+use DXHash;
use strict;
use vars qw($me $pc11_max_age $pc23_max_age
$last_hour %pings %rcmds
- %nodehops @baddx $baddxfn
+ %nodehops $baddx $badspotter $badnode $censorpc
$allowzero $decode_dk0wcy $send_opernam @checklist);
$me = undef; # the channel id for this cluster
%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
%nodehops = (); # node specific hop control
-@baddx = (); # list of illegal spotted callsigns
-
-
-$baddxfn = "$main::data/baddx.pl";
+$censorpc = 1; # Do a BadWords::check on text fields and reject things
+ # loads of 'bad things'
+$baddx = new DXHash "baddx";
+$badspotter = new DXHash "badspotter";
+$badnode = new DXHash "badnode";
@checklist =
(
[ qw(c c n n) ], # pc25
[ qw(f m d t m c c bc) ], # pc26
[ qw(d n n n n m c c bc) ], # pc27
- [ qw(c c c c d t p m bp n p bp bc) ], # pc28
+ [ qw(c c m c d t p m bp n p bp bc) ], # pc28
[ qw(c c n m) ], # pc29
[ qw(c c n) ], # pc30
[ qw(c c n) ], # pc31
do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
confess $@ if $@;
$me->{sort} = 'S'; # S for spider
-
- # now prime the spot and wwv duplicates file with data
-# my @today = Julian::unixtoj(time);
-# for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) {
-# Spot::dup(@{$_}[0..3]);
-# }
-# for (Geomag::readfile(time)) {
-# Geomag::dup(@{$_}[1..5]);
-# }
-
- # load the baddx file
- do "$baddxfn" if -e "$baddxfn";
- print "$@\n" if $@;
}
#
$self->{consort} = $line; # save the connection type
$self->{here} = 1;
+ # get the output filters
+ $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
+ $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
+ $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
+ $self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
+
+
# get the INPUT filters (these only pertain to Clusters)
- $self->{inspotfilter} = Filter::read_in('spots', $call, 1);
- $self->{inwwvfilter} = Filter::read_in('wwv', $call, 1);
- $self->{inwcyfilter} = Filter::read_in('wcy', $call, 1);
- $self->{inannfilter} = Filter::read_in('ann', $call, 1);
+ $self->{inspotsfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
+ $self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
+ $self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
+ $self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
# set unbuffered and no echo
$self->send_now('B',"0");
# send initialisation string
unless ($self->{outbound}) {
-# $self->send(pc38()) if DXNode->get_all();
$self->send(pc18());
$self->{lastping} = $main::systime;
} else {
- # remove from outstanding connects queue
- @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
- $self->{lastping} = $main::systime + $self->pingint / 2;
+ $self->{lastping} = $main::systime + ($self->pingint / 2);
}
$self->state('init');
$self->pc50_t(time);
# check for and dump bad protocol messages
my $n = check($pcno, @field);
if ($n) {
- dbg('chan', "bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
+ dbg('chan', "PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
return;
}
SWITCH: {
if ($pcno == 10) { # incoming talk
-
+
+ # will we allow it at all?
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($field[3])) {
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ return;
+ }
+ }
+
# is it for me or one of mine?
my ($to, $via, $call, $dxchan);
if ($field[5] gt ' ') {
$call = $via = $field[2];
$to = $field[5];
- unless (is_callsign($to)) {
- dbg('chan', "Corrupt talk, rejected");
- return;
- }
} else {
$call = $to = $field[2];
}
- if ($dxchan = DXChannel->get($call)) {
+ $dxchan = DXChannel->get($call);
+ if ($dxchan && $dxchan->is_user) {
+ $field[3] =~ s/\%5E/^/g;
$dxchan->talk($field[1], $to, $via, $field[3]);
} else {
$self->route($field[2], $line); # relay it on its way
}
# if this is a 'nodx' node then ignore it
- if (grep $field[7] =~ /^$_/, @DXProt::nodx_node) {
- dbg('chan', "Bad DXNode, dropped");
+ if ($badnode->in($field[7])) {
+ dbg('chan', "PCPROT: Bad Node, dropped");
+ return;
+ }
+
+ # if this is a 'bad spotter' user then ignore it
+ if ($badspotter->in($field[6])) {
+ dbg('chan', "PCPROT: Bad Spotter, dropped");
return;
}
my $d = cltounix($field[3], $field[4]);
# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
- dbg('chan', "Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+ dbg('chan', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
return;
}
# is it 'baddx'
- if (grep $field[2] eq $_, @baddx) {
- dbg('chan', "Bad DX spot, ignored");
+ if ($baddx->in($field[2])) {
+ dbg('chan', "PCPROT: Bad DX spot, ignored");
return;
}
# do some de-duping
$field[5] =~ s/^\s+//; # take any leading blanks off
+ $field[2] = unpad($field[2]); # take off leading and trailing blanks from spotted callsign
+ if ($field[2] =~ /BUST\w*$/) {
+ dbg('chan', "PCPROT: useless 'BUSTED' spot");
+ return;
+ }
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
- dbg('chan', "Duplicate Spot ignored\n");
+ dbg('chan', "PCPROT: Duplicate Spot ignored\n");
return;
}
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($field[5])) {
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ return;
+ }
+ }
my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
# announce duplicate checking
$field[3] =~ s/^\s+//; # remove leading blanks
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
- dbg('chan', "Duplicate Announce ignored");
+ dbg('chan', "PCPROT: Duplicate Announce ignored");
return;
}
+
+ if ($censorpc) {
+ my @bad;
+ if (@bad = BadWords::check($field[3])) {
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ return;
+ }
+ }
if ($field[2] eq '*' || $field[2] eq $main::mycall) {
# global ann filtering on INPUT
if ($self->{inannfilter}) {
- my ($filter, $hops) = Filter::it($self->{inannfilter}, @field[1..6], $self->{call} );
+ my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+ my @dxcc = Prefix::extract($field[1]);
+ if (@dxcc > 0) {
+ $ann_dxcc = $dxcc[1]->dxcc;
+ $ann_itu = $dxcc[1]->itu;
+ $ann_cq = $dxcc[1]->cq();
+ }
+ @dxcc = Prefix::extract($field[5]);
+ if (@dxcc > 0) {
+ $org_dxcc = $dxcc[1]->dxcc;
+ $org_itu = $dxcc[1]->itu;
+ $org_cq = $dxcc[1]->cq();
+ }
+ my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call},
+ $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
unless ($filter) {
- dbg('chan', "Rejected by filter");
+ dbg('chan', "PCPROT: Rejected by filter");
return;
}
}
# add it to the node table if it isn't present and it's
# connected locally
$node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
- broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+ dbg('chan', "PCPROT: $field[1] no PC19 yet, autovivified as node");
+# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
}
- return unless $node; # ignore if havn't seen a PC19 for this one yet
- return unless $node->isa('DXNode');
+ if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) {
+ dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+ return;
+ }
+ if ($field[2] eq $main::myalias && DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: trying to connect sysop from outside!");
+ return;
+ }
+ unless ($node) {
+ dbg('chan', "PCPROT: Node $field[1] not in config");
+ return;
+ }
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $field[1] is not a node");
+ return;
+ }
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $field[1] came in on wrong channel");
+ dbg('chan', "PCPROT: $field[1] came in on wrong channel");
return;
}
if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
- dbg('chan', "LOOP: $field[1] connected locally");
+ dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
my $i;
for ($i = 2; $i < $#field; $i++) {
my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
- next if !$call || length $call < 3 || length $call > 8;
- next if !$confmode;
- $call = uc $call;
- next if DXCluster->get_exact($call); # we already have this (loop?)
+ next unless $call && $confmode && defined $here && is_callsign($call);
+ my $ref = DXCluster->get_exact($call);
+ if ($ref) {
+ if ($ref->isa('DXNode')) {
+ dbg('chan', "PCPROT: $call is a node");
+ next;
+ }
+ my $rcall = $ref->mynode->call;
+ dbg('chan', "PCPROT: already have $call on $rcall");
+ next;
+ }
$confmode = $confmode eq '*';
DXNodeuser->new($self, $node, $call, $confmode, $here);
# add it to the node table if it isn't present and it's
# connected locally
$node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
- broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+ dbg('chan', "PCPROT: $field[2] no PC19 yet, autovivified as node");
+# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+ }
+ if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) {
+ dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+ return;
+ }
+ if ($field[1] eq $main::myalias && DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: trying to disconnect sysop from outside!");
+ return;
+ }
+ unless ($node) {
+ dbg('chan', "PCPROT: Node $field[2] not in config");
+ return;
+ }
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $field[2] is not a node");
return;
}
- return unless $node;
- return unless $node->isa('DXNode');
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $field[2] came in on wrong channel");
+ dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
- if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
- dbg('chan', "LOOP: $field[2] connected locally");
+ if ($dxchan = DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
my $ref = DXCluster->get_exact($field[1]);
- $ref->del() if $ref;
+ if ($ref) {
+ if ($ref->mynode != $node) {
+ dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]");
+ return;
+ }
+ $ref->del;
+ } else {
+ dbg('chan', "PCPROT: $field[1] not known" );
+ return;
+ }
last SWITCH;
}
my $call = uc $field[$i+1];
my $confmode = $field[$i+2];
my $ver = $field[$i+3];
+ next unless defined $here && defined $confmode && is_callsign($call);
$ver = 5400 if !$ver && $allowzero;
if ($node) {
my $dxchan;
if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
- dbg('chan', "LOOP: $call connected locally");
+ dbg('chan', "PCPROT: $call connected locally");
}
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $call come in on wrong channel");
+ dbg('chan', "PCPROT: $call come in on wrong channel");
next;
}
- dbg('chan', "already have $call");
+ my $rcall = $node->mynode->call;
+ dbg('chan', "PCPROT: already have $call on $rcall");
next;
}
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
my $node = DXCluster->get_exact($call);
if ($node) {
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $call is not a node");
+ return;
+ }
if ($call eq $self->{call}) {
- dbg('chan', "LOOP: Trying to disconnect myself with PC21");
+ dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
return;
}
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $call come in on wrong channel");
+ dbg('chan', "PCPROT: $call come in on wrong channel");
return;
}
my $dxchan;
if ($dxchan = DXChannel->get($call)) {
- dbg('chan', "LOOP: $call connected locally");
+ dbg('chan', "PCPROT: $call connected locally");
return;
}
$node->del();
} else {
- dbg('chan', "$call not in table, dropped");
+ dbg('chan', "PCPROT: $call not in table, dropped");
return;
}
+ } else {
+ dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
+ return;
}
last SWITCH;
}
my ($r) = $field[6] =~ /R=(\d+)/;
$r = 0 unless $r;
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
- dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
+ dbg('chan', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
return;
}
if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
- dbg('chan', "Dup WWV Spot ignored\n");
+ dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
return;
}
$field[7] =~ s/-\d+$//o; # remove spotter's ssid
return;
}
if ($field[2] eq $main::mycall) {
- dbg('chan', "Trying to merge to myself, ignored");
+ dbg('chan', "PCPROT: Trying to merge to myself, ignored");
return;
}
} else {
my $ref = DXUser->get_current($field[1]);
if ($ref && $ref->is_clx) {
- route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
+ $self->route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
} else {
$self->route($field[1], $line);
}
} else {
my $ref = DXUser->get_current($field[1]);
if ($ref && $ref->is_clx) {
- route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
+ $self->route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
} else {
$self->route($field[1], $line);
}
}
if ($pcno == 39) { # incoming disconnect
- $self->disconnect(1);
+ if ($field[1] eq $self->{call}) {
+ $self->disconnect(1);
+ } else {
+ dbg('chan', "PCPROT: came in on wrong channel");
+ }
return;
}
if ($pcno == 41) { # user info
# add this station to the user database, if required
my $user = DXUser->get_current($field[1]);
- if (!$user) {
- # then try without an SSID
- $field[1] =~ s/-\d+$//o;
- $user = DXUser->get_current($field[1]);
- }
$user = DXUser->new($field[1]) if !$user;
if ($field[2] == 1) {
$dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
} elsif ($dxchan->is_node) {
if ($tochan) {
- $tochan->{nopings} = 2; # pump up the timer
+ $tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
push @{$tochan->{pingtime}}, $t;
shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
my $st;
# do some de-duping
my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
- dbg('chan', "WCY Date ($field[1] $field[2]) out of range");
+ dbg('chan', "PCPROT: WCY Date ($field[1] $field[2]) out of range");
return;
}
@field = map { unpad($_) } @field;
if (WCY::dup($d,@field[3..7])) {
- dbg('chan', "Dup WCY Spot ignored\n");
+ dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
return;
}
if ($ref && $ref->is_clx) {
$self->route($field[1], $line);
} else {
- route($field[1], pc34($field[2], $field[1], $field[4]));
+ $self->route($field[1], pc34($field[2], $field[1], $field[4]));
}
}
return;
if ($ref && $ref->is_clx) {
$self->route($field[1], $line);
} else {
- route($field[1], pc35($field[2], $field[1], $field[4]));
+ $self->route($field[1], pc35($field[2], $field[1], $field[4]));
}
}
return;
{
my $self = shift;
my $call = $self->call;
- my $conn = shift;
my $ref = DXCluster->get_exact($call);
# unbusy and stop and outgoing mail
my $routeit;
my ($filter, $hops);
- if ($dxchan->{spotfilter}) {
- ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+ if ($dxchan->{spotsfilter}) {
+ ($filter, $hops) = $dxchan->{spotsfilter}->it(@_, $self->{call} );
next unless $filter;
}
} elsif ($dxchan->is_user && $dxchan->{dx}) {
my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
$buf .= "\a\a" if $dxchan->{beep};
+ $buf =~ s/\%5E/^/g;
if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
my $line = shift;
my @dxchan = DXChannel->get_all();
my $dxchan;
+ my ($wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+ my @dxcc = Prefix::extract($_[7]);
+ if (@dxcc > 0) {
+ $wwv_dxcc = $dxcc[1]->dxcc;
+ $wwv_itu = $dxcc[1]->itu;
+ $wwv_cq = $dxcc[1]->cq;
+ }
+ @dxcc = Prefix::extract($_[8]);
+ if (@dxcc > 0) {
+ $org_dxcc = $dxcc[1]->dxcc;
+ $org_itu = $dxcc[1]->itu;
+ $org_cq = $dxcc[1]->cq;
+ }
# send it if it isn't the except list and isn't isolated and still has a hop count
# taking into account filtering and so on
my ($filter, $hops);
if ($dxchan->{wwvfilter}) {
- ($filter, $hops) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} );
+ ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
next unless $filter;
}
if ($dxchan->is_node) {
my $line = shift;
my @dxchan = DXChannel->get_all();
my $dxchan;
+ my ($wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+ my @dxcc = Prefix::extract($_[11]);
+ if (@dxcc > 0) {
+ $wcy_dxcc = $dxcc[1]->dxcc;
+ $wcy_itu = $dxcc[1]->itu;
+ $wcy_cq = $dxcc[1]->cq;
+ }
+ @dxcc = Prefix::extract($_[12]);
+ if (@dxcc > 0) {
+ $org_dxcc = $dxcc[1]->dxcc;
+ $org_itu = $dxcc[1]->itu;
+ $org_cq = $dxcc[1]->cq;
+ }
# send it if it isn't the except list and isn't isolated and still has a hop count
# taking into account filtering and so on
my ($filter, $hops);
if ($dxchan->{wcyfilter}) {
- ($filter, $hops) = Filter::it($dxchan->{wcyfilter}, @_, $self->{call} );
+ ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
next unless $filter;
}
- if ($dxchan->is_clx || $dxchan->is_spider) {
+ if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
next if $dxchan == $self;
if ($hops) {
$routeit = $line;
$target = "WX";
$to = '';
}
- $target = "All" if !$target;
+ $target = "ALL" if !$target;
Log('ann', $target, $_[0], $text);
+ # obtain country codes etc
+ my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+ my @dxcc = Prefix::extract($_[0]);
+ if (@dxcc > 0) {
+ $ann_dxcc = $dxcc[1]->dxcc;
+ $ann_itu = $dxcc[1]->itu;
+ $ann_cq = $dxcc[1]->cq;
+ }
+ @dxcc = Prefix::extract($_[4]);
+ if (@dxcc > 0) {
+ $org_dxcc = $dxcc[1]->dxcc;
+ $org_itu = $dxcc[1]->itu;
+ $org_cq = $dxcc[1]->cq;
+ }
+
# send it if it isn't the except list and isn't isolated and still has a hop count
# taking into account filtering and so on
foreach $dxchan (@dxchan) {
my ($filter, $hops);
if ($dxchan->{annfilter}) {
- ($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
+ ($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
next unless $filter;
}
if ($dxchan->is_node && $_[1] ne $main::mycall) { # i.e not specifically routed to me
}
next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
my $buf = "$to$target de $_[0]: $text";
+ $buf =~ s/\%5E/^/g;
$buf .= "\a\a" if $dxchan->{beep};
if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
sub route
{
my ($self, $call, $line) = @_;
- my $cl = DXCluster->get_exact($call);
- if ($cl) { # don't route it back down itself
- if (ref $self && $call eq $self->{call}) {
- dbg('chan', "Trying to route back to source, dropped");
- return;
- }
- my $hops;
- my $dxchan = $cl->{dxchan};
- if ($dxchan) {
- my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
- if ($routeit) {
- $dxchan->send($routeit) if $dxchan;
+
+ if (ref $self && $call eq $self->{call}) {
+ dbg('chan', "PCPROT: Trying to route back to source, dropped");
+ return;
+ }
+
+ # always send it down the local interface if available
+ my $dxchan = DXChannel->get($call);
+ unless ($dxchan) {
+ my $cl = DXCluster->get_exact($call);
+ $dxchan = $cl->dxchan if $cl;
+ if (ref $dxchan) {
+ if (ref $self && $dxchan eq $self) {
+ dbg('chan', "PCPROT: Trying to route back to source, dropped");
+ return;
}
}
}
+ if ($dxchan) {
+ my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
+ if ($routeit) {
+ $dxchan->send($routeit);
+ }
+ } else {
+ dbg('chan', "PCPROT: No route available, dropped");
+ }
}
# broadcast a message to all clusters taking into account isolation
if ($sort eq 'dx') {
next unless $dxchan->{dx};
- ($filter) = Filter::it($dxchan->{spotfilter}, @{$fref}) if ref $fref;
+ ($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
next unless $filter;
}
next if $sort eq 'ann' && !$dxchan->{ann};
projects / spider.git / blobdiff