From 1579ef60c1f7e0da660290ec655533c5ee69a138 Mon Sep 17 00:00:00 2001
From: David Freese <iam_w1hkj@w1hkj.com>
Date: Sat, 18 Jul 2015 02:10:57 -0500
Subject: [PATCH] FSQ heard parser

  * added more restrictive discovery of heard callsign
    - must pass crc8 comparison
    - must pass regular expression test for callsign
      ([[:alnum:]]?[[:alpha:]/]+[[:digit:]]+[[:alnum:]/]+)
---
 src/fsq/fsq.cxx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/fsq/fsq.cxx b/src/fsq/fsq.cxx
index e889c2e7..19337d0d 100644
--- a/src/fsq/fsq.cxx
+++ b/src/fsq/fsq.cxx
@@ -376,14 +376,15 @@ static fre_t call("([[:alnum:]]?[[:alpha:]/]+[[:digit:]]+[[:alnum:]/]+)", REG_EX
 
 bool fsq::valid_callsign(std::string s)
 {
-	static char sz[21];
-	if (s.empty()) return false;
+	if (s.length() < 3) return false;
 	if (s.length() > 20) return false;
+//	if (s.find(' ') != std::string::npos) return false;
+
 	if (s == allcall) return true;
 	if (s == cqcqcq) return true;
 	if (s == mycall) return true;
-	if (s.find(' ') != std::string::npos) return false;
 
+	static char sz[21];
 	memset(sz, 0, 21);
 	strcpy(sz, s.c_str());
 	bool matches = call.match(sz);
@@ -423,13 +424,15 @@ void fsq::parse_rx_text()
 	station_calling.clear();
 
 	int max = p+1;
+	std::string substr;
 	for (int i = 1; (i < 10) && (i < max); i++) {
 		if (rx_text[p-i] <= ' ' || rx_text[p-i] > 'z') {
 			rx_text.clear();
 			return;
 		}
-		if (crc.sval(rx_text.substr(p-i, i)) == rxcrc) {
-			station_calling = rx_text.substr(p-i, i);
+		substr = rx_text.substr(p-i, i);
+		if ((crc.sval(substr) == rxcrc) && valid_callsign(substr)) {
+			station_calling = substr;
 			break;
 		}
 	}