g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish off the networking interface.

Browse source
This commit is contained in:
Jonathan Naylor 2018-02-06 20:40:29 +00:00
parent 9fcc4b59eb
commit 9e83f577a6
3 changed files with 184 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

183
NXDNControl.cpp
View file

@ -238,7 +238,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne
if (m_duplex) if (m_duplex)
writeQueueRF(data); writeQueueRF(data);
if (type == NXDN_MESSAGE_TYPE_TX_REL) { if (data[0U] == TAG_EOT) {
m_rfFrames++; m_rfFrames++;
if (m_rssi != 0U) if (m_rssi != 0U)
LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount);
@ -681,17 +681,189 @@ void CNXDNControl::writeEndNet()
void CNXDNControl::writeNetwork() void CNXDNControl::writeNetwork()
{ {
#ifdef notdef unsigned short srcId = 0U;
unsigned short dstId = 0U;
unsigned char count = 0U;
bool grp = false;
bool dat = false;
bool efr = false;
bool end = false;
unsigned char data[200U]; unsigned char data[200U];
unsigned int length = m_network->read(data); unsigned int length = m_network->read(data + 2U, srcId, grp, dstId, dat, efr, count, end);
if (length == 0U) if (length == 0U)
return; return;
if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE) if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE)
return; return;
if (end && m_netState == RS_NET_IDLE)
return;
m_networkWatchdog.start(); m_networkWatchdog.start();
#endif
scrambler(data + 2U);
if (dat) {
CNXDNUDCH udch;
bool valid = udch.decode(data + 2U);
if (valid) {
if (m_netState == RS_NET_IDLE) {
unsigned char buffer[23U];
udch.getData(buffer);
CNXDNLayer3 layer3;
layer3.decode(buffer, 184U);
unsigned char type = layer3.getMessageType();
if (type == NXDN_MESSAGE_TYPE_DCALL_HDR) {
unsigned short srcId = layer3.getSourceUnitId();
unsigned short dstId = layer3.getDestinationGroupId();
bool grp = layer3.getIsGroup();
unsigned char frames = layer3.getDataBlocks();
std::string source = m_lookup->find(srcId);
m_display->writeNXDN(source.c_str(), grp, dstId, "N");
LogMessage("NXDN, received network data header from %s to %s%u, %u blocks", source.c_str(), grp ? "TG " : "", dstId, frames);
m_netState = RS_NET_DATA;
}
}
if (m_netState == RS_NET_DATA) {
data[0U] = end ? TAG_EOT : TAG_DATA;
data[1U] = 0x00U;
CSync::addNXDNSync(data + 2U);
CNXDNLICH lich;
lich.decode(data + 2U);
lich.encode(data + 2U);
udch.setRAN(m_ran);
udch.encode(data + 2U);
scrambler(data + 2U);
writeQueueNet(data);
if (end) {
LogMessage("NXDN, ended network data transmission");
writeEndNet();
}
}
}
} else {
if (m_netState == RS_NET_IDLE) {
std::string source = m_lookup->find(srcId);
LogMessage("NXDN, received network transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId);
m_display->writeNXDN(source.c_str(), grp, dstId, "N");
m_netTimeoutTimer.start();
m_packetTimer.start();
m_elapsed.start();
m_netState = RS_NET_AUDIO;
m_netFrames = 0U;
m_netLost = 0U;
m_netErrs = 0U;
m_netBits = 1U;
m_netN = 0U;
}
m_netFrames++;
data[0U] = end ? TAG_EOT : TAG_DATA;
data[1U] = 0x00U;
CSync::addNXDNSync(data + 2U);
CNXDNLICH lich;
lich.decode(data + 2U);
lich.encode(data + 2U);
unsigned char option = lich.getOption();
CNXDNSACCH sacch;
bool valid = sacch.decode(data + 2U);
if (valid) {
sacch.setRAN(m_ran);
sacch.encode(data + 2U);
}
if (option == NXDN_LICH_STEAL_NONE) {
CAMBEFEC ambe;
unsigned int errors = 0U;
if (efr) {
errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES);
errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U);
m_netErrs += errors;
m_netBits += 288U;
} else {
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES);
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 9U);
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U);
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 27U);
m_netErrs += errors;
m_netBits += 188U;
}
} else if (option == NXDN_LICH_STEAL_FACCH1_1) {
CNXDNFACCH1 facch1;
bool valid = facch1.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
if (valid)
facch1.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
CAMBEFEC ambe;
unsigned int errors = 0U;
if (efr) {
errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U);
m_netErrs += errors;
m_netBits += 144U;
} else {
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U);
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 27U);
m_netErrs += errors;
m_netBits += 94U;
}
} else if (option == NXDN_LICH_STEAL_FACCH1_2) {
CAMBEFEC ambe;
unsigned int errors = 0U;
if (efr) {
errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES);
m_netErrs += errors;
m_netBits += 144U;
} else {
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES);
errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 9U);
m_netErrs += errors;
m_netBits += 94U;
}
CNXDNFACCH1 facch1;
bool valid = facch1.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
if (valid)
facch1.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
} else {
CNXDNFACCH1 facch11;
bool valid1 = facch11.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
if (valid1)
facch11.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS);
CNXDNFACCH1 facch12;
bool valid2 = facch12.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
if (valid2)
facch12.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS);
}
scrambler(data + 2U);
writeQueueNet(data);
if (end) {
LogMessage("NXDN, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 25.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits));
writeEndNet();
}
}
} }
void CNXDNControl::clock(unsigned int ms) void CNXDNControl::clock(unsigned int ms)
@ -768,10 +940,11 @@ void CNXDNControl::writeNetwork(const unsigned char *data, bool dat)
unsigned short srcId = m_rfLayer3.getSourceUnitId(); unsigned short srcId = m_rfLayer3.getSourceUnitId();
unsigned short dstId = m_rfLayer3.getDestinationGroupId(); unsigned short dstId = m_rfLayer3.getDestinationGroupId();
bool grp = m_rfLayer3.getIsGroup(); bool grp = m_rfLayer3.getIsGroup();
bool efr = m_rfLayer3.getVoiceMode() == NXDN_VOICE_CALL_OPTION_9600_EFR;
bool end = data[0U] == TAG_EOT; bool end = data[0U] == TAG_EOT;
m_network->write(data + 2U, srcId, grp, dstId, dat, m_rfFrames, end); m_network->write(data + 2U, srcId, grp, dstId, dat, efr, m_rfFrames, end);
} }
void CNXDNControl::scrambler(unsigned char* data) const void CNXDNControl::scrambler(unsigned char* data) const

