ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-08-04 13:52:25 -04:00
Code Issues Projects Releases Wiki Activity

Change behaviour of RTCP packets.

Browse Source
This commit is contained in:
Jonathan Naylor 2020-04-09 19:57:59 +01:00
parent 9304e653c1
commit 2ce25c2d7c
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
NXDNGateway/KenwoodNetwork.cpp
View File

@ -73,8 +73,6 @@ bool CKenwoodNetwork::open()
return false; return false;
} }
m_timer.start();
m_ssrc = ::rand(); m_ssrc = ::rand();
return true; return true;
@ -119,14 +117,18 @@ bool CKenwoodNetwork::processIcomVoiceHeader(const unsigned char* inData)
outData[10U] = outData[20U] = inData[12U]; outData[10U] = outData[20U] = inData[12U];
outData[11U] = outData[21U] = inData[11U]; outData[11U] = outData[21U] = inData[11U];
switch (outData[5U] & 0x3FU) { unsigned short src = (inData[8U] << 8) + (inData[9U] << 0);
case 0x01U: { unsigned short dst = (inData[10U] << 8) + (inData[11U] << 0);
// XXX unsigned char type = (inData[7U] >> 5) & 0x07U;
uint16_t uid = (outData[7U] << 8) + (outData[8U] << 0);
uint16_t gid = (outData[9U] << 8) + (outData[10U] << 0); switch (inData[5U] & 0x3FU) {
case 0x01U:
m_timer.start();
writeRTCPData(type, src, dst);
return writeRTPVoiceHeader(outData); return writeRTPVoiceHeader(outData);
}
case 0x08U: case 0x08U:
m_timer.stop();
writeRTCPData(type, src, dst);
return writeRTPVoiceTrailer(outData); return writeRTPVoiceTrailer(outData);
default: default:
return false; return false;
@ -367,7 +369,7 @@ bool CKenwoodNetwork::writeRTCPPing()
return m_rtcpSocket.write(buffer, 28U, m_address, m_rtcpPort); return m_rtcpSocket.write(buffer, 28U, m_address, m_rtcpPort);
} }
bool CKenwoodNetwork::writeRTCPData(unsigned short src, unsigned short dst) bool CKenwoodNetwork::writeRTCPData(unsigned char type, unsigned short src, unsigned short dst)
{ {
unsigned char buffer[20U]; unsigned char buffer[20U];
::memset(buffer, 0x00U, 20U); ::memset(buffer, 0x00U, 20U);
@ -393,7 +395,7 @@ bool CKenwoodNetwork::writeRTCPData(unsigned short src, unsigned short dst)
buffer[14U] = (dst >> 8) & 0xFFU; buffer[14U] = (dst >> 8) & 0xFFU;
buffer[15U] = (dst >> 0) & 0xFFU; buffer[15U] = (dst >> 0) & 0xFFU;
buffer[16U] = 0x01U; buffer[16U] = type;
if (m_debug) if (m_debug)
CUtils::dump(1U, "Kenwood Network RTCP Data Sent", buffer, 20U); CUtils::dump(1U, "Kenwood Network RTCP Data Sent", buffer, 20U);
@ -411,20 +413,18 @@ bool CKenwoodNetwork::read(unsigned char* data)
unsigned int len = readRTP(data); unsigned int len = readRTP(data);
if (len > 0U) { if (len > 0U) {
switch (data[9U]) { switch (data[9U]) {
case 0x05U: { // Voice header or trailer case 0x05U: // Voice header or trailer
bool ret = processKenwoodVoiceHeader(data); return processKenwoodVoiceHeader(data);
if (!ret)
return false;
return true;
}
case 0x08U: // Voice data case 0x08U: // Voice data
processKenwoodVoiceData(data); processKenwoodVoiceData(data);
return true; return true;
default: default:
CUtils::dump(5U, "Unknown data received from the Kenwood network", data, len); break;
return false;
} }
} }
CUtils::dump(5U, "Unknown data received from the Kenwood network", data, len);
return false;
} }
unsigned int CKenwoodNetwork::readRTP(unsigned char* data) unsigned int CKenwoodNetwork::readRTP(unsigned char* data)
@ -547,12 +547,7 @@ bool CKenwoodNetwork::processKenwoodVoiceHeader(unsigned char* inData)
::memcpy(outData + 19U, temp, 12U); ::memcpy(outData + 19U, temp, 12U);
switch (outData[5U] & 0x3FU) { switch (outData[5U] & 0x3FU) {
case 0x01U: { case 0x01U:
unsigned short uid = (outData[8U] << 8) + (outData[9U] << 0);
unsigned short gid = (outData[10U] << 8) + (outData[11U] << 0);
::memcpy(inData, outData, 33U);
return true;
}
case 0x08U: case 0x08U:
::memcpy(inData, outData, 33U); ::memcpy(inData, outData, 33U);
return true; return true;

2
NXDNGateway/KenwoodNetwork.h
View File

@ -63,7 +63,7 @@ private:
bool writeRTPVoiceData(const unsigned char* data); bool writeRTPVoiceData(const unsigned char* data);
bool writeRTPVoiceTrailer(const unsigned char* data); bool writeRTPVoiceTrailer(const unsigned char* data);
bool writeRTCPPing(); bool writeRTCPPing();
bool writeRTCPData(unsigned short src, unsigned short dst); bool writeRTCPData(unsigned char type, unsigned short src, unsigned short dst);
unsigned int readRTP(unsigned char* data); unsigned int readRTP(unsigned char* data);
unsigned int readRTCP(unsigned char* data); unsigned int readRTCP(unsigned char* data);
}; };

2
NXDNGateway/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200406"; const char* VERSION = "20200409";
#endif #endif