X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=51c299c4abae389558667413e6ac8c54149682a6;hb=078ab2487ef4ef01c658af2f6a8c9f0402a30927;hp=8c2fbaadc5911079367118faac7a1c71ac4987e6;hpb=2ca690592ea14e2ecd6783feed99ed7a8195162c;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 8c2fbaad..51c299c4 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -251,8 +251,20 @@ sub normal
 		return;
 	}
 
-	$origin =~ s/\-(?:\d{1,2}\-)?\#$//; # get rid of all the crap we aren't interested in
+	# remove all extraneous crap from the origin - just leave the base callsign
+	$origin =~ basecall($origin);
 
+	# is this callsign in badspotter list?
+	if ($DXProt::badspotter->in($origin) || $DXProt::badnode->in($origin)) {
+		dbg("RBN: ERROR $origin is a bad spotter/node, dumped");
+		return;
+	}
+	
+	# is the qrg valid
+	unless ($qrg =~ /^\d+\.\d{1,2}$/) {
+		dbg("RBN: ERROR qrg $qrg from $origin invalid, dumped");
+		return;
+	}
 
 	$sort ||= '';
 	$tx ||= '';