From a06dbf9d552f0f6003d8d13a4e0ba072ff95eeee Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 12 Nov 2018 13:22:18 -0500 Subject: [PATCH 01/11] implement logic to reuse the last properly decoded LC's instead of dropping the entire LDU; add undecodable LC counter; --- P25Control.cpp | 66 ++++++++++++++++++++++++++++++++------------------ P25Control.h | 5 +++- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index bceff05..f1fd7a8 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -57,6 +57,7 @@ m_networkWatchdog(1000U, 0U, 1500U), m_rfFrames(0U), m_rfBits(0U), m_rfErrs(0U), +m_rfUndecodableLC(0U), m_netFrames(0U), m_netLost(0U), m_rfDataFrames(0U), @@ -64,6 +65,8 @@ m_nid(nac), m_lastDUID(P25_DUID_TERM), m_audio(), m_rfData(), +m_rfLastLDU1(), +m_rfLastLDU2(), m_netData(), m_rfLSD(), m_netLSD(), @@ -123,6 +126,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) else LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); + LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); + if (m_netState == RS_NET_IDLE) m_display->clearP25(); @@ -208,24 +213,24 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_rssiCount++; } - if (duid == P25_DUID_HEADER) { - if (m_rfState == RS_RF_LISTENING) { + if (duid == P25_DUID_HEADER) { + if (m_rfState == RS_RF_LISTENING) { + m_rfData.reset(); + bool ret = m_rfData.decodeHeader(data + 2U); + if (!ret) { + m_lastDUID = duid; + return false; + } + + LogMessage("P25, received RF header"); + + m_lastDUID = duid; + return true; + } + } + else if (duid == P25_DUID_LDU1) { + if (m_rfState == RS_RF_LISTENING) { m_rfData.reset(); - bool ret = m_rfData.decodeHeader(data + 2U); - if (!ret) { - m_lastDUID = duid; - return false; - } - - LogMessage("P25, received RF header"); - - m_lastDUID = duid; - return true; - } - } - else if (duid == P25_DUID_LDU1) { - if (m_rfState == RS_RF_LISTENING) { - //m_rfData.reset(); bool ret = m_rfData.decodeLDU1(data + 2U); if (!ret) { m_lastDUID = duid; @@ -278,9 +283,14 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) if (m_rfState == RS_RF_AUDIO) { bool ret = m_rfData.decodeLDU1(data + 2U); - if (!ret) { - return false; - } + if (!ret) { + LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); + m_rfData = m_rfLastLDU1; + m_rfUndecodableLC++; + } + else { + m_rfLastLDU1 = m_rfData; + } // Regenerate Sync CSync::addP25Sync(data + 2U); @@ -327,9 +337,14 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } else if (duid == P25_DUID_LDU2) { if (m_rfState == RS_RF_AUDIO) { bool ret = m_rfData.decodeLDU2(data + 2U); - if (!ret) { - return false; - } + if (!ret) { + LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC"); + m_rfData = m_rfLastLDU2; + m_rfUndecodableLC++; + } + else { + m_rfLastLDU2 = m_rfData; + } writeNetwork(m_rfLDU, m_lastDUID, false); @@ -479,6 +494,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) else LogMessage("P25, received RF end of voice transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); + LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); + m_display->clearP25(); #if defined(DUMP_P25) @@ -936,6 +953,9 @@ void CP25Control::createRFHeader() m_rfFrames = 0U; m_rfErrs = 0U; + m_rfUndecodableLC = 0U; + m_rfLastLDU1.reset(); + m_rfLastLDU2.reset(); m_rfBits = 1U; m_rfTimeout.start(); m_lastDUID = P25_DUID_HEADER; diff --git a/P25Control.h b/P25Control.h index fa069d3..988ed44 100644 --- a/P25Control.h +++ b/P25Control.h @@ -65,6 +65,7 @@ private: unsigned int m_rfFrames; unsigned int m_rfBits; unsigned int m_rfErrs; + unsigned int m_rfUndecodableLC; unsigned int m_netFrames; unsigned int m_netLost; unsigned int m_rfDataFrames; @@ -72,7 +73,9 @@ private: unsigned char m_lastDUID; CP25Audio m_audio; CP25Data m_rfData; - CP25Data m_netData; + CP25Data m_rfLastLDU1; + CP25Data m_rfLastLDU2; + CP25Data m_netData; CP25LowSpeedData m_rfLSD; CP25LowSpeedData m_netLSD; unsigned char* m_netLDU1; From 1c1462e71e3e0a00dc2c9cc1a74606726c260097 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 12 Nov 2018 13:25:24 -0500 Subject: [PATCH 02/11] correct file formatting to be tabs and not spaces; --- P25Control.cpp | 72 +++++++++++++++++++++++++------------------------- P25Control.h | 8 +++--- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index f1fd7a8..7e92ead 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -126,7 +126,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) else LogMessage("P25, transmission lost, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); - LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); + LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); if (m_netState == RS_NET_IDLE) m_display->clearP25(); @@ -213,23 +213,23 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_rssiCount++; } - if (duid == P25_DUID_HEADER) { - if (m_rfState == RS_RF_LISTENING) { - m_rfData.reset(); - bool ret = m_rfData.decodeHeader(data + 2U); - if (!ret) { - m_lastDUID = duid; - return false; - } + if (duid == P25_DUID_HEADER) { + if (m_rfState == RS_RF_LISTENING) { + m_rfData.reset(); + bool ret = m_rfData.decodeHeader(data + 2U); + if (!ret) { + m_lastDUID = duid; + return false; + } - LogMessage("P25, received RF header"); + LogMessage("P25, received RF header"); - m_lastDUID = duid; - return true; - } - } - else if (duid == P25_DUID_LDU1) { - if (m_rfState == RS_RF_LISTENING) { + m_lastDUID = duid; + return true; + } + } + else if (duid == P25_DUID_LDU1) { + if (m_rfState == RS_RF_LISTENING) { m_rfData.reset(); bool ret = m_rfData.decodeLDU1(data + 2U); if (!ret) { @@ -283,14 +283,14 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) if (m_rfState == RS_RF_AUDIO) { bool ret = m_rfData.decodeLDU1(data + 2U); - if (!ret) { - LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); - m_rfData = m_rfLastLDU1; - m_rfUndecodableLC++; - } - else { - m_rfLastLDU1 = m_rfData; - } + if (!ret) { + LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); + m_rfData = m_rfLastLDU1; + m_rfUndecodableLC++; + } + else { + m_rfLastLDU1 = m_rfData; + } // Regenerate Sync CSync::addP25Sync(data + 2U); @@ -337,14 +337,14 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } else if (duid == P25_DUID_LDU2) { if (m_rfState == RS_RF_AUDIO) { bool ret = m_rfData.decodeLDU2(data + 2U); - if (!ret) { - LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC"); - m_rfData = m_rfLastLDU2; - m_rfUndecodableLC++; - } - else { - m_rfLastLDU2 = m_rfData; - } + if (!ret) { + LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC"); + m_rfData = m_rfLastLDU2; + m_rfUndecodableLC++; + } + else { + m_rfLastLDU2 = m_rfData; + } writeNetwork(m_rfLDU, m_lastDUID, false); @@ -494,7 +494,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) else LogMessage("P25, received RF end of voice transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); - LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); + LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); m_display->clearP25(); @@ -953,9 +953,9 @@ void CP25Control::createRFHeader() m_rfFrames = 0U; m_rfErrs = 0U; - m_rfUndecodableLC = 0U; - m_rfLastLDU1.reset(); - m_rfLastLDU2.reset(); + m_rfUndecodableLC = 0U; + m_rfLastLDU1.reset(); + m_rfLastLDU2.reset(); m_rfBits = 1U; m_rfTimeout.start(); m_lastDUID = P25_DUID_HEADER; diff --git a/P25Control.h b/P25Control.h index 988ed44..0845a02 100644 --- a/P25Control.h +++ b/P25Control.h @@ -65,7 +65,7 @@ private: unsigned int m_rfFrames; unsigned int m_rfBits; unsigned int m_rfErrs; - unsigned int m_rfUndecodableLC; + unsigned int m_rfUndecodableLC; unsigned int m_netFrames; unsigned int m_netLost; unsigned int m_rfDataFrames; @@ -73,9 +73,9 @@ private: unsigned char m_lastDUID; CP25Audio m_audio; CP25Data m_rfData; - CP25Data m_rfLastLDU1; - CP25Data m_rfLastLDU2; - CP25Data m_netData; + CP25Data m_rfLastLDU1; + CP25Data m_rfLastLDU2; + CP25Data m_netData; CP25LowSpeedData m_rfLSD; CP25LowSpeedData m_netLSD; unsigned char* m_netLDU1; From b8de542acd404a1e171bd17918a75cd1ed006be1 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 12 Nov 2018 13:27:49 -0500 Subject: [PATCH 03/11] add proper data copy override for the = operator to CP25Data; --- P25Data.cpp | 19 +++++++++++++++++++ P25Data.h | 2 ++ 2 files changed, 21 insertions(+) diff --git a/P25Data.cpp b/P25Data.cpp index e6378cd..7bc08cd 100644 --- a/P25Data.cpp +++ b/P25Data.cpp @@ -55,6 +55,25 @@ CP25Data::~CP25Data() delete[] m_mi; } +CP25Data& CP25Data::operator=(const CP25Data& data) +{ + if (this != &data) { + m_mfId = data.m_mfId; + + m_srcId = data.m_srcId; + m_dstId = data.m_dstId; + + m_emergency = data.m_emergency; + + m_algId = data.m_algId; + m_kId = data.m_kId; + + ::memcpy(m_mi, data.m_mi, P25_MI_LENGTH_BYTES); + } + + return *this; +} + bool CP25Data::decodeHeader(const unsigned char* data) { assert(data != NULL); diff --git a/P25Data.h b/P25Data.h index 3d312d8..999155c 100644 --- a/P25Data.h +++ b/P25Data.h @@ -27,6 +27,8 @@ class CP25Data { public: CP25Data(); ~CP25Data(); + + CP25Data& operator=(const CP25Data& data); bool decodeHeader(const unsigned char* data); void encodeHeader(unsigned char* data); From 0da6167c6175af2a027b69d66e1e9aaf204cef64 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Wed, 9 Jan 2019 03:02:51 +0000 Subject: [PATCH 04/11] readd missing constants and missing FEC code from previous revert; --- P25Control.cpp | 2 +- P25Control.h | 2 +- P25Data.cpp | 2 +- P25Data.h | 2 +- P25Defines.h | 2 + RS241213.cpp | 283 ++++++++++++++++++++++++++++++++++--------------- RS241213.h | 6 ++ 7 files changed, 210 insertions(+), 89 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index 7e92ead..6e87506 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/P25Control.h b/P25Control.h index 0845a02..43af0eb 100644 --- a/P25Control.h +++ b/P25Control.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017,2018 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/P25Data.cpp b/P25Data.cpp index 7bc08cd..6b24666 100644 --- a/P25Data.cpp +++ b/P25Data.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/P25Data.h b/P25Data.h index 999155c..026c5c4 100644 --- a/P25Data.h +++ b/P25Data.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016,2017 by Jonathan Naylor G4KLX -* Copyright (C) 2018 by Bryan Biedenkapp +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/P25Defines.h b/P25Defines.h index 6ceda75..815f75a 100644 --- a/P25Defines.h +++ b/P25Defines.h @@ -55,6 +55,8 @@ const unsigned int P25_PDU_FEC_LENGTH_BITS = P25_PDU_FEC_LENGTH_BYTES const unsigned int P25_MI_LENGTH_BYTES = 9U; +const unsigned char P25_ALGO_UNENCRYPT = 0x80U; + const unsigned char P25_LCF_GROUP = 0x00U; const unsigned char P25_LCF_PRIVATE = 0x03U; diff --git a/RS241213.cpp b/RS241213.cpp index 3e929d0..246da00 100644 --- a/RS241213.cpp +++ b/RS241213.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +21,7 @@ #include #include +#include const unsigned char ENCODE_MATRIX[12U][24U] = { {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 062, 044, 003, 025, 014, 016, 027, 003, 053, 004, 036, 047}, @@ -35,6 +37,46 @@ const unsigned char ENCODE_MATRIX[12U][24U] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 073, 065, 036, 061, 042, 022, 017, 004, 044, 020, 025, 005}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 071, 005, 055, 003, 071, 034, 060, 011, 074, 002, 041, 050}}; +const unsigned char ENCODE_MATRIX_24169[16U][24U] = { + { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 051, 045, 067, 015, 064, 067, 052, 012 }, + { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 057, 025, 063, 073, 071, 022, 040, 015 }, + { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 005, 001, 031, 004, 016, 054, 025, 076 }, + { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 073, 007, 047, 014, 041, 077, 047, 011 }, + { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 075, 015, 051, 051, 017, 067, 017, 057 }, + { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 020, 032, 014, 042, 075, 042, 070, 054 }, + { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 002, 075, 043, 005, 001, 040, 012, 064 }, + { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 024, 074, 015, 072, 024, 026, 074, 061 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 042, 064, 007, 022, 061, 020, 040, 065 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 032, 032, 055, 041, 057, 066, 021, 077 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 065, 036, 025, 007, 050, 016, 040, 051 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 064, 006, 054, 032, 076, 046, 014, 036 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 062, 063, 074, 070, 005, 027, 037, 046 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 055, 043, 034, 071, 057, 076, 050, 064 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 024, 023, 023, 005, 050, 070, 042, 023 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 067, 075, 045, 060, 057, 024, 006, 026 } }; + +const unsigned char ENCODE_MATRIX_362017[20U][36U] = { + { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 074, 037, 034, 006, 002, 007, 044, 064, 026, 014, 026, 044, 054, 013, 077, 005 }, + { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 004, 017, 050, 024, 011, 005, 030, 057, 033, 003, 002, 002, 015, 016, 025, 026 }, + { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 007, 023, 037, 046, 056, 075, 043, 045, 055, 021, 050, 031, 045, 027, 071, 062 }, + { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 026, 005, 007, 063, 063, 027, 063, 040, 006, 004, 040, 045, 047, 030, 075, 007 }, + { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 023, 073, 073, 041, 072, 034, 021, 051, 067, 016, 031, 074, 011, 021, 012, 021 }, + { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 024, 051, 025, 023, 022, 041, 074, 066, 074, 065, 070, 036, 067, 045, 064, 001 }, + { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 052, 033, 014, 002, 020, 006, 014, 025, 052, 023, 035, 074, 075, 075, 043, 027 }, + { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 055, 062, 056, 025, 073, 060, 015, 030, 013, 017, 020, 002, 070, 055, 014, 047 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 054, 051, 032, 065, 077, 012, 054, 013, 035, 032, 056, 012, 075, 001, 072, 063 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 074, 041, 030, 041, 043, 022, 051, 006, 064, 033, 003, 047, 027, 012, 055, 047 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 054, 070, 011, 003, 013, 022, 016, 057, 003, 045, 072, 031, 030, 056, 035, 022 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 051, 007, 072, 030, 065, 054, 006, 021, 036, 063, 050, 061, 064, 052, 001, 060 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 001, 065, 032, 070, 013, 044, 073, 024, 012, 052, 021, 055, 012, 035, 014, 072 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 011, 070, 005, 010, 065, 024, 015, 077, 022, 024, 024, 074, 007, 044, 007, 046 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 006, 002, 065, 011, 041, 020, 045, 042, 046, 054, 035, 012, 040, 064, 065, 033 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 034, 031, 001, 015, 044, 064, 016, 024, 052, 016, 006, 062, 020, 013, 055, 057 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 063, 043, 025, 044, 077, 063, 017, 017, 064, 014, 040, 074, 031, 072, 054, 006 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 071, 021, 070, 044, 056, 004, 030, 074, 004, 023, 071, 070, 063, 045, 056, 043 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 002, 001, 053, 074, 002, 014, 052, 074, 012, 057, 024, 063, 015, 042, 052, 033 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 034, 035, 002, 023, 021, 027, 022, 033, 064, 042, 005, 073, 051, 046, 073, 060 } }; + const unsigned int rsGFexp[64] = { 1, 2, 4, 8, 16, 32, 3, 6, 12, 24, 48, 35, 5, 10, 20, 40, 19, 38, 15, 30, 60, 59, 53, 41, 17, 34, 7, 14, 28, 56, 51, 37, @@ -85,21 +127,121 @@ CRS241213::~CRS241213() } bool CRS241213::decode(unsigned char* data) +{ + return decode(data, 24U, 39, 12); +} + +void CRS241213::encode(unsigned char* data) { assert(data != NULL); - unsigned char HB[24U]; + unsigned char codeword[24U]; + + for (unsigned int i = 0U; i < 24U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 12U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]); + } + } unsigned int offset = 0U; for (unsigned int i = 0U; i < 24U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +bool CRS241213::decode24169(unsigned char* data) +{ + return decode(data, 24U, 39, 8); +} + +void CRS241213::encode24169(unsigned char* data) +{ + assert(data != NULL); + + unsigned char codeword[24U]; + + for (unsigned int i = 0U; i < 24U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 16U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_24169[j][i]); + } + } + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < 24U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +bool CRS241213::decode362017(unsigned char* data) +{ + return decode(data, 36U, 27, 16); +} + +void CRS241213::encode362017(unsigned char* data) +{ + assert(data != NULL); + + unsigned char codeword[36U]; + + for (unsigned int i = 0U; i < 36U; i++) { + codeword[i] = 0x00U; + + unsigned int offset = 0U; + for (unsigned int j = 0U; j < 20U; j++, offset += 6U) { + unsigned char hexbit = bin2Hex(data, offset); + codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX_362017[j][i]); + } + } + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < 36U; i++, offset += 6U) + hex2Bin(codeword[i], data, offset); +} + +// GF(2 ^ 6) multiply(for Reed - Solomon encoder) +unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const +{ + unsigned char p = 0x00U; + + for (unsigned int i = 0U; i < 6U; i++) { + if ((b & 0x01U) == 0x01U) + p ^= a; + + a <<= 1; + + if ((a & 0x40U) == 0x40U) + a ^= 0x43U; // primitive polynomial : x ^ 6 + x + 1 + + b >>= 1; + } + + return p; +} + +bool CRS241213::decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots) +{ + assert(data != NULL); + + //unsigned char HB[24U]; + unsigned char HB[63U]; + ::memset(HB, 0x00U, 63U); + + unsigned int offset = 0U; + for (unsigned int i = 0U; i < bitLength; i++, offset += 6) HB[i] = bin2Hex(data, offset); //RS (63,63-nroots,nroots+1) decoder where nroots = number of parity bits // rsDec(8, 39) rsDec(16, 27) rsDec(12, 39) - const int nroots = 12; - int lambda[18];//Err+Eras Locator poly - int S[17];//syndrome poly + const int nroots = roots; + int lambda[18]; // Err+Eras Locator poly + int S[17]; // syndrome poly int b[18]; int t[18]; int omega[18]; @@ -109,22 +251,25 @@ bool CRS241213::decode(unsigned char* data) int i, j, count, r, el, SynError, DiscrR, q, DegOmega, tmp, num1, num2, den, DegLambda; - //form the syndromes; i.e., evaluate HB(x) at roots of g(x) + // form the syndromes; i.e., evaluate HB(x) at roots of g(x) for (i = 0; i <= nroots - 1; i++) { S[i] = HB[0]; } - for (j = 1; j <= 23; j++) { // XXX was 62 + //for (j = 1; j <= 24; j++) { // XXX was 62 + //for (j = 1; j <= (int)(bitLength - 1); j++) { + for (j = 1; j <= 62; j++) { for (i = 0; i <= nroots - 1; i++) { if (S[i] == 0) { S[i] = HB[j]; - } else { + } + else { S[i] = HB[j] ^ rsGFexp[(rsGFlog[S[i]] + i + 1) % 63]; } } } - //convert syndromes to index form, checking for nonzero condition + // convert syndromes to index form, checking for nonzero condition SynError = 0; for (i = 0; i <= nroots - 1; i++) { @@ -133,8 +278,8 @@ bool CRS241213::decode(unsigned char* data) } if (SynError == 0) { - //if syndrome is zero, rsData[] is a codeword and there are - //no errors to correct. So return rsData[] unmodified + // if syndrome is zero, rsData[] is a codeword and there are + // no errors to correct. So return rsData[] unmodified count = 0; return true; } @@ -149,13 +294,14 @@ bool CRS241213::decode(unsigned char* data) b[i] = rsGFlog[lambda[i]]; } - //begin Berlekamp-Massey algorithm to determine error+erasure - //locator polynomial + // begin Berlekamp-Massey algorithm to determine error+erasure + // locator polynomial r = 0; el = 0; - while (r < nroots) { //r is the step number - r = r + 1; - //compute discrepancy at the r-th step in poly-form + while (++r <= nroots) { + // r is the step number + //r = r + 1; + // compute discrepancy at the r-th step in poly-form DiscrR = 0; for (i = 0; i <= r - 1; i++) { @@ -164,44 +310,48 @@ bool CRS241213::decode(unsigned char* data) } } - DiscrR = rsGFlog[DiscrR];//index form + DiscrR = rsGFlog[DiscrR]; // index form if (DiscrR == 63) { - //shift elements upward one step + // shift elements upward one step for (i = nroots; i >= 1; i += -1) { b[i] = b[i - 1]; } b[0] = 63; - } else { - //t(x) <-- lambda(x) - DiscrR*x*b(x) + } + else { + // t(x) <-- lambda(x) - DiscrR*x*b(x) t[0] = lambda[0]; - + for (i = 0; i <= nroots - 1; i++) { if (b[i] != 63) { t[i + 1] = lambda[i + 1] ^ rsGFexp[(DiscrR + b[i]) % 63]; - } else { + } + else { t[i + 1] = lambda[i + 1]; } } - + if (2 * el <= r - 1) { el = r - el; - //b(x) <-- inv(DiscrR) * lambda(x) + // b(x) <-- inv(DiscrR) * lambda(x) for (i = 0; i <= nroots; i++) { if (lambda[i]) { b[i] = (rsGFlog[lambda[i]] - DiscrR + 63) % 63; - } else { + } + else { b[i] = 63; } } - } else { - //shift elements upward one step + } + else { + // shift elements upward one step for (i = nroots; i >= 1; i += -1) { b[i] = b[i - 1]; } - + b[0] = 63; } @@ -209,9 +359,9 @@ bool CRS241213::decode(unsigned char* data) lambda[i] = t[i]; } } - } /* end while() */ + } /* end while() */ - //convert lambda to index form and compute deg(lambda(x)) + // convert lambda to index form and compute deg(lambda(x)) DegLambda = 0; for (i = 0; i <= nroots; i++) { lambda[i] = rsGFlog[lambda[i]]; @@ -221,16 +371,16 @@ bool CRS241213::decode(unsigned char* data) } } - //Find roots of the error+erasure locator polynomial by Chien search + // Find roots of the error+erasure locator polynomial by Chien search for (i = 1; i <= nroots; i++) { reg[i] = lambda[i]; } - count = 0;//number of roots of lambda(x) + count = 0;// number of roots of lambda(x) for (i = 1; i <= 63; i++) { - q = 1;//lambda[0] is always 0 - + q = 1;// lambda[0] is always 0 + for (j = DegLambda; j >= 1; j += -1) { if (reg[j] != 63) { reg[j] = (reg[j] + j) % 63; @@ -238,13 +388,14 @@ bool CRS241213::decode(unsigned char* data) } } - if (q == 0) { //it is a root - //store root (index-form) and error location number + // it is a root + if (q == 0) { + // store root (index-form) and error location number root[count] = i; locn[count] = i - 40; - //if wehave max possible roots, abort search to save time + // if we have max possible roots, abort search to save time count = count + 1; - + if (count == DegLambda) { break; } @@ -252,18 +403,19 @@ bool CRS241213::decode(unsigned char* data) } if (DegLambda != count) { - //deg(lambda) unequal to number of roots => uncorrectable error detected + // deg(lambda) unequal to number of roots => uncorrectable error detected return false; } - //compute err+eras evaluator poly omega(x) + // compute err+eras evaluator poly omega(x) // = s(x)*lambda(x) (modulo x**nroots). in index form. Also find deg(omega). DegOmega = 0; for (i = 0; i <= nroots - 1; i++) { tmp = 0; if (DegLambda < i) { j = DegLambda; - } else { + } + else { j = i; } @@ -301,7 +453,8 @@ bool CRS241213::decode(unsigned char* data) // lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] if (DegLambda < nroots) { i = DegLambda; - } else { + } + else { i = nroots; } @@ -317,55 +470,15 @@ bool CRS241213::decode(unsigned char* data) // apply error to data if (num1 != 0) { - if(locn[j] < 24) - HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]); + if (locn[j] < firstData) + return false; + HB[locn[j]] = HB[locn[j]] ^ (rsGFexp[(rsGFlog[num1] + rsGFlog[num2] + 63 - rsGFlog[den]) % 63]); } } offset = 0U; - for (unsigned int i = 0U; i < 12U; i++, offset += 6U) + for (unsigned int i = 0U; i < (unsigned int)nroots; i++, offset += 6) hex2Bin(HB[i], data, offset); return true; } - -void CRS241213::encode(unsigned char* data) -{ - assert(data != NULL); - - unsigned char codeword[24U]; - - for (unsigned int i = 0U; i < 24U; i++) { - codeword[i] = 0x00U; - - unsigned int offset = 0U; - for (unsigned int j = 0U; j < 12U; j++, offset += 6U) { - unsigned char hexbit = bin2Hex(data, offset); - codeword[i] ^= gf6Mult(hexbit, ENCODE_MATRIX[j][i]); - } - } - - unsigned int offset = 0U; - for (unsigned int i = 0U; i < 24U; i++, offset += 6U) - hex2Bin(codeword[i], data, offset); -} - -// GF(2 ^ 6) multiply(for Reed - Solomon encoder) -unsigned char CRS241213::gf6Mult(unsigned char a, unsigned char b) const -{ - unsigned char p = 0x00U; - - for (unsigned int i = 0U; i < 6U; i++) { - if ((b & 0x01U) == 0x01U) - p ^= a; - - a <<= 1; - - if ((a & 0x40U) == 0x40U) - a ^= 0x43U; // primitive polynomial : x ^ 6 + x + 1 - - b >>= 1; - } - - return p; -} diff --git a/RS241213.h b/RS241213.h index fe3171a..dcbeeed 100644 --- a/RS241213.h +++ b/RS241213.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 by Jonathan Naylor G4KLX +* Copyright (C) 2018 by Bryan Biedenkapp N2PLL * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,11 +27,16 @@ public: ~CRS241213(); bool decode(unsigned char* data); + bool decode24169(unsigned char* data); + bool decode362017(unsigned char* data); void encode(unsigned char* data); + void encode24169(unsigned char* data); + void encode362017(unsigned char* data); private: unsigned char gf6Mult(unsigned char a, unsigned char b) const; + bool decode(unsigned char* data, const unsigned int bitLength, const int firstData, const int roots); }; #endif From 36395cf942feec31a5a1ac0b51ce281fbf50a5a9 Mon Sep 17 00:00:00 2001 From: Chipster Date: Tue, 9 Jan 2024 10:00:04 -0600 Subject: [PATCH 05/11] This PR/commit fixes #785, where POCSAG messages are now properly displayed on Nextion devices --- POCSAGControl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/POCSAGControl.cpp b/POCSAGControl.cpp index 5695510..0568271 100644 --- a/POCSAGControl.cpp +++ b/POCSAGControl.cpp @@ -234,7 +234,7 @@ bool CPOCSAGControl::readNetwork() output->m_display = rubric + out + "\""; break; default: - output->m_display = "\"" + output->m_text + "\""; + output->m_display = output->m_text; break; } LogDebug("Message to %07u, func Alphanumeric: %s", output->m_ric, output->m_display.c_str()); From 771aba25571b999538108183d1e493e1dc3d36bf Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 20 Jan 2024 22:03:24 +0000 Subject: [PATCH 06/11] Update the P25 symbols bits to be the correct values. --- P25Control.cpp | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index 43383d2..a75d7aa 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -293,7 +293,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_rfFrames++; m_lastDUID = duid; - // Add busy bits + // Add busy bits, inbound busy addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true); #if defined(DUMP_P25) @@ -339,7 +339,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_rfFrames++; m_lastDUID = duid; - // Add busy bits + // Add busy bits, inbound busy addBusyBits(data + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true); #if defined(DUMP_P25) @@ -392,8 +392,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) // Regenerate TDULC Data m_rfData.encodeTSDU(data + 2U); - // Add busy bits - addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, true, false); + // Add busy bits, inbound busy + addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, false, true); // Set first busy bits to 1,1 setBusyBits(data + 2U, P25_SS0_START, true, true); @@ -418,8 +418,8 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) // Regenerate TDULC Data m_rfData.encodeTSDU(data + 2U); - // Add busy bits - addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, true, false); + // Add busy bits, inbound busy + addBusyBits(data + 2U, P25_TSDU_FRAME_LENGTH_BITS, false, true); // Set first busy bits to 1,1 setBusyBits(data + 2U, P25_SS0_START, true, true); @@ -450,7 +450,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) // Regenerate NID m_nid.encode(data + 2U, P25_DUID_TERM); - // Add busy bits + // Add busy bits, inbound busy addBusyBits(data + 2U, P25_TERM_FRAME_LENGTH_BITS, false, true); bool grp = m_rfData.getLCF() == P25_LCF_GROUP; @@ -565,7 +565,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) // Regenerate NID m_nid.encode(pdu + 2U, P25_DUID_PDU); - // Add busy bits + // Add busy bits, inbound busy addBusyBits(pdu + 2U, newBitLength, false, true); if (m_duplex) { @@ -922,7 +922,7 @@ void CP25Control::createRFHeader() // Add the dummy header m_rfData.encodeHeader(buffer + 2U); - // Add busy bits + // Add busy bits, inbound busy addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true); m_rfFrames = 0U; @@ -996,9 +996,11 @@ void CP25Control::createNetHeader() // Add busy bits if (m_remoteGateway) - addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, false); + // Add busy bits, inbound/outbound + addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, false); else - addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true); + // Add busy bits, inbound idle + addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, true); writeQueueNet(buffer, P25_HDR_FRAME_LENGTH_BYTES + 2U); } @@ -1040,9 +1042,11 @@ void CP25Control::createNetLDU1() // Add busy bits if (m_remoteGateway) - addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, false); + // Add busy bits, inbound/outbound + addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false); else - addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true); + // Add busy bits, inbound idle + addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true); writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U); @@ -1088,9 +1092,11 @@ void CP25Control::createNetLDU2() // Add busy bits if (m_remoteGateway) - addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, false); + // Add busy bits, inbound/outbound + addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false); else - addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true); + // Add busy bits, inbound idle + addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true); writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U); @@ -1115,9 +1121,11 @@ void CP25Control::createNetTerminator() // Add busy bits if (m_remoteGateway) - addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, false, false); + // Add busy bits, inbound/outbound + addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, false); else - addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, false, true); + // Add busy bits, inbound idle + addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, true); writeQueueNet(buffer, P25_TERM_FRAME_LENGTH_BYTES + 2U); From 9471e322ffac4e91da4d97640a091bb6d2157268 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 25 Jan 2024 18:53:43 +0000 Subject: [PATCH 07/11] Add more P25 status symbol values. --- P25Control.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index a75d7aa..d9d42a4 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016-2019,2021 by Jonathan Naylor G4KLX +* Copyright (C) 2016-2019,2021,2024 by Jonathan Naylor G4KLX * Copyright (C) 2018 by Bryan Biedenkapp * * This program is free software; you can redistribute it and/or modify @@ -998,9 +998,12 @@ void CP25Control::createNetHeader() if (m_remoteGateway) // Add busy bits, inbound/outbound addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, false); - else + else if (m_duplex) // Add busy bits, inbound idle addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, true, true); + else + // Add busy bits, inbound busy + addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true); writeQueueNet(buffer, P25_HDR_FRAME_LENGTH_BYTES + 2U); } @@ -1044,9 +1047,12 @@ void CP25Control::createNetLDU1() if (m_remoteGateway) // Add busy bits, inbound/outbound addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false); - else + else if (m_duplex) // Add busy bits, inbound idle addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true); + else + // Add busy bits, inbound busy + addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true); writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U); @@ -1094,9 +1100,12 @@ void CP25Control::createNetLDU2() if (m_remoteGateway) // Add busy bits, inbound/outbound addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, false); - else + else if (m_duplex) // Add busy bits, inbound idle addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, true, true); + else + // Add busy bits, inbound busy + addBusyBits(buffer + 2U, P25_LDU_FRAME_LENGTH_BITS, false, true); writeQueueNet(buffer, P25_LDU_FRAME_LENGTH_BYTES + 2U); @@ -1123,9 +1132,12 @@ void CP25Control::createNetTerminator() if (m_remoteGateway) // Add busy bits, inbound/outbound addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, false); - else + else if (m_duplex) // Add busy bits, inbound idle addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, true, true); + else + // Add busy bits, inbound busy + addBusyBits(buffer + 2U, P25_TERM_FRAME_LENGTH_BITS, false, true); writeQueueNet(buffer, P25_TERM_FRAME_LENGTH_BYTES + 2U); From 0571d90b5bde83fc8b09ea881fe3e35b87516e98 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 25 Jan 2024 19:23:32 +0000 Subject: [PATCH 08/11] Format cleanups --- P25Control.cpp | 66 +++++++++++++++++----------------- P25Data.cpp | 98 +++++++++++++++++++++++++------------------------- 2 files changed, 80 insertions(+), 84 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index 4b81bf3..b182a68 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -180,21 +180,21 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) unsigned char duid = m_nid.getDUID(); if (!valid) { switch (m_lastDUID) { - case P25_DUID_HEADER: - case P25_DUID_LDU2: - duid = P25_DUID_LDU1; - break; - case P25_DUID_LDU1: - duid = P25_DUID_LDU2; - break; - case P25_DUID_PDU: - duid = P25_DUID_PDU; - break; - case P25_DUID_TSDU: - duid = P25_DUID_TSDU; - break; - default: - break; + case P25_DUID_HEADER: + case P25_DUID_LDU2: + duid = P25_DUID_LDU1; + break; + case P25_DUID_LDU1: + duid = P25_DUID_LDU2; + break; + case P25_DUID_PDU: + duid = P25_DUID_PDU; + break; + case P25_DUID_TSDU: + duid = P25_DUID_TSDU; + break; + default: + break; } } @@ -235,8 +235,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) m_lastDUID = duid; return true; } - } - else if (duid == P25_DUID_LDU1) { + } else if (duid == P25_DUID_LDU1) { if (m_rfState == RS_RF_LISTENING) { m_rfData.reset(); bool ret = m_rfData.decodeLDU1(data + 2U); @@ -295,8 +294,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); m_rfData = m_rfLastLDU1; m_rfUndecodableLC++; - } - else { + } else { m_rfLastLDU1 = m_rfData; } @@ -827,23 +825,23 @@ void CP25Control::writeNetwork(const unsigned char *data, unsigned char type, bo switch (type) { - case P25_DUID_LDU1: - m_network->writeLDU1(data, m_rfData, m_rfLSD, end); - break; - case P25_DUID_LDU2: - m_network->writeLDU2(data, m_rfData, m_rfLSD, end); - break; - default: - break; + case P25_DUID_LDU1: + m_network->writeLDU1(data, m_rfData, m_rfLSD, end); + break; + case P25_DUID_LDU2: + m_network->writeLDU2(data, m_rfData, m_rfLSD, end); + break; + default: + break; } } void CP25Control::setBusyBits(unsigned char* data, unsigned int ssOffset, bool b1, bool b2) { - assert(data != NULL); + assert(data != NULL); - WRITE_BIT(data, ssOffset, b1); - WRITE_BIT(data, ssOffset + 1U, b2); + WRITE_BIT(data, ssOffset, b1); + WRITE_BIT(data, ssOffset + 1U, b2); } void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1, bool b2) @@ -864,8 +862,8 @@ void CP25Control::checkNetLDU1() // Check for an unflushed LDU1 if (m_netLDU1[0U] != 0x00U || m_netLDU1[25U] != 0x00U || m_netLDU1[50U] != 0x00U || - m_netLDU1[75U] != 0x00U || m_netLDU1[100U] != 0x00U || m_netLDU1[125U] != 0x00U || - m_netLDU1[150U] != 0x00U || m_netLDU1[175U] != 0x00U || m_netLDU1[200U] != 0x00U) + m_netLDU1[75U] != 0x00U || m_netLDU1[100U] != 0x00U || m_netLDU1[125U] != 0x00U || + m_netLDU1[150U] != 0x00U || m_netLDU1[175U] != 0x00U || m_netLDU1[200U] != 0x00U) createNetLDU1(); } @@ -876,8 +874,8 @@ void CP25Control::checkNetLDU2() // Check for an unflushed LDU1 if (m_netLDU2[0U] != 0x00U || m_netLDU2[25U] != 0x00U || m_netLDU2[50U] != 0x00U || - m_netLDU2[75U] != 0x00U || m_netLDU2[100U] != 0x00U || m_netLDU2[125U] != 0x00U || - m_netLDU2[150U] != 0x00U || m_netLDU2[175U] != 0x00U || m_netLDU2[200U] != 0x00U) + m_netLDU2[75U] != 0x00U || m_netLDU2[100U] != 0x00U || m_netLDU2[125U] != 0x00U || + m_netLDU2[150U] != 0x00U || m_netLDU2[175U] != 0x00U || m_netLDU2[200U] != 0x00U) createNetLDU2(); } diff --git a/P25Data.cpp b/P25Data.cpp index 77b4dec..f2ae4ae 100644 --- a/P25Data.cpp +++ b/P25Data.cpp @@ -96,16 +96,15 @@ bool CP25Data::decodeHeader(const unsigned char* data) return false; } - m_mfId = rs[9U]; // Mfg Id. - m_algId = rs[10U]; // Algorithm ID + m_mfId = rs[9U]; // Mfg Id. + m_algId = rs[10U]; // Algorithm ID + if (m_algId != P25_ALGO_UNENCRYPT) { m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; - ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); - ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator + ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator - m_kId = (rs[11U] << 8) + rs[12U]; // Key ID - } - else { + m_kId = (rs[11U] << 8) + rs[12U]; // Key ID + } else { m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); @@ -124,9 +123,9 @@ void CP25Data::encodeHeader(unsigned char* data) ::memset(rs, 0x00U, 81U); for (unsigned int i = 0; i < P25_MI_LENGTH_BYTES; i++) - rs[i] = m_mi[i]; // Message Indicator + rs[i] = m_mi[i]; // Message Indicator - rs[9U] = m_mfId; // Mfg Id. + rs[9U] = m_mfId; // Mfg Id. rs[10U] = m_algId; // Algorithm ID rs[11U] = (m_kId >> 8) & 0xFFU; // Key ID MSB rs[12U] = (m_kId >> 0) & 0xFFU; // Key ID LSB @@ -183,18 +182,18 @@ bool CP25Data::decodeLDU1(const unsigned char* data) unsigned int srcId = (rs[6U] << 16) + (rs[7U] << 8) + rs[8U]; switch (rs[0U]) { - case P25_LCF_GROUP: - m_emergency = (rs[2U] & 0x80U) == 0x80U; - m_dstId = (rs[4U] << 8) + rs[5U]; - m_srcId = srcId; - break; - case P25_LCF_PRIVATE: - m_emergency = false; - m_dstId = (rs[3U] << 16) + (rs[4U] << 8) + rs[5U]; - m_srcId = srcId; - break; - default: - return false; + case P25_LCF_GROUP: + m_emergency = (rs[2U] & 0x80U) == 0x80U; + m_dstId = (rs[4U] << 8) + rs[5U]; + m_srcId = srcId; + break; + case P25_LCF_PRIVATE: + m_emergency = false; + m_dstId = (rs[3U] << 16) + (rs[4U] << 8) + rs[5U]; + m_srcId = srcId; + break; + default: + return false; } m_lcf = rs[0U]; @@ -296,7 +295,6 @@ bool CP25Data::decodeLDU2(const unsigned char* data) m_algId = rs[9U]; // Algorithm ID if (m_algId != P25_ALGO_UNENCRYPT) { m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; - ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator m_kId = (rs[10U] << 8) + rs[11U]; // Key ID @@ -388,18 +386,18 @@ bool CP25Data::decodeTSDU(const unsigned char* data) tsbkValue = (tsbkValue << 8) + tsbk[9U]; switch (m_lcf) { - case P25_LCF_TSBK_CALL_ALERT: - m_dstId = (unsigned int)((tsbkValue >> 24) & 0xFFFFFFU); // Target Radio Address - m_srcId = (unsigned int)(tsbkValue & 0xFFFFFFU); // Source Radio Address - break; - case P25_LCF_TSBK_ACK_RSP_FNE: - m_serviceType = (unsigned char)((tsbkValue >> 56) & 0xFFU); // Service Type - m_dstId = (unsigned int)((tsbkValue >> 24) & 0xFFFFFFU); // Target Radio Address - m_srcId = (unsigned int)(tsbkValue & 0xFFFFFFU); // Source Radio Address - break; - default: - LogMessage("P25, unknown LCF value in TSDU - $%02X", m_lcf); - break; + case P25_LCF_TSBK_CALL_ALERT: + m_dstId = (unsigned int)((tsbkValue >> 24) & 0xFFFFFFU); // Target Radio Address + m_srcId = (unsigned int)(tsbkValue & 0xFFFFFFU); // Source Radio Address + break; + case P25_LCF_TSBK_ACK_RSP_FNE: + m_serviceType = (unsigned char)((tsbkValue >> 56) & 0xFFU); // Service Type + m_dstId = (unsigned int)((tsbkValue >> 24) & 0xFFFFFFU); // Target Radio Address + m_srcId = (unsigned int)(tsbkValue & 0xFFFFFFU); // Source Radio Address + break; + default: + LogMessage("P25, unknown LCF value in TSDU - $%02X", m_lcf); + break; } return true; @@ -419,22 +417,22 @@ void CP25Data::encodeTSDU(unsigned char* data) tsbk[1U] = m_mfId; switch (m_lcf) { - case P25_LCF_TSBK_CALL_ALERT: - tsbkValue = 0U; - tsbkValue = (tsbkValue << 16) + 0U; - tsbkValue = (tsbkValue << 24) + m_dstId; // Target Radio Address - tsbkValue = (tsbkValue << 24) + m_srcId; // Source Radio Address - break; - case P25_LCF_TSBK_ACK_RSP_FNE: - tsbkValue = 0U; // Additional Info. Flag - tsbkValue = (tsbkValue << 1) + 0U; // Extended Address Flag - tsbkValue = (tsbkValue << 16) + (m_serviceType & 0xFF); // Service Type - tsbkValue = (tsbkValue << 32) + m_dstId; // Target Radio Address - tsbkValue = (tsbkValue << 24) + m_srcId; // Source Radio Address - break; - default: - LogMessage("P25, unknown LCF value in TSDU - $%02X", m_lcf); - break; + case P25_LCF_TSBK_CALL_ALERT: + tsbkValue = 0U; + tsbkValue = (tsbkValue << 16) + 0U; + tsbkValue = (tsbkValue << 24) + m_dstId; // Target Radio Address + tsbkValue = (tsbkValue << 24) + m_srcId; // Source Radio Address + break; + case P25_LCF_TSBK_ACK_RSP_FNE: + tsbkValue = 0U; // Additional Info. Flag + tsbkValue = (tsbkValue << 1) + 0U; // Extended Address Flag + tsbkValue = (tsbkValue << 16) + (m_serviceType & 0xFF); // Service Type + tsbkValue = (tsbkValue << 32) + m_dstId; // Target Radio Address + tsbkValue = (tsbkValue << 24) + m_srcId; // Source Radio Address + break; + default: + LogMessage("P25, unknown LCF value in TSDU - $%02X", m_lcf); + break; } // split rs value into bytes From 92982351d2e28d6be1a7b01f787f302af8f9e5af Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 26 Jan 2024 16:12:58 +0000 Subject: [PATCH 09/11] Remove P25 LDU validation. --- P25Control.cpp | 25 +++++++++++++------------ P25Control.h | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/P25Control.cpp b/P25Control.cpp index b182a68..412ec7f 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -57,7 +57,7 @@ m_networkWatchdog(1000U, 0U, 1500U), m_rfFrames(0U), m_rfBits(0U), m_rfErrs(0U), -m_rfUndecodableLC(0U), +// m_rfUndecodableLC(0U), m_netFrames(0U), m_netLost(0U), m_rfDataFrames(0U), @@ -65,8 +65,8 @@ m_nid(nac), m_lastDUID(P25_DUID_TERM), m_audio(), m_rfData(), -m_rfLastLDU1(), -m_rfLastLDU2(), +// m_rfLastLDU1(), +// m_rfLastLDU2(), m_netData(), m_rfLSD(), m_netLSD(), @@ -134,7 +134,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) else LogMessage("P25, transmission lost from %s to %s%u, %.1f seconds, BER: %.1f%%", source.c_str(), grp ? "TG " : "", dstId, float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); - LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); + // LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); if (m_netState == RS_NET_IDLE) m_display->clearP25(); @@ -289,6 +289,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } if (m_rfState == RS_RF_AUDIO) { +/* bool ret = m_rfData.decodeLDU1(data + 2U); if (!ret) { LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); @@ -297,7 +298,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } else { m_rfLastLDU1 = m_rfData; } - +*/ // Regenerate Sync CSync::addP25Sync(data + 2U); @@ -342,16 +343,16 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) } } else if (duid == P25_DUID_LDU2) { if (m_rfState == RS_RF_AUDIO) { +/* bool ret = m_rfData.decodeLDU2(data + 2U); if (!ret) { LogWarning("P25, LDU2 undecodable LC, using last LDU2 LC"); m_rfData = m_rfLastLDU2; m_rfUndecodableLC++; - } - else { + } else { m_rfLastLDU2 = m_rfData; } - +*/ writeNetwork(m_rfLDU, m_lastDUID, false); // Regenerate Sync @@ -505,7 +506,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len) else LogMessage("P25, received RF end of voice transmission from %s to %s%u, %.1f seconds, BER: %.1f%%", source.c_str(), grp ? "TG " : "", dstId, float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits)); - LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); + // LogMessage("P25, total frames: %d, bits: %d, undecodable LC: %d, errors: %d, BER: %.4f%%", m_rfFrames, m_rfBits, m_rfUndecodableLC, m_rfErrs, float(m_rfErrs * 100U) / float(m_rfBits)); m_display->clearP25(); @@ -967,9 +968,9 @@ void CP25Control::createRFHeader() m_rfFrames = 0U; m_rfErrs = 0U; - m_rfUndecodableLC = 0U; - m_rfLastLDU1.reset(); - m_rfLastLDU2.reset(); + // m_rfUndecodableLC = 0U; + // m_rfLastLDU1.reset(); + // m_rfLastLDU2.reset(); m_rfBits = 1U; m_rfTimeout.start(); m_lastDUID = P25_DUID_HEADER; diff --git a/P25Control.h b/P25Control.h index a130ab7..3076624 100644 --- a/P25Control.h +++ b/P25Control.h @@ -69,7 +69,7 @@ private: unsigned int m_rfFrames; unsigned int m_rfBits; unsigned int m_rfErrs; - unsigned int m_rfUndecodableLC; + // unsigned int m_rfUndecodableLC; unsigned int m_netFrames; unsigned int m_netLost; unsigned int m_rfDataFrames; @@ -77,8 +77,8 @@ private: unsigned char m_lastDUID; CP25Audio m_audio; CP25Data m_rfData; - CP25Data m_rfLastLDU1; - CP25Data m_rfLastLDU2; + // CP25Data m_rfLastLDU1; + // CP25Data m_rfLastLDU2; CP25Data m_netData; CP25LowSpeedData m_rfLSD; CP25LowSpeedData m_netLSD; From 17bd4d89025810cffc38761ac00fe688249aefa6 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Fri, 26 Jan 2024 16:17:02 +0000 Subject: [PATCH 10/11] Bump the version date. --- Version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Version.h b/Version.h index 2d9289c..5dc2bc5 100644 --- a/Version.h +++ b/Version.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2023 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2024 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20231206"; +const char* VERSION = "20240126"; #endif From fe9564295d6085084b6a157ab95bed57f8b5849b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 29 Jan 2024 16:59:34 +0000 Subject: [PATCH 11/11] Simplify the UDP socket handling. --- DMRDirectNetwork.cpp | 2 +- UDPSocket.cpp | 208 ++++++++++++++++++------------------------- UDPSocket.h | 33 +++---- Version.h | 2 +- 4 files changed, 101 insertions(+), 144 deletions(-) diff --git a/DMRDirectNetwork.cpp b/DMRDirectNetwork.cpp index ba36a69..c5013dd 100644 --- a/DMRDirectNetwork.cpp +++ b/DMRDirectNetwork.cpp @@ -344,7 +344,7 @@ void CDMRDirectNetwork::clock(unsigned int ms) if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) { switch (m_status) { case WAITING_CONNECT: - if (m_socket.open(m_addr.ss_family)) { + if (m_socket.open(m_addr)) { if (writeLogin()) { m_status = WAITING_LOGIN; } diff --git a/UDPSocket.cpp b/UDPSocket.cpp index 0792863..6981e29 100644 --- a/UDPSocket.cpp +++ b/UDPSocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2006-2016,2020,2024 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,29 +34,19 @@ #endif CUDPSocket::CUDPSocket(const std::string& address, unsigned short port) : -m_address_save(address), -m_port_save(port), -m_counter(0U) +m_localAddress(address), +m_localPort(port), +m_fd(-1), +m_af(AF_UNSPEC) { - for (int i = 0; i < UDP_SOCKET_MAX; i++) { - m_address[i] = ""; - m_port[i] = 0U; - m_af[i] = 0U; - m_fd[i] = -1; - } } CUDPSocket::CUDPSocket(unsigned short port) : -m_address_save(), -m_port_save(port), -m_counter(0U) +m_localAddress(), +m_localPort(port), +m_fd(-1), +m_af(AF_UNSPEC) { - for (int i = 0; i < UDP_SOCKET_MAX; i++) { - m_address[i] = ""; - m_port[i] = 0U; - m_af[i] = 0U; - m_fd[i] = -1; - } } CUDPSocket::~CUDPSocket() @@ -93,10 +83,10 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned short port, sockadd std::string portstr = std::to_string(port); struct addrinfo *res; - /* port is always digits, no needs to lookup service */ + /* Port is always digits, no needs to lookup service */ hints.ai_flags |= AI_NUMERICSERV; - int err = getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res); + int err = ::getaddrinfo(hostname.empty() ? NULL : hostname.c_str(), portstr.c_str(), &hints, &res); if (err != 0) { sockaddr_in* paddr = (sockaddr_in*)&addr; ::memset(paddr, 0x00U, address_length = sizeof(sockaddr_in)); @@ -109,7 +99,7 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned short port, sockadd ::memcpy(&addr, res->ai_addr, address_length = res->ai_addrlen); - freeaddrinfo(res); + ::freeaddrinfo(res); return 0; } @@ -121,33 +111,33 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad if (type == IMT_ADDRESS_AND_PORT) { switch (addr1.ss_family) { - case AF_INET: - struct sockaddr_in *in_1, *in_2; - in_1 = (struct sockaddr_in*)&addr1; - in_2 = (struct sockaddr_in*)&addr2; - return (in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) && (in_1->sin_port == in_2->sin_port); - case AF_INET6: - struct sockaddr_in6 *in6_1, *in6_2; - in6_1 = (struct sockaddr_in6*)&addr1; - in6_2 = (struct sockaddr_in6*)&addr2; - return IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) && (in6_1->sin6_port == in6_2->sin6_port); - default: - return false; + case AF_INET: + struct sockaddr_in *in_1, *in_2; + in_1 = (struct sockaddr_in*)&addr1; + in_2 = (struct sockaddr_in*)&addr2; + return (in_1->sin_addr.s_addr == in_2->sin_addr.s_addr) && (in_1->sin_port == in_2->sin_port); + case AF_INET6: + struct sockaddr_in6 *in6_1, *in6_2; + in6_1 = (struct sockaddr_in6*)&addr1; + in6_2 = (struct sockaddr_in6*)&addr2; + return IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr) && (in6_1->sin6_port == in6_2->sin6_port); + default: + return false; } } else if (type == IMT_ADDRESS_ONLY) { switch (addr1.ss_family) { - case AF_INET: - struct sockaddr_in *in_1, *in_2; - in_1 = (struct sockaddr_in*)&addr1; - in_2 = (struct sockaddr_in*)&addr2; - return in_1->sin_addr.s_addr == in_2->sin_addr.s_addr; - case AF_INET6: - struct sockaddr_in6 *in6_1, *in6_2; - in6_1 = (struct sockaddr_in6*)&addr1; - in6_2 = (struct sockaddr_in6*)&addr2; - return IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr); - default: - return false; + case AF_INET: + struct sockaddr_in *in_1, *in_2; + in_1 = (struct sockaddr_in*)&addr1; + in_2 = (struct sockaddr_in*)&addr2; + return in_1->sin_addr.s_addr == in_2->sin_addr.s_addr; + case AF_INET6: + struct sockaddr_in6 *in6_1, *in6_2; + in6_1 = (struct sockaddr_in6*)&addr1; + in6_2 = (struct sockaddr_in6*)&addr2; + return IN6_ARE_ADDR_EQUAL(&in6_1->sin6_addr, &in6_2->sin6_addr); + default: + return false; } } else { return false; @@ -163,35 +153,34 @@ bool CUDPSocket::isNone(const sockaddr_storage& addr) bool CUDPSocket::open(const sockaddr_storage& address) { - return open(address.ss_family); + m_af = address.ss_family; + + return open(); } -bool CUDPSocket::open(unsigned int af) +bool CUDPSocket::open() { - return open(0, af, m_address_save, m_port_save); -} + assert(m_fd == -1); -bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned short port) -{ sockaddr_storage addr; unsigned int addrlen; struct addrinfo hints; ::memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE; - hints.ai_family = af; + hints.ai_family = m_af; - /* to determine protocol family, call lookup() first. */ - int err = lookup(address, port, addr, addrlen, hints); + // To determine protocol family, call lookup() on the local address first. + int err = lookup(m_localAddress, m_localPort, addr, addrlen, hints); if (err != 0) { - LogError("The local address is invalid - %s", address.c_str()); + LogError("The local address is invalid - %s", m_localAddress.c_str()); return false; } - close(index); + m_af = addr.ss_family; - int fd = ::socket(addr.ss_family, SOCK_DGRAM, 0); - if (fd < 0) { + m_fd = ::socket(m_af, SOCK_DGRAM, 0); + if (m_fd < 0) { #if defined(_WIN32) || defined(_WIN64) LogError("Cannot create the UDP socket, err: %lu", ::GetLastError()); #else @@ -200,62 +189,51 @@ bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std return false; } - m_address[index] = address; - m_port[index] = port; - m_af[index] = addr.ss_family; - m_fd[index] = fd; - - if (port > 0U) { + if (m_localPort > 0U) { int reuse = 1; - if (::setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) { + if (::setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) { #if defined(_WIN32) || defined(_WIN64) LogError("Cannot set the UDP socket option, err: %lu", ::GetLastError()); #else LogError("Cannot set the UDP socket option, err: %d", errno); #endif + close(); return false; } - if (::bind(fd, (sockaddr*)&addr, addrlen) == -1) { + if (::bind(m_fd, (sockaddr*)&addr, addrlen) == -1) { #if defined(_WIN32) || defined(_WIN64) LogError("Cannot bind the UDP address, err: %lu", ::GetLastError()); #else LogError("Cannot bind the UDP address, err: %d", errno); #endif + close(); return false; } - LogInfo("Opening UDP port on %hu", port); + LogInfo("Opening UDP port on %hu", m_localPort); } return true; } -int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length) +int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &addressLength) { assert(buffer != NULL); assert(length > 0U); + assert(m_fd >= 0); // Check that the readfrom() won't block - int i, n; - struct pollfd pfd[UDP_SOCKET_MAX]; - for (i = n = 0; i < UDP_SOCKET_MAX; i++) { - if (m_fd[i] >= 0) { - pfd[n].fd = m_fd[i]; - pfd[n].events = POLLIN; - n++; - } - } - - // no socket descriptor to receive - if (n == 0) - return 0; + struct pollfd pfd; + pfd.fd = m_fd; + pfd.events = POLLIN; + pfd.revents = 0; // Return immediately #if defined(_WIN32) || defined(_WIN64) - int ret = WSAPoll(pfd, n, 0); + int ret = WSAPoll(&pfd, 1, 0); #else - int ret = ::poll(pfd, n, 0); + int ret = ::poll(&pfd, 1, 0); #endif if (ret < 0) { #if defined(_WIN32) || defined(_WIN64) @@ -266,14 +244,7 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag return -1; } - int index; - for (i = 0; i < n; i++) { - // round robin - index = (i + m_counter) % n; - if (pfd[index].revents & POLLIN) - break; - } - if (i == n) + if ((pfd.revents & POLLIN) == 0) return 0; #if defined(_WIN32) || defined(_WIN64) @@ -283,9 +254,9 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag #endif #if defined(_WIN32) || defined(_WIN64) - int len = ::recvfrom(pfd[index].fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); + int len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); #else - ssize_t len = ::recvfrom(pfd[index].fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); + ssize_t len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); #endif if (len <= 0) { #if defined(_WIN32) || defined(_WIN64) @@ -294,7 +265,7 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag LogError("Error returned from recvfrom, err: %d", errno); if (len == -1 && errno == ENOTSOCK) { - LogMessage("Re-opening UDP port on %hu", m_port[index]); + LogMessage("Re-opening UDP port on %hu", m_localPort); close(); open(); } @@ -302,43 +273,39 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag return -1; } - m_counter++; - address_length = size; + addressLength = size; + return len; } -bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length) +bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int addressLength) { assert(buffer != NULL); assert(length > 0U); + assert(m_fd >= 0); bool result = false; - for (int i = 0; i < UDP_SOCKET_MAX; i++) { - if (m_fd[i] < 0 || m_af[i] != address.ss_family) - continue; - #if defined(_WIN32) || defined(_WIN64) - int ret = ::sendto(m_fd[i], (char *)buffer, length, 0, (sockaddr *)&address, address_length); + int ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&address, addressLength); #else - ssize_t ret = ::sendto(m_fd[i], (char *)buffer, length, 0, (sockaddr *)&address, address_length); + ssize_t ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&address, addressLength); #endif - if (ret < 0) { + if (ret < 0) { #if defined(_WIN32) || defined(_WIN64) - LogError("Error returned from sendto, err: %lu", ::GetLastError()); + LogError("Error returned from sendto, err: %lu", ::GetLastError()); #else - LogError("Error returned from sendto, err: %d", errno); + LogError("Error returned from sendto, err: %d", errno); #endif - } else { + } else { #if defined(_WIN32) || defined(_WIN64) - if (ret == int(length)) - result = true; + if (ret == int(length)) + result = true; #else - if (ret == ssize_t(length)) - result = true; + if (ret == ssize_t(length)) + result = true; #endif - } } return result; @@ -346,18 +313,13 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const s void CUDPSocket::close() { - for (unsigned int i = 0; i < UDP_SOCKET_MAX; i++) - close(i); -} - -void CUDPSocket::close(const unsigned int index) -{ - if ((index < UDP_SOCKET_MAX) && (m_fd[index] >= 0)) { + if (m_fd >= 0) { #if defined(_WIN32) || defined(_WIN64) - ::closesocket(m_fd[index]); + ::closesocket(m_fd); #else - ::close(m_fd[index]); + ::close(m_fd); #endif - m_fd[index] = -1; + m_fd = -1; } } + diff --git a/UDPSocket.h b/UDPSocket.h index 3e75554..28e350c 100644 --- a/UDPSocket.h +++ b/UDPSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011,2013,2015,2016,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2011,2013,2015,2016,2020,2024 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,10 +35,6 @@ #include #endif -#if !defined(UDP_SOCKET_MAX) -#define UDP_SOCKET_MAX 1 -#endif - enum IPMATCHTYPE { IMT_ADDRESS_AND_PORT, IMT_ADDRESS_ONLY @@ -50,34 +46,33 @@ public: CUDPSocket(unsigned short port = 0U); ~CUDPSocket(); - bool open(unsigned int af = AF_UNSPEC); + bool open(); bool open(const sockaddr_storage& address); - bool open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned short port); - int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length); - bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length); + int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &addressLength); + bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int addressLength); void close(); - void close(const unsigned int index); static void startup(); static void shutdown(); - static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& address_length); - static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); + static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength); + static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength, struct addrinfo& hints); static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT); static bool isNone(const sockaddr_storage& addr); private: - std::string m_address_save; - unsigned short m_port_save; - std::string m_address[UDP_SOCKET_MAX]; - unsigned short m_port[UDP_SOCKET_MAX]; - unsigned int m_af[UDP_SOCKET_MAX]; - int m_fd[UDP_SOCKET_MAX]; - unsigned int m_counter; + std::string m_localAddress; + unsigned short m_localPort; +#if defined(_WIN32) || defined(_WIN64) + SOCKET m_fd; +#else + int m_fd; +#endif + sa_family_t m_af; }; #endif diff --git a/Version.h b/Version.h index 5dc2bc5..ba845b1 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20240126"; +const char* VERSION = "20240129"; #endif