use WCY;
use Time::HiRes qw(gettimeofday tv_interval);
use BadWords;
+use DXHash;
+use Route;
+use Route::Node;
use strict;
use vars qw($me $pc11_max_age $pc23_max_age
$last_hour %pings %rcmds
- %nodehops @baddx $baddxfn $censorpc
+ %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
-$censorpc = 0; # Do a BadWords::check on text fields and reject things
-
-$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 =
(
do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
confess $@ if $@;
$me->{sort} = 'S'; # S for spider
-
- # load the baddx file
- do "$baddxfn" if -e "$baddxfn";
- print "$@\n" if $@;
+ $me->{priv} = 9;
+# $Route::Node::me->adddxchan($me);
}
#
# 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);
+ $self->{pc50_t} = $main::systime;
# send info to all logged in thingies
$self->tell_login('loginn');
+ $main::routeroot->add($call);
Log('DXProt', "$call connected");
}
# 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;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[3])) {
- dbg('chan', "Bad words: @bad, dropped" );
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
return;
}
}
}
# 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', "Bad words: @bad, dropped" );
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+ return;
+ }
+ }
+
+ my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
+ # global spot filtering on INPUT
+ if ($self->{inspotsfilter}) {
+ my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
+ unless ($filter) {
+ dbg('chan', "PCPROT: Rejected by filter");
return;
}
}
- my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
+ # add it
+ Spot::add(@spot);
#
# @spot at this point contains:-
# 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', "Bad words: @bad, dropped" );
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
return;
}
}
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;
}
}
}
if ($pcno == 16) { # add a user
- my $node = DXCluster->get_exact($field[1]);
+
+ # general checks
my $dxchan;
- if (!$node && ($dxchan = DXChannel->get($field[1]))) {
- # 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);
- dbg('chan', "$field[1] 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', "LOOP: trying to alter config on this node from outside!");
+ 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', "LOOP: trying to connect sysop from outside!");
+ dbg('chan', "PCPROT: trying to connect sysop from outside!");
return;
}
- unless ($node) {
- dbg('chan', "Node $field[1] not in config");
+ if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
+ dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
- unless ($node->isa('DXNode')) {
- dbg('chan', "$field[1] is not a node");
+
+ my $node = DXCluster->get_exact($field[1]);
+ unless ($node) {
+ dbg('chan', "PCPROT: Node $field[1] not in config");
return;
}
- if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $field[1] came in on wrong channel");
+ my $pref = Route::Node::get($field[1]);
+ unless ($pref) {
+ dbg('chan', "PCPROT: Route::Node $field[1] not in config");
return;
}
- if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
- dbg('chan', "LOOP: $field[1] connected locally");
- return;
+ my $wrong;
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $field[1] is not a node");
+ $wrong = 1;
+ }
+ if ($node->dxchan != $self) {
+ dbg('chan', "PCPROT: $field[1] came in on wrong channel");
+ $wrong = 1;
}
my $i;
-
+ my @rout;
for ($i = 2; $i < $#field; $i++) {
my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
next unless $call && $confmode && defined $here && is_callsign($call);
- my $ref = DXCluster->get_exact($call);
- if ($ref) {
- if ($ref->isa('DXNode')) {
- dbg('chan', "LOOP: $call is a node");
+ $confmode = $confmode eq '*';
+
+ push @rout, $pref->add_user($call, Route::here($here)|Route::conf($confmode));
+
+ unless ($wrong) {
+ 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;
}
- my $rcall = $ref->mynode->call;
- dbg('chan', "LOOP: already have $call on $rcall");
- next;
+
+ DXNodeuser->new($self, $node, $call, $confmode, $here);
+
+ # add this station to the user database, if required
+ $call =~ s/-\d+$//o; # remove ssid for users
+ my $user = DXUser->get_current($call);
+ $user = DXUser->new($call) if !$user;
+ $user->homenode($node->call) if !$user->homenode;
+ $user->node($node->call);
+ $user->lastin($main::systime) unless DXChannel->get($call);
+ $user->put;
}
-
- $confmode = $confmode eq '*';
- DXNodeuser->new($self, $node, $call, $confmode, $here);
-
- # add this station to the user database, if required
- $call =~ s/-\d+$//o; # remove ssid for users
- my $user = DXUser->get_current($call);
- $user = DXUser->new($call) if !$user;
- $user->homenode($node->call) if !$user->homenode;
- $user->node($node->call);
- $user->lastin($main::systime) unless DXChannel->get($call);
- $user->put;
}
+
+ dbg('route', "B/C PC16 on $field[1] for: " . join(',', map{$_->call} @rout)) if @rout;
+
+ # all these 'wrong' is just while we are swopping over to the Route stuff
+ return if $wrong;
# queue up any messages (look for privates only)
DXMsg::queue_msg(1) if $self->state eq 'normal';
+# broadcast_route($line, $self, $field[1]);
+# return;
last SWITCH;
}
if ($pcno == 17) { # remove a user
- my $node = DXCluster->get_exact($field[2]);
my $dxchan;
- if (!$node && ($dxchan = DXChannel->get($field[2]))) {
- # 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);
- dbg('chan', "$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', "LOOP: trying to alter config on this node from outside!");
+ 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', "LOOP: trying to disconnect sysop from outside!");
+ dbg('chan', "PCPROT: trying to disconnect sysop from outside!");
+ return;
+ }
+ if ($dxchan = DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: $field[1] connected locally");
+ return;
+ }
+
+ my $pref = Route::Node::get($field[2]);
+ unless ($pref) {
+ dbg('chan', "PCPROT: Route::Node $field[2] not in config");
return;
}
+ $pref->del_user($field[1]);
+ dbg('route', "B/C PC17 on $field[2] for: $field[1]");
+
+ my $node = DXCluster->get_exact($field[2]);
unless ($node) {
- dbg('chan', "Node $field[2] not in config");
+ dbg('chan', "PCPROT: Node $field[2] not in config");
return;
}
unless ($node->isa('DXNode')) {
- dbg('chan', "LOOP: $field[2] is not a node");
+ dbg('chan', "PCPROT: $field[2] is not a node");
return;
}
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $field[2] came in on wrong channel");
- return;
- }
- if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
- dbg('chan', "LOOP: $field[2] connected locally");
+ dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
my $ref = DXCluster->get_exact($field[1]);
if ($ref) {
+ if ($ref->mynode != $node) {
+ dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]");
+ return;
+ }
$ref->del;
} else {
- dbg('chan', "$field[1] not known" );
+ dbg('chan', "PCPROT: $field[1] not known" );
return;
}
+# broadcast_route($line, $self, $field[2]);
+# return;
last SWITCH;
}
if ($pcno == 19) { # incoming cluster list
my $i;
my $newline = "PC19^";
+
+ # new routing list
+ my @rout;
+ my $pref = Route::Node::get($self->{call});
+
+ # parse the PC19
for ($i = 1; $i < $#field-1; $i += 4) {
my $here = $field[$i];
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);
+ # check for sane parameters
+ $ver = 5000 if $ver eq '0000';
+ next if $ver < 5000; # only works with version 5 software
+ next if length $call < 3; # min 3 letter callsigns
- $ver = 5400 if !$ver && $allowzero;
# now check the call over
my $node = DXCluster->get_exact($call);
if ($node) {
my $dxchan;
- if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
- dbg('chan', "LOOP: $call connected locally");
+ if ((my $dxchan = DXChannel->get($call)) && $dxchan != $self) {
+ 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;
}
+
+ # add a route object
+ if ($call eq $pref->call && !$pref->version) {
+ $pref->version($ver);
+ $pref->flags(Route::here($here)|Route::conf($confmode));
+ } else {
+ my $r = $pref->add($call, $ver, Route::here($here)|Route::conf($confmode));
+ push @rout, $r if $r;
+ }
+
my $rcall = $node->mynode->call;
- dbg('chan', "already have $call on $rcall");
+ dbg('chan', "PCPROT: already have $call on $rcall");
next;
}
-
- # check for sane parameters
- next if $ver < 5000; # only works with version 5 software
- next if length $call < 3; # min 3 letter callsigns
+
+ # add a route object
+ if ($call eq $pref->call && !$pref->version) {
+ $pref->version($ver);
+ $pref->flags(Route::here($here)|Route::conf($confmode));
+ } else {
+ my $r = $pref->add($call, $ver, Route::here($here)|Route::conf($confmode));
+ push @rout, $r if $r;
+ }
# add it to the nodes table and outgoing line
$newline .= "$here^$call^$confmode^$ver^";
$user->lastin($main::systime) unless DXChannel->get($call);
$user->put;
}
+
+ dbg('route', "B/C PC19 for: " . join(',', map{$_->call} @rout)) if @rout;
return if $newline eq "PC19^";
if ($pcno == 21) { # delete a cluster from the list
my $call = uc $field[1];
+ my @rout;
+ my $pref = Route::Node::get($call);
+
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
+ if ($call eq $self->{call}) {
+ dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
+ return;
+ }
+ if (my $dxchan = DXChannel->get($call)) {
+ dbg('chan', "PCPROT: $call connected locally");
+ return;
+ }
+
+ # routing objects
+ if ($pref) {
+ push @rout, $pref->del_node($call);
+ } else {
+ dbg('chan', "PCPROT: Route::Node $call not in config");
+ }
+
my $node = DXCluster->get_exact($call);
if ($node) {
unless ($node->isa('DXNode')) {
- dbg('chan', "$call is not a node");
+ dbg('chan', "PCPROT: $call is not a node");
return;
}
- if ($call eq $self->{call}) {
- dbg('chan', "LOOP: Trying to disconnect myself with PC21");
- return;
- }
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $call come in on wrong channel");
- return;
- }
- my $dxchan;
- if ($dxchan = DXChannel->get($call)) {
- dbg('chan', "LOOP: $call connected locally");
+ dbg('chan', "PCPROT: $call come in on wrong channel");
return;
}
$node->del();
} else {
- dbg('chan', "$call not in table, dropped");
+ dbg('chan', "PCPROT: $call not in table, dropped");
return;
}
} else {
- dbg('chan', "I WILL NOT be disconnected!");
+ dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
return;
}
+ dbg('route', "B/C PC21 for: " . join(',', (map{$_->call} @rout))) if @rout;
+
+# broadcast_route($line, $self, $call);
+# 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 ($field[1] eq $self->{call}) {
$self->disconnect(1);
} else {
- dbg('chan', "LOOP: came in on wrong channel");
+ dbg('chan', "PCPROT: came in on wrong channel");
}
return;
}
$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;
next if $dxchan == $me;
# send a pc50 out on this channel
- if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
+ $dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t};
+ if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) {
$dxchan->send(pc50(scalar DXChannel::get_all_users));
- $dxchan->pc50_t($t);
+ $dxchan->{pc50_t} = $t;
}
# send a ping out on this channel
#
# finish up a pc context
#
-sub finish
+
+#
+# some active measures
+#
+sub send_route
{
my $self = shift;
- my $call = $self->call;
- my $conn = shift;
- my $ref = DXCluster->get_exact($call);
-
- # unbusy and stop and outgoing mail
- my $mref = DXMsg::get_busy($call);
- $mref->stop_msg($call) if $mref;
-
- # broadcast to all other nodes that all the nodes connected to via me are gone
- my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
- my $node;
-
- foreach $node (@gonenodes) {
- next if $node->call eq $call;
- broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate};
- $node->del();
- }
-
- # remove outstanding pings
- delete $pings{$call};
+ my $line = shift;
+ my @dxchan = DXChannel::get_all_nodes();
+ my $dxchan;
- # now broadcast to all other ak1a nodes that I have gone
- broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
-
- # I was the last node visited
- $self->user->node($main::mycall);
-
- # send info to all logged in thingies
- $self->tell_login('logoutn');
+ # 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 $routeit;
+ my ($filter, $hops);
- Log('DXProt', $call . " Disconnected");
- $ref->del() if $ref;
+ if ($dxchan->{routefilter}) {
+ ($filter, $hops) = $dxchan->{routefilter}->it($self->{call}, @_);
+ next unless $filter;
+ }
+ next if $dxchan == $self;
+ if ($hops) {
+ $routeit = $line;
+ $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+ } else {
+ $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
+ next unless $routeit;
+ }
+ if ($filter) {
+ $dxchan->send($routeit) if $routeit;
+ } else {
+ $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+ }
+ }
}
-#
-# some active measures
-#
sub send_dx_spot
{
my $self = shift;
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) = $dxchan->{wwvfilter}->it(@_, $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) = $dxchan->{wcyfilter}->it(@_, $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 || $dxchan->is_dxnet) {
$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}) {
- 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;
- }
($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
next unless $filter;
}
my ($self, $call, $line) = @_;
if (ref $self && $call eq $self->{call}) {
- dbg('chan', "Trying to route back to source, dropped");
+ dbg('chan', "PCPROT: Trying to route back to source, dropped");
return;
}
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");
}
}
# send it if it isn't the except list and isn't isolated and still has a hop count
foreach $dxchan (@dxchan) {
next if grep $dxchan == $_, @except;
+ next if $dxchan == $me;
+
my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name
$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
}
# send it if it isn't the except list and isn't isolated and still has a hop count
foreach $dxchan (@dxchan) {
next if grep $dxchan == $_, @except;
+ next if $dxchan == $me;
+
my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name
$dxchan->send($routeit);
}
foreach $dxchan (@_) {
my $filter = 1;
+ next if $dxchan == $me;
if ($sort eq 'dx') {
next unless $dxchan->{dx};
sub disconnect
{
my $self = shift;
- my $nopc39 = shift;
+ my $pc39flag = shift;
+ my $call = $self->call;
- if ($self->{conn} && !$nopc39) {
+ unless ($pc39flag && $pc39flag == 1) {
$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
}
+ # do routing stuff
+ my $pref = Route::Node::get($self->{call});
+ my @rout = $pref->del_nodes;
+ push @rout, $main::routeroot->del_node($call);
+ dbg('route', "B/C PC21 (from PC39) for: " . join(',', (map{ $_->call } @rout))) if @rout;
+
+ # unbusy and stop and outgoing mail
+ my $mref = DXMsg::get_busy($call);
+ $mref->stop_msg($call) if $mref;
+
+ # create a list of all the nodes that have gone and delete them from the table
+ my @nodes;
+ foreach my $node (grep { $_->dxchancall eq $call } DXNode::get_all) {
+ next if $node->call eq $call;
+ next if $node->call eq $main::mycall;
+ push @nodes, $node->call;
+ $node->del;
+ }
+
+ # broadcast to all other nodes that all the nodes connected to via me are gone
+ unless ($pc39flag && $pc39flag == 2) {
+ unless ($self->{isolate}) {
+ push @nodes, $call;
+ for (@nodes) {
+ broadcast_ak1a(pc21($_, 'Gone.'), $self);
+ }
+ }
+ }
+
+ # remove this node from the tables
+ my $node = DXCluster->get_exact($call);
+ $node->del if $node;
+
+ # remove outstanding pings
+ delete $pings{$call};
+
+ # I was the last node visited
+ $self->user->node($main::mycall);
+
+ # send info to all logged in thingies
+ $self->tell_login('logoutn');
+
+ Log('DXProt', $call . " Disconnected");
+
$self->SUPER::disconnect;
}
projects / spider.git / blobdiff