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

More changes to the NXDN networking.

Browse source
This commit is contained in:
Jonathan Naylor 2018-01-31 07:55:59 +00:00
parent f048caa597
commit e78320fc18
4 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
NXDNControl.cpp
View file

@ -180,8 +180,8 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
return false; return false;
} }
if (m_rfState == RS_RF_LISTENING && !valid) // if (m_rfState == RS_RF_LISTENING && !valid)
return false; // return false;
// XXX the FACCH1 data in the header may also be useful // XXX the FACCH1 data in the header may also be useful
if (m_rfState == RS_RF_LISTENING) { 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; m_rfState = RS_RF_AUDIO;
} }
if (m_rfState == RS_RF_AUDIO) { // if (m_rfState == RS_RF_AUDIO) {
// Regenerate the sync // Regenerate the sync
CSync::addNXDNSync(data + 2U); CSync::addNXDNSync(data + 2U);
@ -346,7 +346,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
scrambler(data + 2U); scrambler(data + 2U);
writeNetwork(data, m_rfFrames % 128U); // writeNetwork(data, m_rfFrames, );
#if defined(DUMP_NXDN) #if defined(DUMP_NXDN)
writeFile(data + 2U); writeFile(data + 2U);
@ -358,7 +358,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
m_rfFrames++; m_rfFrames++;
m_display->writeNXDNRSSI(m_rssi); m_display->writeNXDNRSSI(m_rssi);
} // }
#ifdef notdef #ifdef notdef
// Process end of audio here // Process end of audio here
@ -468,7 +468,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data)
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
writeNetwork(data, m_rfFrames % 128U); writeNetwork(data, m_rfFrames);
#if defined(DUMP_NXDN) #if defined(DUMP_NXDN)
writeFile(data + 2U); writeFile(data + 2U);
@ -507,7 +507,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data)
data[0U] = TAG_EOT; data[0U] = TAG_EOT;
data[1U] = 0x00U; data[1U] = 0x00U;
writeNetwork(data, m_rfFrames % 128U); writeNetwork(data, m_rfFrames);
#if defined(DUMP_NXDN) #if defined(DUMP_NXDN)
writeFile(data + 2U); writeFile(data + 2U);
@ -557,7 +557,7 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data)
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
writeNetwork(data, m_rfFrames % 128U); writeNetwork(data, m_rfFrames);
if (m_duplex) { if (m_duplex) {
fich.setMR(m_remoteGateway ? YSF_MR_NOT_BUSY : YSF_MR_BUSY); 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); 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); assert(data != NULL);
@ -835,7 +835,11 @@ void CNXDNControl::writeNetwork(const unsigned char *data, unsigned int count)
if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired()) if (m_rfTimeoutTimer.isRunning() && m_rfTimeoutTimer.hasExpired())
return; 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 void CNXDNControl::scrambler(unsigned char* data) const

2
NXDNControl.h
View file

@ -86,7 +86,7 @@ private:
void writeQueueRF(const unsigned char* data); void writeQueueRF(const unsigned char* data);
void writeQueueNet(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 writeNetwork();
void scrambler(unsigned char* data) const; void scrambler(unsigned char* data) const;

14
NXDNNetwork.cpp
View file

@ -56,7 +56,7 @@ bool CNXDNNetwork::open()
return m_socket.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); 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[5U] = (src >> 8) & 0xFFU;
buffer[6U] = (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[8U] = (dst >> 8) & 0xFFU;
buffer[9U] = (dst >> 8) & 0xFFU; buffer[9U] = (dst >> 8) & 0xFFU;
buffer[10U] = end ? 0x80U : 0x00U; buffer[10U] = cnt;
buffer[10U] |= (cnt & 0x7FU) << 1;
::memcpy(buffer + 11U, data, NXDN_FRAME_LENGTH_BYTES); ::memcpy(buffer + 11U, data, NXDN_FRAME_LENGTH_BYTES);
@ -142,7 +142,7 @@ void CNXDNNetwork::clock(unsigned int ms)
m_buffer.addData(buffer, 59U); 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); assert(data != NULL);
@ -154,10 +154,10 @@ unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool&
src = (buffer[5U] << 8) + buffer[6U]; src = (buffer[5U] << 8) + buffer[6U];
grp = (buffer[7U] & 0x01U) == 0x01U; grp = (buffer[7U] & 0x01U) == 0x01U;
end = (buffer[7U] & 0x80U) == 0x80U;
dst = (buffer[8U] << 8) + buffer[9U]; dst = (buffer[8U] << 8) + buffer[9U];
end = (buffer[10U] & 0x80U) == 0x80U; cnt = buffer[10U];
cnt = buffer[10U] & 0x7FU;
::memcpy(data, buffer + 11U, NXDN_FRAME_LENGTH_BYTES); ::memcpy(data, buffer + 11U, NXDN_FRAME_LENGTH_BYTES);

4
NXDNNetwork.h
View file

@ -36,9 +36,9 @@ public:
void enable(bool enabled); 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(); void reset();