X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=1fc50bd0e7d8af6d1aa5e7c4193198aa728aa3fd;hb=78fcd88c563bc8f05c9f590cdfc0739129c7efda;hp=0cf5c4149c4940c979280ca28eea537a89be7477;hpb=4d8e254ea4c77a348c96c24fdbc265590c75fd5c;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 0cf5c414..1fc50bd0 100644
--- 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
-	$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)) {
@@ -261,7 +266,7 @@ sub normal
 	}
 	
 	# 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;
 	}