projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check for qra locator and offer alternative
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 99fc85ce7e3c42723bec9a8c5da038f2d540beb9..516779b67458791266a7d00bd25453d30732b1ad 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-46,7
+46,7
@@
$last_hour = time; # last time I did an hourly periodic update
%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
%nodehops = (); # node specific hop control
%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
%nodehops = (); # node specific hop control
-$censorpc =
0
; # Do a BadWords::check on text fields and reject things
+$censorpc =
1
; # Do a BadWords::check on text fields and reject things
# loads of 'bad things'
$baddx = new DXHash "baddx";
$badspotter = new DXHash "badspotter";
# loads of 'bad things'
$baddx = new DXHash "baddx";
$badspotter = new DXHash "badspotter";
@@
-236,13
+236,10
@@
sub start
# send initialisation string
unless ($self->{outbound}) {
# send initialisation string
unless ($self->{outbound}) {
-# $self->send(pc38()) if DXNode->get_all();
$self->send(pc18());
$self->{lastping} = $main::systime;
} else {
$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->state('init');
$self->pc50_t(time);
@@
-357,6
+354,11
@@
sub normal
# do some de-duping
$field[5] =~ s/^\s+//; # take any leading blanks off
# 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;
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
dbg('chan', "PCPROT: Duplicate Spot ignored\n");
return;
@@
-596,12
+598,16
@@
sub normal
dbg('chan', "PCPROT: $field[2] came in on wrong channel");
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) {
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" );
$ref->del;
} else {
dbg('chan', "PCPROT: $field[1] not known" );