Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle missing P25 network frames better.

Browse source
This commit is contained in:
Jonathan Naylor 2016-10-04 18:37:08 +01:00
parent e14f1bf2e6
commit cb07423092
3 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MMDVM.ini
View file

@ -77,8 +77,6 @@ TGRewriteSlot1=0
TGRewriteSlot2=0 TGRewriteSlot2=0
BMAutoRewrite=0 BMAutoRewrite=0
BMRewriteReflectorVoicePrompts=0 BMRewriteReflectorVoicePrompts=0
DirectDial=0 DirectDial=0
TargetTG=9 TargetTG=9
#RewriteMapSlot1= #RewriteMapSlot1=

53
P25Control.cpp
View file

@ -313,61 +313,73 @@ 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);
checkNetLDU2();
break; break;
case 0x63U: case 0x63U:
::memcpy(m_netLDU1 + 25U, data, 14U); ::memcpy(m_netLDU1 + 25U, data, 14U);
checkNetLDU2();
break; break;
case 0x64U: case 0x64U:
::memcpy(m_netLDU1 + 50U, data, 17U); ::memcpy(m_netLDU1 + 50U, data, 17U);
checkNetLDU2();
break; break;
case 0x65U: case 0x65U:
::memcpy(m_netLDU1 + 75U, data, 17U); ::memcpy(m_netLDU1 + 75U, data, 17U);
checkNetLDU2();
break; break;
case 0x66U: case 0x66U:
::memcpy(m_netLDU1 + 100U, data, 17U); ::memcpy(m_netLDU1 + 100U, data, 17U);
checkNetLDU2();
break; break;
case 0x67U: case 0x67U:
::memcpy(m_netLDU1 + 125U, data, 17U); ::memcpy(m_netLDU1 + 125U, data, 17U);
checkNetLDU2();
break; break;
case 0x68U: case 0x68U:
::memcpy(m_netLDU1 + 150U, data, 17U); ::memcpy(m_netLDU1 + 150U, data, 17U);
checkNetLDU2();
break; break;
case 0x69U: case 0x69U:
::memcpy(m_netLDU1 + 175U, data, 17U); ::memcpy(m_netLDU1 + 175U, data, 17U);
checkNetLDU2();
break; break;
case 0x6AU: case 0x6AU:
::memcpy(m_netLDU1 + 200U, data, 16U); ::memcpy(m_netLDU1 + 200U, data, 16U);
if (m_netState != RS_NET_IDLE) { checkNetLDU2();
// Check for an unflushed LDU2 if (m_netState != RS_NET_IDLE)
void* p = ::memchr(m_netLDU2, 0x02U, 9U * 25U);
if (p != NULL)
createNetLDU2();
createNetLDU1(); createNetLDU1();
}
break; break;
case 0x6BU: case 0x6BU:
::memcpy(m_netLDU2 + 0U, data, 22U); ::memcpy(m_netLDU2 + 0U, data, 22U);
checkNetLDU1();
break; break;
case 0x6CU: case 0x6CU:
::memcpy(m_netLDU2 + 25U, data, 14U); ::memcpy(m_netLDU2 + 25U, data, 14U);
checkNetLDU1();
break; break;
case 0x6DU: case 0x6DU:
::memcpy(m_netLDU2 + 50U, data, 17U); ::memcpy(m_netLDU2 + 50U, data, 17U);
checkNetLDU1();
break; break;
case 0x6EU: case 0x6EU:
::memcpy(m_netLDU2 + 75U, data, 17U); ::memcpy(m_netLDU2 + 75U, data, 17U);
checkNetLDU1();
break; break;
case 0x6FU: case 0x6FU:
::memcpy(m_netLDU2 + 100U, data, 17U); ::memcpy(m_netLDU2 + 100U, data, 17U);
checkNetLDU1();
break; break;
case 0x70U: case 0x70U:
::memcpy(m_netLDU2 + 125U, data, 17U); ::memcpy(m_netLDU2 + 125U, data, 17U);
checkNetLDU1();
break; break;
case 0x71U: case 0x71U:
::memcpy(m_netLDU2 + 150U, data, 17U); ::memcpy(m_netLDU2 + 150U, data, 17U);
checkNetLDU1();
break; break;
case 0x72U: case 0x72U:
::memcpy(m_netLDU2 + 175U, data, 17U); ::memcpy(m_netLDU2 + 175U, data, 17U);
checkNetLDU1();
break; break;
case 0x73U: case 0x73U:
::memcpy(m_netLDU2 + 200U, data, 16U); ::memcpy(m_netLDU2 + 200U, data, 16U);
@ -375,10 +387,7 @@ void CP25Control::writeNetwork()
createNetHeader(); createNetHeader();
createNetLDU1(); createNetLDU1();
} else { } else {
// Check for an unflushed LDU1 checkNetLDU1();
void* p = ::memchr(m_netLDU1, 0x02U, 9U * 25U);
if (p != NULL)
createNetLDU1();
} }
createNetLDU2(); createNetLDU2();
break; break;
@ -484,6 +493,30 @@ void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1,
} }
} }
void CP25Control::checkNetLDU1()
{
if (m_netState == RS_NET_IDLE)
return;
// Check for an unflushed LDU1
if (m_netLDU1[0U] != 0x00U || m_netLDU1[25U] != 0x00U || m_netLDU1[50U] != 0x00U ||
m_netLDU1[75U] != 0x00U || m_netLDU1[100U] != 0x00U || m_netLDU1[125U] != 0x00U ||
m_netLDU1[150U] != 0x00U || m_netLDU1[175U] != 0x00U || m_netLDU1[200U] != 0x00U)
createNetLDU1();
}
void CP25Control::checkNetLDU2()
{
if (m_netState == RS_NET_IDLE)
return;
// Check for an unflushed LDU1
if (m_netLDU2[0U] != 0x00U || m_netLDU2[25U] != 0x00U || m_netLDU2[50U] != 0x00U ||
m_netLDU2[75U] != 0x00U || m_netLDU2[100U] != 0x00U || m_netLDU2[125U] != 0x00U ||
m_netLDU2[150U] != 0x00U || m_netLDU2[175U] != 0x00U || m_netLDU2[200U] != 0x00U)
createNetLDU2();
}
void CP25Control::insertMissingAudio(unsigned char* data) void CP25Control::insertMissingAudio(unsigned char* data)
{ {
if (data[0U] == 0x00U) { if (data[0U] == 0x00U) {

3
P25Control.h
View file

@ -81,6 +81,9 @@ private:
void addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2); void addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2);
void checkNetLDU1();
void checkNetLDU2();
void insertMissingAudio(unsigned char* data); void insertMissingAudio(unsigned char* data);
void createRFHeader(); void createRFHeader();