ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-08-03 05:22:24 -04:00
Code Issues Projects Releases Wiki Activity

Clean up the Kenwood control data.

Browse Source
This commit is contained in:
Jonathan Naylor 2020-05-05 14:48:13 +01:00
parent 4f34393a63
commit d6e28630ff
3 changed files with 132 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
NXDNGateway/KenwoodNetwork.cpp
View File

@ -24,6 +24,7 @@
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
#include <ctime>
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 };
@ -39,11 +40,14 @@ m_stopWatch(),
m_address(), m_address(),
m_rtcpPort(rptPort + 1U), m_rtcpPort(rptPort + 1U),
m_rtpPort(rptPort + 0U), m_rtpPort(rptPort + 0U),
m_sessionId(0U),
m_seqNo(0U), m_seqNo(0U),
m_timeStamp(0U), m_timeStamp(0U),
m_ssrc(0U), m_ssrc(0U),
m_debug(debug), m_debug(debug),
m_timer(1000U, 0U, 200U) m_timer(1000U, 0U, 200U),
m_startSecs(0U),
m_startMSecs(0U)
{ {
assert(localPort > 0U); assert(localPort > 0U);
assert(!rptAddress.empty()); assert(!rptAddress.empty());
@ -124,11 +128,11 @@ bool CKenwoodNetwork::processIcomVoiceHeader(const unsigned char* inData)
switch (inData[5U] & 0x3FU) { switch (inData[5U] & 0x3FU) {
case 0x01U: case 0x01U:
m_timer.start(); m_timer.start();
writeRTCPData(type, src, dst); writeRTCPStart();
return writeRTPVoiceHeader(outData); return writeRTPVoiceHeader(outData);
case 0x08U: case 0x08U:
m_timer.stop(); m_timer.stop();
writeRTCPData(type, src, dst); writeRTCPHang(type, src, dst);
return writeRTPVoiceTrailer(outData); return writeRTPVoiceTrailer(outData);
default: default:
return false; return false;
@ -225,9 +229,9 @@ bool CKenwoodNetwork::writeRTPVoiceHeader(const unsigned char* data)
buffer[0U] = 0x80U; buffer[0U] = 0x80U;
buffer[1U] = 0x66U; buffer[1U] = 0x66U;
m_seqNo++;
buffer[2U] = (m_seqNo >> 8) & 0xFFU; buffer[2U] = (m_seqNo >> 8) & 0xFFU;
buffer[3U] = (m_seqNo >> 0) & 0xFFU; buffer[3U] = (m_seqNo >> 0) & 0xFFU;
m_seqNo++;
m_timeStamp = (unsigned long)m_stopWatch.time(); m_timeStamp = (unsigned long)m_stopWatch.time();
@ -235,13 +239,18 @@ bool CKenwoodNetwork::writeRTPVoiceHeader(const unsigned char* data)
buffer[5U] = (m_timeStamp >> 16) & 0xFFU; buffer[5U] = (m_timeStamp >> 16) & 0xFFU;
buffer[6U] = (m_timeStamp >> 8) & 0xFFU; buffer[6U] = (m_timeStamp >> 8) & 0xFFU;
buffer[7U] = (m_timeStamp >> 0) & 0xFFU; buffer[7U] = (m_timeStamp >> 0) & 0xFFU;
m_timeStamp += 640U;
buffer[8U] = (m_ssrc >> 24) & 0xFFU; buffer[8U] = (m_ssrc >> 24) & 0xFFU;
buffer[9U] = (m_ssrc >> 16) & 0xFFU; buffer[9U] = (m_ssrc >> 16) & 0xFFU;
buffer[10U] = (m_ssrc >> 8) & 0xFFU; buffer[10U] = (m_ssrc >> 8) & 0xFFU;
buffer[11U] = (m_ssrc >> 0) & 0xFFU; buffer[11U] = (m_ssrc >> 0) & 0xFFU;
m_sessionId++;
buffer[12U] = m_sessionId;
buffer[13U] = 0x00U;
buffer[14U] = 0x00U;
buffer[15U] = 0x00U;
buffer[16U] = 0x03U; buffer[16U] = 0x03U;
buffer[17U] = 0x03U; buffer[17U] = 0x03U;
buffer[18U] = 0x04U; buffer[18U] = 0x04U;
@ -268,9 +277,11 @@ bool CKenwoodNetwork::writeRTPVoiceTrailer(const unsigned char* data)
buffer[0U] = 0x80U; buffer[0U] = 0x80U;
buffer[1U] = 0x66U; buffer[1U] = 0x66U;
m_seqNo++;
buffer[2U] = (m_seqNo >> 8) & 0xFFU; buffer[2U] = (m_seqNo >> 8) & 0xFFU;
buffer[3U] = (m_seqNo >> 0) & 0xFFU; buffer[3U] = (m_seqNo >> 0) & 0xFFU;
m_timeStamp += 640U;
buffer[4U] = (m_timeStamp >> 24) & 0xFFU; buffer[4U] = (m_timeStamp >> 24) & 0xFFU;
buffer[5U] = (m_timeStamp >> 16) & 0xFFU; buffer[5U] = (m_timeStamp >> 16) & 0xFFU;
buffer[6U] = (m_timeStamp >> 8) & 0xFFU; buffer[6U] = (m_timeStamp >> 8) & 0xFFU;
@ -281,6 +292,11 @@ bool CKenwoodNetwork::writeRTPVoiceTrailer(const unsigned char* data)
buffer[10U] = (m_ssrc >> 8) & 0xFFU; buffer[10U] = (m_ssrc >> 8) & 0xFFU;
buffer[11U] = (m_ssrc >> 0) & 0xFFU; buffer[11U] = (m_ssrc >> 0) & 0xFFU;
buffer[12U] = m_sessionId;
buffer[13U] = 0x00U;
buffer[14U] = 0x00U;
buffer[15U] = 0x00U;
buffer[16U] = 0x03U; buffer[16U] = 0x03U;
buffer[17U] = 0x03U; buffer[17U] = 0x03U;
buffer[18U] = 0x04U; buffer[18U] = 0x04U;
@ -307,21 +323,26 @@ bool CKenwoodNetwork::writeRTPVoiceData(const unsigned char* data)
buffer[0U] = 0x80U; buffer[0U] = 0x80U;
buffer[1U] = 0x66U; buffer[1U] = 0x66U;
m_seqNo++;
buffer[2U] = (m_seqNo >> 8) & 0xFFU; buffer[2U] = (m_seqNo >> 8) & 0xFFU;
buffer[3U] = (m_seqNo >> 0) & 0xFFU; buffer[3U] = (m_seqNo >> 0) & 0xFFU;
m_seqNo++;
m_timeStamp += 640U;
buffer[4U] = (m_timeStamp >> 24) & 0xFFU; buffer[4U] = (m_timeStamp >> 24) & 0xFFU;
buffer[5U] = (m_timeStamp >> 16) & 0xFFU; buffer[5U] = (m_timeStamp >> 16) & 0xFFU;
buffer[6U] = (m_timeStamp >> 8) & 0xFFU; buffer[6U] = (m_timeStamp >> 8) & 0xFFU;
buffer[7U] = (m_timeStamp >> 0) & 0xFFU; buffer[7U] = (m_timeStamp >> 0) & 0xFFU;
m_timeStamp += 640U;
buffer[8U] = (m_ssrc >> 24) & 0xFFU; buffer[8U] = (m_ssrc >> 24) & 0xFFU;
buffer[9U] = (m_ssrc >> 16) & 0xFFU; buffer[9U] = (m_ssrc >> 16) & 0xFFU;
buffer[10U] = (m_ssrc >> 8) & 0xFFU; buffer[10U] = (m_ssrc >> 8) & 0xFFU;
buffer[11U] = (m_ssrc >> 0) & 0xFFU; buffer[11U] = (m_ssrc >> 0) & 0xFFU;
buffer[12U] = m_sessionId;
buffer[13U] = 0x00U;
buffer[14U] = 0x00U;
buffer[15U] = 0x00U;
buffer[16U] = 0x03U; buffer[16U] = 0x03U;
buffer[17U] = 0x02U; buffer[17U] = 0x02U;
buffer[18U] = 0x04U; buffer[18U] = 0x04U;
@ -338,14 +359,31 @@ bool CKenwoodNetwork::writeRTPVoiceData(const unsigned char* data)
return m_rtpSocket.write(buffer, 59U, m_address, m_rtpPort); return m_rtpSocket.write(buffer, 59U, m_address, m_rtpPort);
} }
bool CKenwoodNetwork::writeRTCPPing() bool CKenwoodNetwork::writeRTCPStart()
{ {
time_t now;
::time(&now);
m_startSecs = uint32_t(now);
#if defined(_WIN32) || defined(_WIN64)
SYSTEMTIME st;
::GetSystemTime(&st);
m_startMSecs = st.wMilliseconds;
#else
struct timeval tod;
::gettimeofday(&tod, NULL);
m_startMSecs = tod.tv_usec / 1000U;
#endif
unsigned char buffer[30U]; unsigned char buffer[30U];
::memset(buffer, 0x00U, 30U); ::memset(buffer, 0x00U, 30U);
buffer[0U] = 0x8AU; buffer[0U] = 0x8AU;
buffer[1U] = 0xCCU; buffer[1U] = 0xCCU;
buffer[2U] = 0x00U;
buffer[3U] = 0x06U; buffer[3U] = 0x06U;
buffer[4U] = (m_ssrc >> 24) & 0xFFU; buffer[4U] = (m_ssrc >> 24) & 0xFFU;
@ -358,10 +396,21 @@ bool CKenwoodNetwork::writeRTCPPing()
buffer[10U] = 'N'; buffer[10U] = 'N';
buffer[11U] = 'E'; buffer[11U] = 'E';
buffer[12U] = (m_startSecs >> 24) & 0xFFU;
buffer[13U] = (m_startSecs >> 16) & 0xFFU;
buffer[14U] = (m_startSecs >> 8) & 0xFFU;
buffer[15U] = (m_startSecs >> 0) & 0xFFU;
buffer[16U] = (m_startMSecs >> 24) & 0xFFU;
buffer[17U] = (m_startMSecs >> 16) & 0xFFU;
buffer[18U] = (m_startMSecs >> 8) & 0xFFU;
buffer[19U] = (m_startMSecs >> 0) & 0xFFU;
buffer[22U] = 0x02U; buffer[22U] = 0x02U;
buffer[24U] = 0x01U; buffer[24U] = 0x01U;
buffer[25U] = 0x01U;
buffer[27U] = 0x0AU;
if (m_debug) if (m_debug)
CUtils::dump(1U, "Kenwood Network RTCP Data Sent", buffer, 28U); CUtils::dump(1U, "Kenwood Network RTCP Data Sent", buffer, 28U);
@ -369,14 +418,56 @@ 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 char type, unsigned short src, unsigned short dst) bool CKenwoodNetwork::writeRTCPPing()
{ {
unsigned char buffer[20U]; unsigned char buffer[30U];
::memset(buffer, 0x00U, 20U); ::memset(buffer, 0x00U, 30U);
buffer[0U] = 0x8AU;
buffer[1U] = 0xCCU;
buffer[2U] = 0x00U;
buffer[3U] = 0x06U;
buffer[4U] = (m_ssrc >> 24) & 0xFFU;
buffer[5U] = (m_ssrc >> 16) & 0xFFU;
buffer[6U] = (m_ssrc >> 8) & 0xFFU;
buffer[7U] = (m_ssrc >> 0) & 0xFFU;
buffer[8U] = 'K';
buffer[9U] = 'W';
buffer[10U] = 'N';
buffer[11U] = 'E';
buffer[12U] = (m_startSecs >> 24) & 0xFFU;
buffer[13U] = (m_startSecs >> 16) & 0xFFU;
buffer[14U] = (m_startSecs >> 8) & 0xFFU;
buffer[15U] = (m_startSecs >> 0) & 0xFFU;
buffer[16U] = (m_startMSecs >> 24) & 0xFFU;
buffer[17U] = (m_startMSecs >> 16) & 0xFFU;
buffer[18U] = (m_startMSecs >> 8) & 0xFFU;
buffer[19U] = (m_startMSecs >> 0) & 0xFFU;
buffer[22U] = 0x02U;
buffer[24U] = 0x01U;
buffer[27U] = 0x7BU;
if (m_debug)
CUtils::dump(1U, "Kenwood Network RTCP Data Sent", buffer, 28U);
return m_rtcpSocket.write(buffer, 28U, m_address, m_rtcpPort);
}
bool CKenwoodNetwork::writeRTCPHang(unsigned char type, unsigned short src, unsigned short dst)
{
unsigned char buffer[30U];
::memset(buffer, 0x00U, 30U);
buffer[0U] = 0x8BU; buffer[0U] = 0x8BU;
buffer[1U] = 0xCCU; buffer[1U] = 0xCCU;
buffer[2U] = 0x00U;
buffer[3U] = 0x04U; buffer[3U] = 0x04U;
buffer[4U] = (m_ssrc >> 24) & 0xFFU; buffer[4U] = (m_ssrc >> 24) & 0xFFU;
@ -397,6 +488,10 @@ bool CKenwoodNetwork::writeRTCPData(unsigned char type, unsigned short src, unsi
buffer[16U] = type; buffer[16U] = type;
buffer[17U] = 0x00U;
buffer[18U] = 0x00U;
buffer[19U] = 0x00U;
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);

8
NXDNGateway/KenwoodNetwork.h
View File

@ -49,11 +49,14 @@ private:
in_addr m_address; in_addr m_address;
unsigned int m_rtcpPort; unsigned int m_rtcpPort;
unsigned int m_rtpPort; unsigned int m_rtpPort;
unsigned short m_seqNo; uint8_t m_sessionId;
uint16_t m_seqNo;
unsigned long m_timeStamp; unsigned long m_timeStamp;
unsigned int m_ssrc; unsigned int m_ssrc;
bool m_debug; bool m_debug;
CTimer m_timer; CTimer m_timer;
uint32_t m_startSecs;
uint32_t m_startMSecs;
bool processIcomVoiceHeader(const unsigned char* data); bool processIcomVoiceHeader(const unsigned char* data);
bool processIcomVoiceData(const unsigned char* data); bool processIcomVoiceData(const unsigned char* data);
@ -63,8 +66,9 @@ private:
bool writeRTPVoiceHeader(const unsigned char* data); bool writeRTPVoiceHeader(const unsigned char* data);
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 writeRTCPStart();
bool writeRTCPPing(); bool writeRTCPPing();
bool writeRTCPData(unsigned char type, unsigned short src, unsigned short dst); bool writeRTCPHang(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 = "20200504"; const char* VERSION = "20200505";
#endif #endif