Fix various bugs in the new YSF state machine.

YSFControl.cpp

@@ -121,6 +121,7 @@ bool CYSFControl::writeModem(unsigned char *data, unsigned int len)
 	}
 
 	if (type == TAG_LOST) {
+		m_rfPayload.reset();
 		m_rfState = RS_RF_LISTENING;
 		return false;
 	}
@@ -201,15 +202,11 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 {
 	unsigned char fi = m_lastFICH.getFI();
 	if (valid && fi == YSF_FI_HEADER) {
-		if (m_rfState != RS_RF_LISTENING)
+		if (m_rfState == RS_RF_LISTENING) {
-			return false;
-
 			bool valid = m_rfPayload.processHeaderData(data + 2U);
 			if (!valid)
 				return false;
 
-		CSync::addYSFSync(data + 2U);
-
 			m_rfSource = m_rfPayload.getSource();
 
 			if (m_selfOnly) {
@@ -231,7 +228,6 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 			m_rfErrs = 0U;
 			m_rfBits = 1U;
 			m_rfTimeoutTimer.start();
-		m_rfPayload.reset();
 			m_rfState = RS_RF_AUDIO;
 
 			m_minRSSI = m_rssi;
@@ -245,6 +241,8 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 			m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", "          ");
 			LogMessage("YSF, received RF header from %10.10s to %10.10s", m_rfSource, m_rfDest);
 
+			CSync::addYSFSync(data + 2U);
+
 			CYSFFICH fich = m_lastFICH;
 
 			// Remove any DSQ information
@@ -275,6 +273,9 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
+
+			return true;
+		}
 	} else if (valid && fi == YSF_FI_TERMINATOR) {
 		if (m_rfState == RS_RF_REJECTED) {
 			m_rfState = RS_RF_LISTENING;
@@ -319,12 +320,8 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 
 			writeEndRF();
 		}
-
-		return false;
 	} else {
-		if (m_rfState != RS_RF_AUDIO)
+		if (m_rfState == RS_RF_AUDIO) {
-			return false;
-
 			// If valid is false, update the m_lastFICH for this transmission
 			if (!valid) {
 				// XXX Check these values
@@ -376,24 +373,23 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
-	}
 
 			return true;
+		}
+	}
+
+	return false;
 }
 
 bool CYSFControl::processDNData(bool valid, unsigned char *data)
 {
 	unsigned char fi = m_lastFICH.getFI();
 	if (valid && fi == YSF_FI_HEADER) {
-		if (m_rfState != RS_RF_LISTENING)
+		if (m_rfState == RS_RF_LISTENING) {
-			return false;
-
 			bool valid = m_rfPayload.processHeaderData(data + 2U);
 			if (!valid)
 				return false;
 
-		CSync::addYSFSync(data + 2U);
-
 			m_rfSource = m_rfPayload.getSource();
 
 			if (m_selfOnly) {
@@ -415,7 +411,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_rfErrs = 0U;
 			m_rfBits = 1U;
 			m_rfTimeoutTimer.start();
-		m_rfPayload.reset();
 			m_rfState = RS_RF_AUDIO;
 
 			m_minRSSI = m_rssi;
@@ -429,6 +424,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", "          ");
 			LogMessage("YSF, received RF header from %10.10s to %10.10s", m_rfSource, m_rfDest);
 
+			CSync::addYSFSync(data + 2U);
+
 			CYSFFICH fich = m_lastFICH;
 
 			// Remove any DSQ information
@@ -459,6 +456,9 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
+
+			return true;
+		}
 	} else if (valid && fi == YSF_FI_TERMINATOR) {
 		if (m_rfState == RS_RF_REJECTED) {
 			m_rfState = RS_RF_LISTENING;
@@ -503,8 +503,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 
 			writeEndRF();
 		}
-
-		return false;
 	} else {
 		if (m_rfState == RS_RF_AUDIO) {
 			// If valid is false, update the m_lastFICH for this transmission
@@ -578,10 +576,10 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
-		} else if (valid) {
-			// Only use clean frames for late entry.
-			CSync::addYSFSync(data + 2U);
 
+			return true;
+		} else if (valid && m_rfState == RS_RF_LISTENING) {
+			// Only use clean frames for late entry.
 			unsigned char fn = m_lastFICH.getFN();
 			unsigned char dt = m_lastFICH.getDT();
 
@@ -595,21 +593,19 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 				break;
 
 			default:
+				valid = false;
 				break;
 			}
 
 			if (!valid)
 				return false;
 
-			if (m_rfDest == NULL) {
 			unsigned char cm = m_lastFICH.getCM();
 			if (cm == YSF_CM_GROUP)
 				m_rfDest = (unsigned char*)"ALL       ";
 			else
 				m_rfDest = m_rfPayload.getDest();
-			}
 
-			if (m_rfSource == NULL)
 			m_rfSource = m_rfPayload.getSource();
 
 			if (m_rfSource == NULL || m_rfDest == NULL)
@@ -628,7 +624,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_rfErrs = 0U;
 			m_rfBits = 1U;
 			m_rfTimeoutTimer.start();
-			m_rfPayload.reset();
 			m_rfState = RS_RF_AUDIO;
 
 			m_minRSSI = m_rssi;
@@ -654,7 +649,6 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_rfSource, YSF_CALLSIGN_LENGTH);
 			memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);
 
-			unsigned char cm = fich.getCM();
 			if (cm == YSF_CM_GROUP)
 				memset(csd1 + 0U, '*', YSF_CALLSIGN_LENGTH);
 			else
@@ -686,6 +680,8 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", "          ");
 			LogMessage("YSF, received RF late entry from %10.10s to %10.10s", m_rfSource, m_rfDest);
 
+			CSync::addYSFSync(data + 2U);
+
 			fich = m_lastFICH;
 
 			// Remove any DSQ information
@@ -716,25 +712,23 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
+
+			return true;
 		}
 	}
 
