MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle network end markers and missing end of LDU frames.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-09-28 07:53:45 +01:00
parent b0aecf12eb
commit f627a18dd8
4 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
P25Control.cpp
View File

@@ -62,6 +62,7 @@ m_netLSD(),
m_netLDU1(NULL), m_netLDU1(NULL),
m_netLDU2(NULL), m_netLDU2(NULL),
m_lastIMBE(NULL), m_lastIMBE(NULL),
m_rfLDU(NULL),
m_fp(NULL) m_fp(NULL)
{ {
assert(display != NULL); assert(display != NULL);
@@ -75,6 +76,9 @@ m_fp(NULL)
m_lastIMBE = new unsigned char[11U]; m_lastIMBE = new unsigned char[11U];
::memcpy(m_lastIMBE, P25_NULL_IMBE, 11U); ::memcpy(m_lastIMBE, P25_NULL_IMBE, 11U);
m_rfLDU = new unsigned char[P25_LDU_FRAME_LENGTH_BYTES];
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
} }
CP25Control::~CP25Control() CP25Control::~CP25Control()
@@ -82,6 +86,7 @@ CP25Control::~CP25Control()
delete[] m_netLDU1; delete[] m_netLDU1;
delete[] m_netLDU2; delete[] m_netLDU2;
delete[] m_lastIMBE; delete[] m_lastIMBE;
delete[] m_rfLDU;
} }
bool CP25Control::writeModem(unsigned char* data, unsigned int len) bool CP25Control::writeModem(unsigned char* data, unsigned int len)
@@ -99,7 +104,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
if (m_netState == RS_NET_IDLE) if (m_netState == RS_NET_IDLE)
m_display->clearP25(); m_display->clearP25();
writeNetwork(data + 2U, P25_DUID_TERM); writeNetwork(data + 2U, P25_DUID_TERM, true);
m_rfState = RS_RF_LISTENING; m_rfState = RS_RF_LISTENING;
m_rfTimeout.stop(); m_rfTimeout.stop();
m_rfData.reset(); m_rfData.reset();
@@ -143,6 +148,12 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
} }
createRFHeader(); createRFHeader();
writeNetwork(data + 2U, P25_DUID_HEADER, false);
}
if (m_rfLDU[0U] != 0x00U) {
writeNetwork(m_rfLDU, m_lastDUID, false);
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
} }
// Regenerate Sync // Regenerate Sync
@@ -173,10 +184,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
writeFile(data + 2U, len - 2U); writeFile(data + 2U, len - 2U);
#endif #endif
if (m_rfFrames == 1U) ::memcpy(m_rfLDU, data + 2U, P25_LDU_FRAME_LENGTH_BYTES);
writeNetwork(data + 2U, P25_DUID_HEADER);
writeNetwork(data + 2U, P25_DUID_LDU1);
if (m_duplex) { if (m_duplex) {
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -197,6 +205,11 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
if (m_rfState == RS_RF_LISTENING) if (m_rfState == RS_RF_LISTENING)
return false; return false;
if (m_rfLDU[0U] != 0x00U) {
writeNetwork(m_rfLDU, m_lastDUID, false);
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
}
// Regenerate Sync // Regenerate Sync
CSync::addP25Sync(data + 2U); CSync::addP25Sync(data + 2U);
@@ -225,7 +238,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
writeFile(data + 2U, len - 2U); writeFile(data + 2U, len - 2U);
#endif #endif
writeNetwork(data + 2U, P25_DUID_LDU2); ::memcpy(m_rfLDU, data + 2U, P25_LDU_FRAME_LENGTH_BYTES);
if (m_duplex) { if (m_duplex) {
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
@@ -236,6 +249,11 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
if (m_rfState == RS_RF_LISTENING) if (m_rfState == RS_RF_LISTENING)
return false; return false;
if (m_rfLDU[0U] != 0x00U) {
writeNetwork(m_rfLDU, m_lastDUID, true);
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
}
::memset(data + 2U, 0x00U, P25_TERM_FRAME_LENGTH_BYTES); ::memset(data + 2U, 0x00U, P25_TERM_FRAME_LENGTH_BYTES);
// Regenerate Sync // Regenerate Sync
@@ -259,7 +277,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
closeFile(); closeFile();
#endif #endif
writeNetwork(data + 2U, P25_DUID_TERM); writeNetwork(data + 2U, P25_DUID_TERM, true);
if (m_duplex) { if (m_duplex) {
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
@@ -303,57 +321,57 @@ void CP25Control::writeNetwork()
switch (data[0U]) { switch (data[0U]) {
case 0x62U: case 0x62U:
::memcpy(m_netLDU1 + 0U, data, 22U); ::memcpy(m_netLDU1 + 0U, data, 22U);
return; break;
case 0x63U: case 0x63U:
::memcpy(m_netLDU1 + 25U, data, 14U); ::memcpy(m_netLDU1 + 25U, data, 14U);
return; break;
case 0x64U: case 0x64U:
::memcpy(m_netLDU1 + 50U, data, 17U); ::memcpy(m_netLDU1 + 50U, data, 17U);
return; break;
case 0x65U: case 0x65U:
::memcpy(m_netLDU1 + 75U, data, 17U); ::memcpy(m_netLDU1 + 75U, data, 17U);
return; break;
case 0x66U: case 0x66U:
::memcpy(m_netLDU1 + 100U, data, 17U); ::memcpy(m_netLDU1 + 100U, data, 17U);
return; break;
case 0x67U: case 0x67U:
::memcpy(m_netLDU1 + 125U, data, 17U); ::memcpy(m_netLDU1 + 125U, data, 17U);
return; break;
case 0x68U: case 0x68U:
::memcpy(m_netLDU1 + 150U, data, 17U); ::memcpy(m_netLDU1 + 150U, data, 17U);
return; break;
case 0x69U: case 0x69U:
::memcpy(m_netLDU1 + 175U, data, 17U); ::memcpy(m_netLDU1 + 175U, data, 17U);
return; break;
case 0x6AU: case 0x6AU:
::memcpy(m_netLDU1 + 200U, data, 16U); ::memcpy(m_netLDU1 + 200U, data, 16U);
if (m_netState != RS_NET_IDLE) if (m_netState != RS_NET_IDLE)
createNetLDU1(); createNetLDU1();
return; break;
case 0x6BU: case 0x6BU:
::memcpy(m_netLDU2 + 0U, data, 22U); ::memcpy(m_netLDU2 + 0U, data, 22U);
return; break;
case 0x6CU: case 0x6CU:
::memcpy(m_netLDU2 + 25U, data, 14U); ::memcpy(m_netLDU2 + 25U, data, 14U);
return; break;
case 0x6DU: case 0x6DU:
::memcpy(m_netLDU2 + 50U, data, 17U); ::memcpy(m_netLDU2 + 50U, data, 17U);
return; break;
case 0x6EU: case 0x6EU:
::memcpy(m_netLDU2 + 75U, data, 17U); ::memcpy(m_netLDU2 + 75U, data, 17U);
return; break;
case 0x6FU: case 0x6FU:
::memcpy(m_netLDU2 + 100U, data, 17U); ::memcpy(m_netLDU2 + 100U, data, 17U);
return; break;
case 0x70U: case 0x70U:
::memcpy(m_netLDU2 + 125U, data, 17U); ::memcpy(m_netLDU2 + 125U, data, 17U);
return; break;
case 0x71U: case 0x71U:
::memcpy(m_netLDU2 + 150U, data, 17U); ::memcpy(m_netLDU2 + 150U, data, 17U);
return; break;
case 0x72U: case 0x72U:
::memcpy(m_netLDU2 + 175U, data, 17U); ::memcpy(m_netLDU2 + 175U, data, 17U);
return; break;
case 0x73U: case 0x73U:
::memcpy(m_netLDU2 + 200U, data, 16U); ::memcpy(m_netLDU2 + 200U, data, 16U);
if (m_netState != RS_NET_IDLE) { if (m_netState != RS_NET_IDLE) {
@@ -361,12 +379,9 @@ void CP25Control::writeNetwork()
createNetLDU1(); createNetLDU1();
} }
createNetLDU2(); createNetLDU2();
return; break;
case 0x00U:
createNetTerminator(data);
return;
default: default:
return; break;
} }
} }
@@ -430,7 +445,7 @@ void CP25Control::writeQueueNet(const unsigned char* data, unsigned int length)
m_queue.addData(data, len); m_queue.addData(data, len);
} }
void CP25Control::writeNetwork(const unsigned char *data, unsigned char type) void CP25Control::writeNetwork(const unsigned char *data, unsigned char type, bool end)
{ {
assert(data != NULL); assert(data != NULL);
@@ -446,10 +461,10 @@ void CP25Control::writeNetwork(const unsigned char *data, unsigned char type)
m_network->writeHeader(m_rfData); m_network->writeHeader(m_rfData);
break; break;
case P25_DUID_LDU1: case P25_DUID_LDU1:
m_network->writeLDU1(data, m_rfData, m_rfLSD); m_network->writeLDU1(data, m_rfData, m_rfLSD, end);
break; break;
case P25_DUID_LDU2: case P25_DUID_LDU2:
m_network->writeLDU2(data, m_rfData, m_rfLSD); m_network->writeLDU2(data, m_rfData, m_rfLSD, end);
break; break;
case P25_DUID_TERM: case P25_DUID_TERM:
case P25_DUID_TERM_LC: case P25_DUID_TERM_LC:
@@ -562,6 +577,7 @@ void CP25Control::createRFHeader()
m_rfBits = 1U; m_rfBits = 1U;
m_rfTimeout.start(); m_rfTimeout.start();
m_lastDUID = P25_DUID_HEADER; m_lastDUID = P25_DUID_HEADER;
::memset(m_rfLDU, 0x00U, P25_LDU_FRAME_LENGTH_BYTES);
#if defined(DUMP_P25) #if defined(DUMP_P25)
openFile(); openFile();
@@ -633,6 +649,11 @@ void CP25Control::createNetHeader()
void CP25Control::createNetLDU1() void CP25Control::createNetLDU1()
{ {
// Check for an unflushed LDU2
void* p = ::memchr(m_netLDU2, 0x02U, 9U * 25U);
if (p != NULL)
createNetLDU2();
insertMissingAudio(m_netLDU1); insertMissingAudio(m_netLDU1);
unsigned char buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U]; unsigned char buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U];
@@ -674,10 +695,19 @@ void CP25Control::createNetLDU1()
::memset(m_netLDU1, 0x00U, 9U * 25U); ::memset(m_netLDU1, 0x00U, 9U * 25U);
m_netFrames += 9U; m_netFrames += 9U;
// Check for an end of stream marker
if (m_netLDU1[200U] == 0x6AU && m_netLDU1[215U] == 0x00U)
createNetTerminator();
} }
void CP25Control::createNetLDU2() void CP25Control::createNetLDU2()
{ {
// Check for an unflushed LDU1
void* p = ::memchr(m_netLDU1, 0x02U, 9U * 25U);
if (p != NULL)
createNetLDU1();
insertMissingAudio(m_netLDU2); insertMissingAudio(m_netLDU2);
unsigned char buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U]; unsigned char buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U];
@@ -719,15 +749,14 @@ void CP25Control::createNetLDU2()
::memset(m_netLDU2, 0x00U, 9U * 25U); ::memset(m_netLDU2, 0x00U, 9U * 25U);
m_netFrames += 9U; m_netFrames += 9U;
// Check for an end of stream marker
if (m_netLDU2[200U] == 0x73U && m_netLDU2[215U] == 0x00U)
createNetTerminator();
} }
void CP25Control::createNetTerminator(const unsigned char* data) void CP25Control::createNetTerminator()
{ {
assert(data != NULL);
if (data[3U] != 0x25U)
return;
unsigned char buffer[P25_TERM_FRAME_LENGTH_BYTES + 2U]; unsigned char buffer[P25_TERM_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_TERM_FRAME_LENGTH_BYTES + 2U); ::memset(buffer, 0x00U, P25_TERM_FRAME_LENGTH_BYTES + 2U);

5
P25Control.h
View File

@@ -71,11 +71,12 @@ private:
unsigned char* m_netLDU1; unsigned char* m_netLDU1;
unsigned char* m_netLDU2; unsigned char* m_netLDU2;
unsigned char* m_lastIMBE; unsigned char* m_lastIMBE;
unsigned char* m_rfLDU;
FILE* m_fp; FILE* m_fp;
void writeQueueRF(const unsigned char* data, unsigned int length); void writeQueueRF(const unsigned char* data, unsigned int length);
void writeQueueNet(const unsigned char* data, unsigned int length); void writeQueueNet(const unsigned char* data, unsigned int length);
void writeNetwork(const unsigned char *data, unsigned char type); void writeNetwork(const unsigned char *data, unsigned char type, bool end);
void writeNetwork(); void writeNetwork();
void addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2); void addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2);
@@ -87,7 +88,7 @@ private:
void createNetHeader(); void createNetHeader();
void createNetLDU1(); void createNetLDU1();
void createNetLDU2(); void createNetLDU2();
void createNetTerminator(const unsigned char* data); void createNetTerminator();
bool openFile(); bool openFile();
bool writeFile(const unsigned char* data, unsigned char length); bool writeFile(const unsigned char* data, unsigned char length);