6
NXDNNetwork.cpp
View file

@ -59,7 +59,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, bool dat, unsigned char cnt, bool end) bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, bool efr, unsigned char cnt, bool end)
{ {
assert(data != NULL); assert(data != NULL);
@ -77,6 +77,7 @@ bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp
buffer[7U] = grp ? 0x01U : 0x00U; buffer[7U] = grp ? 0x01U : 0x00U;
buffer[7U] |= dat ? 0x02U : 0x00U; buffer[7U] |= dat ? 0x02U : 0x00U;
buffer[7U] |= end ? 0x04U : 0x00U; buffer[7U] |= end ? 0x04U : 0x00U;
buffer[7U] |= efr ? 0x08U : 0x00U;
buffer[8U] = (dst >> 8) & 0xFFU; buffer[8U] = (dst >> 8) & 0xFFU;
buffer[9U] = (dst >> 8) & 0xFFU; buffer[9U] = (dst >> 8) & 0xFFU;
@ -149,7 +150,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, bool& dat, unsigned char& cnt, bool& end) unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, bool& efr, unsigned char& cnt, bool& end)
{ {
assert(data != NULL); assert(data != NULL);
@ -163,6 +164,7 @@ unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool&
grp = (buffer[7U] & 0x01U) == 0x01U; grp = (buffer[7U] & 0x01U) == 0x01U;
dat = (buffer[7U] & 0x02U) == 0x02U; dat = (buffer[7U] & 0x02U) == 0x02U;
end = (buffer[7U] & 0x04U) == 0x04U; end = (buffer[7U] & 0x04U) == 0x04U;
efr = (buffer[7U] & 0x08U) == 0x08U;
dst = (buffer[8U] << 8) + buffer[9U]; dst = (buffer[8U] << 8) + buffer[9U];
cnt = buffer[10U]; cnt = buffer[10U];

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, bool dat, unsigned char cnt, bool end); bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, bool efr, unsigned char cnt, bool end);
unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, unsigned char& cnt, bool& end); unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, bool& efr, unsigned char& cnt, bool& end);
void reset(); void reset();