projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mark calls like DR4W-HB as invalid
[spider.git]
/
perl
/
RBN.pm
diff --git
a/perl/RBN.pm
b/perl/RBN.pm
index 0cf5c4149c4940c979280ca28eea537a89be7477..1fc50bd0e7d8af6d1aa5e7c4193198aa728aa3fd 100644
(file)
--- a/
perl/RBN.pm
+++ b/
perl/RBN.pm
@@
-252,7
+252,12
@@
sub normal
}
# remove all extraneous crap from the origin - just leave the base callsign
}
# remove all extraneous crap from the origin - just leave the base callsign
- $origin =~ s|^(?:[\w\d]+/)?([\w\d]+).*$|$1|;
+ my $norigin = basecall($origin);
+ unless ($norigin) {
+ dbg("RBN: ERROR '$origin' is an invalid callsign, dumped");
+ return;
+ }
+ $origin = $norigin;
# is this callsign in badspotter list?
if ($DXProt::badspotter->in($origin) || $DXProt::badnode->in($origin)) {
# is this callsign in badspotter list?
if ($DXProt::badspotter->in($origin) || $DXProt::badnode->in($origin)) {
@@
-261,7
+266,7
@@
sub normal
}
# is the qrg valid
}
# is the qrg valid
- unless ($qrg =~ /^\d+\.\d{1,
2
}$/) {
+ unless ($qrg =~ /^\d+\.\d{1,
3
}$/) {
dbg("RBN: ERROR qrg $qrg from $origin invalid, dumped");
return;
}
dbg("RBN: ERROR qrg $qrg from $origin invalid, dumped");
return;
}