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 $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 $@;
}
#
# 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);
}
# if this is a 'nodx' node then ignore it
- if (grep $field[7] =~ /^$_/, @DXProt::nodx_node) {
- dbg('chan', "PCPROT: 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;
}
}
# is it 'baddx'
- if (grep $field[2] eq $_, @baddx) {
+ 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', "PCPROT: Duplicate Spot ignored\n");
return;
dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
- if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
- dbg('chan', "PCPROT: $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]);
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" );
} 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);
}
$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;
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;
#
# finish up a pc context
#
-sub finish
-{
- 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};
-
- # 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');
-
- Log('DXProt', $call . " Disconnected");
- $ref->del() if $ref;
-}
#
# some active measures
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};
{
my $self = shift;
my $nopc39 = shift;
+ my $call = $self->call;
- if ($self->{conn} && !$nopc39) {
+ unless ($nopc39) {
$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
}
+ # 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
+ foreach my $node (grep { $_->dxchan == $self } DXNode::get_all) {
+ next if $node->call eq $call;
+ next if $node->call eq $main::mycall;
+ broadcast_ak1a(pc21($node->call, 'Gone.'), $self) unless $self->{isolate};
+ $node->del;
+ }
+
+ # remove outstanding pings
+ delete $pings{$call};
+
+ # 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');
+
+ Log('DXProt', $call . " Disconnected");
+ my $ref = DXCluster->get_exact($call);
+ $ref->del() if $ref;
+
$self->SUPER::disconnect;
}
projects / spider.git / blobdiff