8
P25Network.cpp
View File

@@ -103,7 +103,7 @@ bool CP25Network::writeHeader(const CP25Data& control)
return true; return true;
} }
bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd) bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd, bool end)
{ {
assert(ldu1 != NULL); assert(ldu1 != NULL);
@@ -231,7 +231,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
buffer[1U] = lsd.getLSD1(); buffer[1U] = lsd.getLSD1();
buffer[2U] = lsd.getLSD2(); buffer[2U] = lsd.getLSD2();
m_audio.decode(ldu1, buffer + 4U, 8U); m_audio.decode(ldu1, buffer + 4U, 8U);
buffer[15U] = 0x02U; buffer[15U] = end ? 0x00U : 0x02U;
if (m_debug) if (m_debug)
CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 16U); CUtils::dump(1U, "P25 Network LDU1 Sent", buffer, 16U);
@@ -243,7 +243,7 @@ bool CP25Network::writeLDU1(const unsigned char* ldu1, const CP25Data& control,
return true; return true;
} }
bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd) bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd, bool end)
{ {
assert(ldu2 != NULL); assert(ldu2 != NULL);
@@ -377,7 +377,7 @@ bool CP25Network::writeLDU2(const unsigned char* ldu2, const CP25Data& control,
buffer[1U] = lsd.getLSD1(); buffer[1U] = lsd.getLSD1();
buffer[2U] = lsd.getLSD2(); buffer[2U] = lsd.getLSD2();
m_audio.decode(ldu2, buffer + 4U, 8U); m_audio.decode(ldu2, buffer + 4U, 8U);
buffer[15U] = 0x02U; buffer[15U] = end ? 0x00U : 0x02U;
if (m_debug) if (m_debug)
CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 16U); CUtils::dump(1U, "P25 Network LDU2 Sent", buffer, 16U);

4
P25Network.h
View File

@@ -39,9 +39,9 @@ public:
bool writeHeader(const CP25Data& control); bool writeHeader(const CP25Data& control);
bool writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd); bool writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd, bool end);
bool writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd); bool writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd, bool end);
bool writeTerminator(); bool writeTerminator();