projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take off rspf checks on announces and spots and allow the dupe filters
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index ee9c92f103410f54bfc3c78d20c764fc8085b71d..bd34278f6485310d5c928f410978c43813ae6f17 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-208,7
+208,7
@@
sub new
# add this node to the table, the values get filled in later
my $pkg = shift;
my $call = shift;
# add this node to the table, the values get filled in later
my $pkg = shift;
my $call = shift;
- $main::routeroot->add($call, '
0
000', Route::here(1)) if $call ne $main::mycall;
+ $main::routeroot->add($call, '
5
000', Route::here(1)) if $call ne $main::mycall;
return $self;
}
return $self;
}
@@
-396,7
+396,7
@@
sub normal
}
# rsfp check
}
# rsfp check
-
return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
+
#
return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
# if this is a 'nodx' node then ignore it
if ($badnode->in($field[7])) {
# if this is a 'nodx' node then ignore it
if ($badnode->in($field[7])) {
@@
-431,10
+431,6
@@
sub normal
dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
return;
}
dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
return;
}
- if (Spot::dup($field[1], $field[2], $d, $field[5])) {
- dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
- return;
- }
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[5])) {
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[5])) {
@@
-453,6
+449,11
@@
sub normal
}
}
}
}
+ if (Spot::dup($field[1], $field[2], $d, $field[5])) {
+ dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
+ return;
+ }
+
# add it
Spot::add(@spot);
# add it
Spot::add(@spot);
@@
-528,14
+529,10
@@
sub normal
if ($pcno == 12) { # announces
if ($pcno == 12) { # announces
-
return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
+
#
return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
# announce duplicate checking
$field[3] =~ s/^\s+//; # remove leading blanks
# announce duplicate checking
$field[3] =~ s/^\s+//; # remove leading blanks
- if (AnnTalk::dup($field[1], $field[2], $field[3])) {
- dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
- return;
- }
if ($censorpc) {
my @bad;
if ($censorpc) {
my @bad;
@@
-743,7
+740,7
@@
sub normal
eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
# check for sane parameters
eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
# check for sane parameters
-
$ver = 5000 if $ver eq '0000';
+
#
$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
next if $call eq $main::mycall;
next if $ver < 5000; # only works with version 5 software
next if length $call < 3; # min 3 letter callsigns
next if $call eq $main::mycall;
@@
-1451,6
+1448,11
@@
sub send_announce
}
}
}
}
+ if (AnnTalk::dup($_[0], $_[1], $_[2])) {
+ dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+ return;
+ }
+
Log('ann', $target, $_[0], $text);
# send it if it isn't the except list and isn't isolated and still has a hop count
Log('ann', $target, $_[0], $text);
# send it if it isn't the except list and isn't isolated and still has a hop count