From e78320fc18a0170df1dad16e58764872cd17c762 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 31 Jan 2018 07:55:59 +0000 Subject: [PATCH] More changes to the NXDN networking. --- NXDNControl.cpp | 24 ++++++++++++++---------- NXDNControl.h | 2 +- NXDNNetwork.cpp | 14 +++++++------- NXDNNetwork.h | 4 ++-- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/NXDNControl.cpp b/NXDNControl.cpp index e9dc931..cb697ba 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -180,8 +180,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne return false; } - if (m_rfState == RS_RF_LISTENING && !valid) - return false; + // if (m_rfState == RS_RF_LISTENING && !valid) + // return false; // XXX the FACCH1 data in the header may also be useful if (m_rfState == RS_RF_LISTENING) { @@ -248,7 +248,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne m_rfState = RS_RF_AUDIO; } - if (m_rfState == RS_RF_AUDIO) { + // if (m_rfState == RS_RF_AUDIO) { // Regenerate the sync CSync::addNXDNSync(data + 2U); @@ -346,7 +346,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(data + 2U); - writeNetwork(data, m_rfFrames % 128U); + // writeNetwork(data, m_rfFrames, ); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -358,7 +358,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne m_rfFrames++; m_display->writeNXDNRSSI(m_rssi); - } + // } #ifdef notdef // Process end of audio here @@ -468,7 +468,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) data[0U] = TAG_DATA; data[1U] = 0x00U; - writeNetwork(data, m_rfFrames % 128U); + writeNetwork(data, m_rfFrames); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -507,7 +507,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) data[0U] = TAG_EOT; data[1U] = 0x00U; - writeNetwork(data, m_rfFrames % 128U); + writeNetwork(data, m_rfFrames); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -557,7 +557,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) data[0U] = TAG_DATA; data[1U] = 0x00U; - writeNetwork(data, m_rfFrames % 128U); + writeNetwork(data, m_rfFrames); if (m_duplex) { fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); @@ -825,7 +825,7 @@ void CNXDNControl::writeQueueNet(const unsigned char *data) m_queue.addData(data, len); } -void CNXDNControl::writeNetwork(const unsigned char *data, unsigned int count) +void CNXDNControl::writeNetwork(const unsigned char *data, unsigned int count, bool end) { assert(data != NULL); @@ -835,7 +835,11 @@ void CNXDNControl::writeNetwork(const unsigned char *data, unsigned int count) if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) return; - // m_network->write(data + 2U, count, data[0U] == TAG_EOT); + unsigned short srcId = m_rfSACCHMessage.getSourceUnitId(); + unsigned short dstId = m_rfSACCHMessage.getDestinationGroupId(); + bool grp = m_rfSACCHMessage.getIsGroup(); + + m_network->write(data + 2U, srcId, grp, dstId, count % 256U, end); } void CNXDNControl::scrambler(unsigned char* data) const diff --git a/NXDNControl.h b/NXDNControl.h index f181b81..da97aeb 100644 --- a/NXDNControl.h +++ b/NXDNControl.h @@ -86,7 +86,7 @@ private: void writeQueueRF(const unsigned char* data); void writeQueueNet(const unsigned char* data); - void writeNetwork(const unsigned char* data, unsigned int count); + void writeNetwork(const unsigned char* data, unsigned int count, bool end); void writeNetwork(); void scrambler(unsigned char* data) const; diff --git a/NXDNNetwork.cpp b/NXDNNetwork.cpp index 8d3ee92..6453829 100644 --- a/NXDNNetwork.cpp +++ b/NXDNNetwork.cpp @@ -56,7 +56,7 @@ bool CNXDNNetwork::open() return m_socket.open(); } -bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, unsigned int cnt, bool end) +bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, unsigned char cnt, bool end) { assert(data != NULL); @@ -71,13 +71,13 @@ bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp buffer[5U] = (src >> 8) & 0xFFU; buffer[6U] = (src >> 8) & 0xFFU; - buffer[7U] = grp ? 0x01U : 0x00U; + buffer[7U] = grp ? 0x01U : 0x00U; + buffer[7U] |= end ? 0x80U : 0x00U; buffer[8U] = (dst >> 8) & 0xFFU; buffer[9U] = (dst >> 8) & 0xFFU; - buffer[10U] = end ? 0x80U : 0x00U; - buffer[10U] |= (cnt & 0x7FU) << 1; + buffer[10U] = cnt; ::memcpy(buffer + 11U, data, NXDN_FRAME_LENGTH_BYTES); @@ -142,7 +142,7 @@ void CNXDNNetwork::clock(unsigned int ms) m_buffer.addData(buffer, 59U); } -unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, unsigned int& cnt, bool& end) +unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, unsigned char& cnt, bool& end) { assert(data != NULL); @@ -154,10 +154,10 @@ unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& src = (buffer[5U] << 8) + buffer[6U]; grp = (buffer[7U] & 0x01U) == 0x01U; + end = (buffer[7U] & 0x80U) == 0x80U; dst = (buffer[8U] << 8) + buffer[9U]; - end = (buffer[10U] & 0x80U) == 0x80U; - cnt = buffer[10U] & 0x7FU; + cnt = buffer[10U]; ::memcpy(data, buffer + 11U, NXDN_FRAME_LENGTH_BYTES); diff --git a/NXDNNetwork.h b/NXDNNetwork.h index 15f59f4..c69602a 100644 --- a/NXDNNetwork.h +++ b/NXDNNetwork.h @@ -36,9 +36,9 @@ public: void enable(bool enabled); - bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, unsigned int cnt, bool end); + bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, unsigned char cnt, bool end); - unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, unsigned int& cnt, bool& end); + unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, unsigned char& cnt, bool& end); void reset();