Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor network data buffer sizes;

Browse Source
pull/39/head
Bryan Biedenkapp 3 years ago
parent edb2529f68
commit 4f6fcd421b
3 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File

67
src/network/BaseNetwork.cpp
Unescape View File

@ -125,8 +125,8 @@ bool BaseNetwork::writeGrantReq(const uint8_t mode, const uint32_t srcId, const
if (m_status != NET_STAT_RUNNING && m_status != NET_STAT_MST_RUNNING) if (m_status != NET_STAT_RUNNING && m_status != NET_STAT_MST_RUNNING)
return false; return false;
uint8_t buffer[DATA_PACKET_LENGTH]; uint8_t buffer[MSG_HDR_SIZE];
::memset(buffer, 0x00U, DATA_PACKET_LENGTH); ::memset(buffer, 0x00U, MSG_HDR_SIZE);
__SET_UINT32(srcId, buffer, 11U); // Source Address __SET_UINT32(srcId, buffer, 11U); // Source Address
__SET_UINT32(dstId, buffer, 15U); // Destination Address __SET_UINT32(dstId, buffer, 15U); // Destination Address
@ -137,7 +137,7 @@ bool BaseNetwork::writeGrantReq(const uint8_t mode, const uint32_t srcId, const
buffer[20U] = mode; // DVM Mode State buffer[20U] = mode; // DVM Mode State
return writeMaster({ NET_FUNC_GRANT_REQ, NET_SUBFUNC_NOP }, buffer, 21U, 0U, 0U); return writeMaster({ NET_FUNC_GRANT_REQ, NET_SUBFUNC_NOP }, buffer, MSG_HDR_SIZE, 0U, 0U);
} }
/// <summary> /// <summary>
@ -631,8 +631,8 @@ uint16_t BaseNetwork::pktSeq(bool reset)
/// <returns></returns> /// <returns></returns>
UInt8Array BaseNetwork::createDMR_Message(uint32_t& length, const uint32_t streamId, const dmr::data::Data& data) UInt8Array BaseNetwork::createDMR_Message(uint32_t& length, const uint32_t streamId, const dmr::data::Data& data)
{ {
uint8_t* buffer = new uint8_t[DATA_PACKET_LENGTH]; uint8_t* buffer = new uint8_t[DMR_PACKET_LENGTH + PACKET_PAD];
::memset(buffer, 0x00U, DATA_PACKET_LENGTH); ::memset(buffer, 0x00U, DMR_PACKET_LENGTH + PACKET_PAD);
// construct DMR message header // construct DMR message header
::memcpy(buffer + 0U, TAG_DMR_DATA, 4U); ::memcpy(buffer + 0U, TAG_DMR_DATA, 4U);
@ -676,9 +676,9 @@ UInt8Array BaseNetwork::createDMR_Message(uint32_t& length, const uint32_t strea
data.getData(buffer + 20U); data.getData(buffer + 20U);
if (m_debug) if (m_debug)
Utils::dump(1U, "Network Message, DMR", buffer, (DMR_PACKET_SIZE + PACKET_PAD)); Utils::dump(1U, "Network Message, DMR", buffer, (DMR_PACKET_LENGTH + PACKET_PAD));
length = (DMR_PACKET_SIZE + PACKET_PAD); length = (DMR_PACKET_LENGTH + PACKET_PAD);
return UInt8Array(buffer); return UInt8Array(buffer);
} }
@ -720,7 +720,9 @@ void BaseNetwork::createP25_MessageHdr(uint8_t* data, uint8_t duid, const p25::l
data[22U] = duid; // DUID data[22U] = duid; // DUID
data[180U] = frameType; // DVM Frame Type if (frameType != p25::P25_FT_TERMINATOR) {
data[180U] = frameType; // DVM Frame Type
}
// is this the first frame of a call? // is this the first frame of a call?
if (frameType == p25::P25_FT_HDU_VALID) { if (frameType == p25::P25_FT_HDU_VALID) {
@ -761,14 +763,14 @@ UInt8Array BaseNetwork::createP25_LDU1Message(uint32_t& length, const p25::lc::L
p25::dfsi::LC dfsiLC = p25::dfsi::LC(control, lsd); p25::dfsi::LC dfsiLC = p25::dfsi::LC(control, lsd);
uint8_t* buffer = new uint8_t[DATA_PACKET_LENGTH]; uint8_t* buffer = new uint8_t[P25_LDU1_PACKET_LENGTH + PACKET_PAD];
::memset(buffer, 0x00U, DATA_PACKET_LENGTH); ::memset(buffer, 0x00U, P25_LDU1_PACKET_LENGTH + PACKET_PAD);
// construct P25 message header // construct P25 message header
createP25_MessageHdr(buffer, p25::P25_DUID_LDU1, control, lsd, frameType); createP25_MessageHdr(buffer, p25::P25_DUID_LDU1, control, lsd, frameType);
// pack DFSI data // pack DFSI data
uint32_t count = P25_MSG_HDR_SIZE; uint32_t count = MSG_HDR_SIZE;
uint8_t imbe[p25::P25_RAW_IMBE_LENGTH_BYTES]; uint8_t imbe[p25::P25_RAW_IMBE_LENGTH_BYTES];
dfsiLC.setFrameType(p25::dfsi::P25_DFSI_LDU1_VOICE1); dfsiLC.setFrameType(p25::dfsi::P25_DFSI_LDU1_VOICE1);
@ -819,9 +821,9 @@ UInt8Array BaseNetwork::createP25_LDU1Message(uint32_t& length, const p25::lc::L
buffer[23U] = count; buffer[23U] = count;
if (m_debug) if (m_debug)
Utils::dump(1U, "Network Message, P25 LDU1", buffer, (count + 15U + PACKET_PAD)); Utils::dump(1U, "Network Message, P25 LDU1", buffer, (P25_LDU1_PACKET_LENGTH + PACKET_PAD));
length = (count + 15U + PACKET_PAD); length = (P25_LDU1_PACKET_LENGTH + PACKET_PAD);
return UInt8Array(buffer); return UInt8Array(buffer);
} }
@ -840,14 +842,14 @@ UInt8Array BaseNetwork::createP25_LDU2Message(uint32_t& length, const p25::lc::L
p25::dfsi::LC dfsiLC = p25::dfsi::LC(control, lsd); p25::dfsi::LC dfsiLC = p25::dfsi::LC(control, lsd);
uint8_t* buffer = new uint8_t[DATA_PACKET_LENGTH]; uint8_t* buffer = new uint8_t[P25_LDU2_PACKET_LENGTH + PACKET_PAD];
::memset(buffer, 0x00U, DATA_PACKET_LENGTH); ::memset(buffer, 0x00U, P25_LDU2_PACKET_LENGTH + PACKET_PAD);
// construct P25 message header // construct P25 message header
createP25_MessageHdr(buffer, p25::P25_DUID_LDU2, control, lsd, p25::P25_FT_DATA_UNIT); createP25_MessageHdr(buffer, p25::P25_DUID_LDU2, control, lsd, p25::P25_FT_DATA_UNIT);
// pack DFSI data // pack DFSI data
uint32_t count = P25_MSG_HDR_SIZE; uint32_t count = MSG_HDR_SIZE;
uint8_t imbe[p25::P25_RAW_IMBE_LENGTH_BYTES]; uint8_t imbe[p25::P25_RAW_IMBE_LENGTH_BYTES];
dfsiLC.setFrameType(p25::dfsi::P25_DFSI_LDU2_VOICE10); dfsiLC.setFrameType(p25::dfsi::P25_DFSI_LDU2_VOICE10);
@ -898,9 +900,9 @@ UInt8Array BaseNetwork::createP25_LDU2Message(uint32_t& length, const p25::lc::L
buffer[23U] = count; buffer[23U] = count;
if (m_debug) if (m_debug)
Utils::dump(1U, "Network Message, P25 LDU2", buffer, (count + PACKET_PAD)); Utils::dump(1U, "Network Message, P25 LDU2", buffer, (P25_LDU2_PACKET_LENGTH + PACKET_PAD));
length = (count + PACKET_PAD); length = (P25_LDU2_PACKET_LENGTH + PACKET_PAD);
return UInt8Array(buffer); return UInt8Array(buffer);
} }
@ -913,19 +915,18 @@ UInt8Array BaseNetwork::createP25_LDU2Message(uint32_t& length, const p25::lc::L
/// <returns></returns> /// <returns></returns>
UInt8Array BaseNetwork::createP25_TDUMessage(uint32_t& length, const p25::lc::LC& control, const p25::data::LowSpeedData& lsd) UInt8Array BaseNetwork::createP25_TDUMessage(uint32_t& length, const p25::lc::LC& control, const p25::data::LowSpeedData& lsd)
{ {
uint8_t* buffer = new uint8_t[DATA_PACKET_LENGTH]; uint8_t* buffer = new uint8_t[MSG_HDR_SIZE + PACKET_PAD];
::memset(buffer, 0x00U, DATA_PACKET_LENGTH); ::memset(buffer, 0x00U, MSG_HDR_SIZE + PACKET_PAD);
// construct P25 message header // construct P25 message header
createP25_MessageHdr(buffer, p25::P25_DUID_TDU, control, lsd, p25::P25_FT_DATA_UNIT); createP25_MessageHdr(buffer, p25::P25_DUID_TDU, control, lsd, p25::P25_FT_TERMINATOR);
uint32_t count = P25_MSG_HDR_SIZE; buffer[23U] = MSG_HDR_SIZE;
buffer[23U] = count;
if (m_debug) if (m_debug)
Utils::dump(1U, "Network Message, P25 TDU", buffer, (count + PACKET_PAD)); Utils::dump(1U, "Network Message, P25 TDU", buffer, (MSG_HDR_SIZE + PACKET_PAD));
length = (count + PACKET_PAD); length = (MSG_HDR_SIZE + PACKET_PAD);
return UInt8Array(buffer); return UInt8Array(buffer);
} }
@ -940,15 +941,15 @@ UInt8Array BaseNetwork::createP25_TSDUMessage(uint32_t& length, const p25::lc::L
{ {
assert(data != nullptr); assert(data != nullptr);
uint8_t* buffer = new uint8_t[DATA_PACKET_LENGTH]; uint8_t* buffer = new uint8_t[P25_TSDU_PACKET_LENGTH + PACKET_PAD];
::memset(buffer, 0x00U, DATA_PACKET_LENGTH); ::memset(buffer, 0x00U, P25_TSDU_PACKET_LENGTH + PACKET_PAD);
// construct P25 message header // construct P25 message header
p25::data::LowSpeedData lsd = p25::data::LowSpeedData(); p25::data::LowSpeedData lsd = p25::data::LowSpeedData();
createP25_MessageHdr(buffer, p25::P25_DUID_TSDU, control, lsd, p25::P25_FT_DATA_UNIT); createP25_MessageHdr(buffer, p25::P25_DUID_TSDU, control, lsd, p25::P25_FT_TERMINATOR);
// pack raw P25 TSDU bytes // pack raw P25 TSDU bytes
uint32_t count = P25_MSG_HDR_SIZE; uint32_t count = MSG_HDR_SIZE;
::memcpy(buffer + 24U, data, p25::P25_TSDU_FRAME_LENGTH_BYTES); ::memcpy(buffer + 24U, data, p25::P25_TSDU_FRAME_LENGTH_BYTES);
count += p25::P25_TSDU_FRAME_LENGTH_BYTES; count += p25::P25_TSDU_FRAME_LENGTH_BYTES;
@ -956,9 +957,9 @@ UInt8Array BaseNetwork::createP25_TSDUMessage(uint32_t& length, const p25::lc::L
buffer[23U] = count; buffer[23U] = count;
if (m_debug) if (m_debug)
Utils::dump(1U, "Network Message, P25 TDSU", buffer, (count + PACKET_PAD)); Utils::dump(1U, "Network Message, P25 TDSU", buffer, (P25_TSDU_PACKET_LENGTH + PACKET_PAD));
length = (count + PACKET_PAD); length = (P25_TSDU_PACKET_LENGTH + PACKET_PAD);
return UInt8Array(buffer); return UInt8Array(buffer);
} }
@ -1002,7 +1003,7 @@ UInt8Array BaseNetwork::createP25_PDUMessage(uint32_t& length, const p25::data::
buffer[22U] = p25::P25_DUID_PDU; // DUID buffer[22U] = p25::P25_DUID_PDU; // DUID
// pack raw P25 PDU bytes // pack raw P25 PDU bytes
uint32_t count = P25_MSG_HDR_SIZE; uint32_t count = MSG_HDR_SIZE;
::memcpy(buffer + 24U, data, len); ::memcpy(buffer + 24U, data, len);
count += len; count += len;
@ -1045,7 +1046,7 @@ UInt8Array BaseNetwork::createNXDN_Message(uint32_t& length, const nxdn::lc::RTC
buffer[15U] |= lc.getGroup() ? 0x00U : 0x40U; // Group buffer[15U] |= lc.getGroup() ? 0x00U : 0x40U; // Group
// pack raw NXDN message bytes // pack raw NXDN message bytes
uint32_t count = NXDN_MSG_HDR_SIZE; uint32_t count = MSG_HDR_SIZE;
::memcpy(buffer + 24U, data, len); ::memcpy(buffer + 24U, data, len);
count += len; count += len;

9
src/network/BaseNetwork.h
Unescape View File

@ -81,10 +81,13 @@ namespace network
// Constants // Constants
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const uint32_t DMR_PACKET_SIZE = 55U;
const uint32_t PACKET_PAD = 8U; const uint32_t PACKET_PAD = 8U;
const uint32_t P25_MSG_HDR_SIZE = 24U;
const uint32_t NXDN_MSG_HDR_SIZE = 24U; const uint32_t MSG_HDR_SIZE = 24U;
const uint32_t DMR_PACKET_LENGTH = 55U; // 20 byte header + DMR_FRAME_LENGTH_BYTES + 2 byte trailer
const uint32_t P25_LDU1_PACKET_LENGTH = 193U; // 24 byte header + DFSI data + 1 byte frame type + 12 byte enc sync
const uint32_t P25_LDU2_PACKET_LENGTH = 181U; // 24 byte header + DFSI data + 1 byte frame type
const uint32_t P25_TSDU_PACKET_LENGTH = 69U; // 24 byte header + TSDU data
const uint8_t NET_SUBFUNC_NOP = 0xFFU; // No Operation Sub-Function const uint8_t NET_SUBFUNC_NOP = 0xFFU; // No Operation Sub-Function

1
src/p25/P25Defines.h
Unescape View File

@ -206,6 +206,7 @@ namespace p25
const uint8_t P25_FT_HDU_VALID = 0x01U; const uint8_t P25_FT_HDU_VALID = 0x01U;
const uint8_t P25_FT_HDU_LATE_ENTRY = 0x02U; const uint8_t P25_FT_HDU_LATE_ENTRY = 0x02U;
const uint8_t P25_FT_TERMINATOR = 0x03U;
const uint8_t P25_FT_DATA_UNIT = 0x00U; const uint8_t P25_FT_DATA_UNIT = 0x00U;
// PDU Format Type(s) // PDU Format Type(s)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.