-	return true;
+	return false;
 }
 
 bool CYSFControl::processFRData(bool valid, unsigned char *data)
 {
 	unsigned char fi = m_lastFICH.getFI();
 	if (valid && fi == YSF_FI_HEADER) {
-		if (m_rfState != RS_RF_LISTENING)
+		if (m_rfState == RS_RF_LISTENING) {
-			return false;
-
 			valid = m_rfPayload.processHeaderData(data + 2U);
 			if (!valid)
 				return false;
 
-		CSync::addYSFSync(data + 2U);
-
 			m_rfSource = m_rfPayload.getSource();
 
 			if (m_selfOnly) {
@@ -753,7 +747,6 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
 				m_rfDest = m_rfPayload.getDest();
 
 			m_rfFrames = 0U;
-		m_rfPayload.reset();
 			m_rfState = RS_RF_DATA;
 
 			m_minRSSI = m_rssi;
@@ -767,6 +760,8 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
 			m_display->writeFusion((char*)m_rfSource, (char*)m_rfDest, "R", "          ");
 			LogMessage("YSF, received RF header from %10.10s to %10.10s", m_rfSource, m_rfDest);
 
+			CSync::addYSFSync(data + 2U);
+
 			CYSFFICH fich = m_lastFICH;
 
 			// Remove any DSQ information
@@ -797,6 +792,9 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
+
+			return true;
+		}
 	} else if (valid && fi == YSF_FI_TERMINATOR) {
 		if (m_rfState == RS_RF_REJECTED) {
 			m_rfState = RS_RF_LISTENING;
@@ -841,12 +839,8 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
 
 			writeEndRF();
 		}
-
-		return false;
 	} else {
-		if (m_rfState != RS_RF_DATA)
+		if (m_rfState == RS_RF_DATA) {
-			return false;
-
 			// If valid is false, update the m_lastFICH for this transmission
 			if (!valid) {
 				unsigned char ft = m_lastFICH.getFT();
@@ -894,9 +888,12 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
 			m_rfFrames++;
 
 			m_display->writeFusionRSSI(m_rssi);
-	}
 
 			return true;
+		}
+	}
+
+	return false;
 }
 
 unsigned int CYSFControl::readModem(unsigned char* data)