Fix crash in the SACCH and FACCH1 encoders.
This commit is contained in:
parent
3858cf4aec
commit
8e2c6f6583
|
@ -93,7 +93,7 @@ bool CNXDNControl::writeModem(unsigned char *data, unsigned int len)
|
||||||
if (m_rssi != 0U)
|
if (m_rssi != 0U)
|
||||||
LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
|
LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
|
||||||
else
|
else
|
||||||
LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits));
|
LogMessage("NXDN, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||||
writeEndRF();
|
writeEndRF();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -174,6 +174,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
|
||||||
unsigned char ran = sacch.getRAN();
|
unsigned char ran = sacch.getRAN();
|
||||||
if (ran != m_ran && ran != 0U)
|
if (ran != m_ran && ran != 0U)
|
||||||
return false;
|
return false;
|
||||||
|
} else if (m_rfState == RS_RF_LISTENING) {
|
||||||
|
// return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX Reconstruct invalid LICH
|
// XXX Reconstruct invalid LICH
|
||||||
|
@ -184,8 +186,9 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
|
||||||
bool valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
|
bool valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
|
||||||
if (!valid)
|
if (!valid)
|
||||||
valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
|
valid = facch.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
|
||||||
|
// if (!valid)
|
||||||
|
// return false;
|
||||||
|
|
||||||
if (valid) {
|
|
||||||
unsigned char buffer[10U];
|
unsigned char buffer[10U];
|
||||||
facch.getData(buffer);
|
facch.getData(buffer);
|
||||||
|
|
||||||
|
@ -200,7 +203,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (m_selfOnly) {
|
bool hasInfo = layer3.getHasInfo();
|
||||||
|
if (m_rfState == RS_RF_LISTENING && m_selfOnly && hasInfo) {
|
||||||
unsigned short srcId = layer3.getSourceUnitId();
|
unsigned short srcId = layer3.getSourceUnitId();
|
||||||
if (srcId != m_id) {
|
if (srcId != m_id) {
|
||||||
m_rfState = RS_RF_REJECTED;
|
m_rfState = RS_RF_REJECTED;
|
||||||
|
@ -242,16 +246,14 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
|
||||||
if (m_rssi != 0U)
|
if (m_rssi != 0U)
|
||||||
LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
|
LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
|
||||||
else
|
else
|
||||||
LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 10.0F, float(m_rfErrs * 100U) / float(m_rfBits));
|
LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits));
|
||||||
writeEndRF();
|
writeEndRF();
|
||||||
return true;
|
|
||||||
} else {
|
} else {
|
||||||
m_rfFrames = 0U;
|
m_rfFrames = 0U;
|
||||||
m_rfErrs = 0U;
|
m_rfErrs = 0U;
|
||||||
m_rfBits = 1U;
|
m_rfBits = 1U;
|
||||||
m_rfTimeoutTimer.start();
|
m_rfTimeoutTimer.start();
|
||||||
m_rfState = RS_RF_AUDIO;
|
m_rfState = RS_RF_AUDIO;
|
||||||
|
|
||||||
m_minRSSI = m_rssi;
|
m_minRSSI = m_rssi;
|
||||||
m_maxRSSI = m_rssi;
|
m_maxRSSI = m_rssi;
|
||||||
m_aveRSSI = m_rssi;
|
m_aveRSSI = m_rssi;
|
||||||
|
@ -268,15 +270,12 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
|
||||||
std::string source = m_lookup->find(srcId);
|
std::string source = m_lookup->find(srcId);
|
||||||
LogMessage("NXDN, received RF voice transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId);
|
LogMessage("NXDN, received RF voice transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId);
|
||||||
m_display->writeNXDN(source.c_str(), grp, dstId, "R");
|
m_display->writeNXDN(source.c_str(), grp, dstId, "R");
|
||||||
|
}
|
||||||
m_rfState = RS_RF_AUDIO;
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
else {
|
||||||
|
// if (valid) {
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
unsigned char message[3U];
|
unsigned char message[3U];
|
||||||
sacch.getData(message);
|
sacch.getData(message);
|
||||||
|
|
||||||
|
@ -339,6 +338,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
|
||||||
|
|
||||||
m_rfState = RS_RF_AUDIO;
|
m_rfState = RS_RF_AUDIO;
|
||||||
}
|
}
|
||||||
|
// }
|
||||||
|
|
||||||
// if (m_rfState == RS_RF_AUDIO) {
|
// if (m_rfState == RS_RF_AUDIO) {
|
||||||
// Regenerate the sync
|
// Regenerate the sync
|
||||||
|
|
|
@ -42,7 +42,8 @@ const unsigned int INTERLEAVE_TABLE[] = {
|
||||||
const unsigned int PUNCTURE_LIST[] = { 1U, 5U, 9U, 13U, 17U, 21U, 25U, 29U, 33U, 37U,
|
const unsigned int PUNCTURE_LIST[] = { 1U, 5U, 9U, 13U, 17U, 21U, 25U, 29U, 33U, 37U,
|
||||||
41U, 45U, 49U, 53U, 57U, 61U, 65U, 69U, 73U, 77U,
|
41U, 45U, 49U, 53U, 57U, 61U, 65U, 69U, 73U, 77U,
|
||||||
81U, 85U, 89U, 93U, 97U, 101U, 105U, 109U, 113U, 117U,
|
81U, 85U, 89U, 93U, 97U, 101U, 105U, 109U, 113U, 117U,
|
||||||
121U, 125U, 129U, 133U, 137U, 141U};
|
121U, 125U, 129U, 133U, 137U, 141U, 145U, 149U, 153U, 157U,
|
||||||
|
161U, 165U, 169U, 173U, 177U, 181U, 185U, 189U };
|
||||||
|
|
||||||
const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U };
|
const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U };
|
||||||
|
|
||||||
|
@ -121,11 +122,7 @@ void CNXDNFACCH1::encode(unsigned char* data, unsigned int offset) const
|
||||||
|
|
||||||
unsigned char temp1[12U];
|
unsigned char temp1[12U];
|
||||||
::memset(temp1, 0x00U, 12U);
|
::memset(temp1, 0x00U, 12U);
|
||||||
|
::memcpy(temp1, data, 10U);
|
||||||
for (unsigned int i = 0U; i < 80U; i++) {
|
|
||||||
bool b = READ_BIT1(m_data, i);
|
|
||||||
WRITE_BIT1(temp1, i, b);
|
|
||||||
}
|
|
||||||
|
|
||||||
CNXDNCRC::encodeCRC12(temp1, 80U);
|
CNXDNCRC::encodeCRC12(temp1, 80U);
|
||||||
|
|
||||||
|
|
|
@ -93,6 +93,15 @@ unsigned char CNXDNLayer3::getCallOptions() const
|
||||||
return m_data[2U] & 0x1FU;
|
return m_data[2U] & 0x1FU;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CNXDNLayer3::getHasInfo() const
|
||||||
|
{
|
||||||
|
unsigned char type = getMessageType();
|
||||||
|
|
||||||
|
return type != NXDN_MESSAGE_TYPE_IDLE &&
|
||||||
|
type != NXDN_MESSAGE_TYPE_VCALL_IV &&
|
||||||
|
type != NXDN_MESSAGE_TYPE_SDCALL_IV;
|
||||||
|
}
|
||||||
|
|
||||||
CNXDNLayer3& CNXDNLayer3::operator=(const CNXDNLayer3& layer3)
|
CNXDNLayer3& CNXDNLayer3::operator=(const CNXDNLayer3& layer3)
|
||||||
{
|
{
|
||||||
if (&layer3 != this)
|
if (&layer3 != this)
|
||||||
|
|
|
@ -34,6 +34,7 @@ public:
|
||||||
unsigned short getDestinationGroupId() const;
|
unsigned short getDestinationGroupId() const;
|
||||||
bool getIsGroup() const;
|
bool getIsGroup() const;
|
||||||
unsigned char getCallOptions() const;
|
unsigned char getCallOptions() const;
|
||||||
|
bool getHasInfo() const;
|
||||||
|
|
||||||
CNXDNLayer3& operator=(const CNXDNLayer3& layer3);
|
CNXDNLayer3& operator=(const CNXDNLayer3& layer3);
|
||||||
|
|
||||||
|
|
|
@ -123,14 +123,14 @@ void CNXDNSACCH::encode(unsigned char* data) const
|
||||||
|
|
||||||
CNXDNCRC::encodeCRC6(temp1, 26U);
|
CNXDNCRC::encodeCRC6(temp1, 26U);
|
||||||
|
|
||||||
CUtils::dump("NXDN, SACCH encoded with CRC", temp1, 4U);
|
CUtils::dump("NXDN, SACCH encoded with CRC", temp1, 5U);
|
||||||
|
|
||||||
unsigned char temp2[8U];
|
unsigned char temp2[9U];
|
||||||
|
|
||||||
CNXDNConvolution conv;
|
CNXDNConvolution conv;
|
||||||
conv.encode(temp1, temp2, 36U);
|
conv.encode(temp1, temp2, 36U);
|
||||||
|
|
||||||
// CUtils::dump("NXDN, SACCH convolved", temp2, 8U);
|
// CUtils::dump("NXDN, SACCH convolved", temp2, 9U);
|
||||||
|
|
||||||
unsigned char temp3[8U];
|
unsigned char temp3[8U];
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,8 @@ const unsigned int PUNCTURE_LIST[] = { 3U, 11U, 17U, 25U, 31U, 39U, 45U,
|
||||||
73U, 81U, 87U, 95U, 101U, 109U, 115U, 123U, 129U, 137U,
|
73U, 81U, 87U, 95U, 101U, 109U, 115U, 123U, 129U, 137U,
|
||||||
143U, 151U, 157U, 165U, 171U, 179U, 185U, 193U, 199U, 207U,
|
143U, 151U, 157U, 165U, 171U, 179U, 185U, 193U, 199U, 207U,
|
||||||
213U, 221U, 227U, 235U, 241U, 249U, 255U, 263U, 269U, 277U,
|
213U, 221U, 227U, 235U, 241U, 249U, 255U, 263U, 269U, 277U,
|
||||||
283U, 291U, 297U, 305U, 311U, 319U, 325U, 333U, 339U, 347U };
|
283U, 291U, 297U, 305U, 311U, 319U, 325U, 333U, 339U, 347U,
|
||||||
|
353U, 361U, 367U, 375U, 381U, 389U, 395U, 403U };
|
||||||
|
|
||||||
const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U };
|
const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U };
|
||||||
|
|
||||||
|
@ -142,11 +143,7 @@ void CNXDNUDCH::encode(unsigned char* data) const
|
||||||
|
|
||||||
unsigned char temp1[25U];
|
unsigned char temp1[25U];
|
||||||
::memset(temp1, 0x00U, 25U);
|
::memset(temp1, 0x00U, 25U);
|
||||||
|
::memcpy(temp1, data, 23U);
|
||||||
for (unsigned int i = 0U; i < 184U; i++) {
|
|
||||||
bool b = READ_BIT1(m_data, i);
|
|
||||||
WRITE_BIT1(temp1, i, b);
|
|
||||||
}
|
|
||||||
|
|
||||||
CNXDNCRC::encodeCRC15(temp1, 184U);
|
CNXDNCRC::encodeCRC15(temp1, 184U);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue