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

Fix some search & replace mistakes.

Browse source
This commit is contained in:
Jonathan Naylor 2025-03-14 16:31:29 +00:00
parent cf15f42a0f
commit 19ead93af9
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DMRCSBK.h
View file

@ -21,7 +21,7 @@
#include "DMRDefines.h" #include "DMRDefines.h"
enum class CSBKO { enum class CSBKO : unsigned char {
NONE = 0x00, NONE = 0x00,
UUVREQ = 0x04, UUVREQ = 0x04,
UUANSRSP = 0x05, UUANSRSP = 0x05,

4
DMRDefines.h
View file

@ -110,14 +110,14 @@ const unsigned char DPF_PROPRIETARY = 0x0FU;
const unsigned char FID_ETSI = 0U; const unsigned char FID_ETSI = 0U;
const unsigned char FID_DMRA = 16U; const unsigned char FID_DMRA = 16U;
enum class FLCO { enum class FLCO : unsigned char {
GROUP = 0, GROUP = 0,
USER_USER = 3, USER_USER = 3,
TALKER_ALIAS_HEADER = 4, TALKER_ALIAS_HEADER = 4,
TALKER_ALIAS_BLOCK1 = 5, TALKER_ALIAS_BLOCK1 = 5,
TALKER_ALIAS_BLOCK2 = 6, TALKER_ALIAS_BLOCK2 = 6,
TALKER_ALIAS_BLOCK3 = 7, TALKER_ALIAS_BLOCK3 = 7,
GINFO = 8 GPS_INFO = 8
}; };
#endif #endif

4
DMRSlot.cpp
View file

@ -679,7 +679,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
// CUtils::dump(1U, text, data, 9U); // CUtils::dump(1U, text, data, 9U);
break; break;
case FLCO::GINFO: case FLCO::GPS_INFO:
if (m_dumpTAData) { if (m_dumpTAData) {
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo); ::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
CUtils::dump(1U, text, data, 9U); CUtils::dump(1U, text, data, 9U);
@ -1522,7 +1522,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// ::sprintf(text, "DMR Slot %u, Embedded LC", m_slotNo); // ::sprintf(text, "DMR Slot %u, Embedded LC", m_slotNo);
// CUtils::dump(1U, text, data, 9U); // CUtils::dump(1U, text, data, 9U);
break; break;
case FLCO::GINFO: case FLCO::GPS_INFO:
if (m_dumpTAData) { if (m_dumpTAData) {
::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo); ::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
CUtils::dump(1U, text, data, 9U); CUtils::dump(1U, text, data, 9U);

4
FMNetwork.cpp
View file

@ -367,12 +367,12 @@ void CFMNetwork::clock(unsigned int ms)
// Check if the data is for us // Check if the data is for us
if (m_protocol == FM_NETWORK_PROTOCOL::USRP) { if (m_protocol == FM_NETWORK_PROTOCOL::USRP) {
if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::IMT_ADDREAND_PORT)) { if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::ADDRESS_AND_PORT)) {
LogMessage("FM packet received from an invalid source"); LogMessage("FM packet received from an invalid source");
return; return;
} }
} else { } else {
if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::IMT_ADDREONLY)) { if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::ADDRESS_ONLY)) {
LogMessage("FM packet received from an invalid source"); LogMessage("FM packet received from an invalid source");
return; return;
} }

4
NXDNKenwoodNetwork.cpp
View file

@ -774,7 +774,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
if (length <= 0) if (length <= 0)
return 0U; return 0U;
if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) { if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::ADDRESS_ONLY)) {
LogMessage("NXDN, RTP packet received from an invalid source"); LogMessage("NXDN, RTP packet received from an invalid source");
return 0U; return 0U;
} }
@ -802,7 +802,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
if (length <= 0) if (length <= 0)
return 0U; return 0U;
if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) { if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::ADDRESS_ONLY)) {
LogMessage("NXDN, RTCP packet received from an invalid source"); LogMessage("NXDN, RTCP packet received from an invalid source");
return 0U; return 0U;
} }

4
UDPSocket.cpp
View file

@ -119,7 +119,7 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad
if (addr1.ss_family != addr2.ss_family) if (addr1.ss_family != addr2.ss_family)
return false; return false;
if (type == IPMATCHTYPE::IMT_ADDREAND_PORT) { if (type == IPMATCHTYPE::ADDRESS_AND_PORT) {
switch (addr1.ss_family) { switch (addr1.ss_family) {
case AF_INET: case AF_INET:
struct sockaddr_in *in_1, *in_2; struct sockaddr_in *in_1, *in_2;
@ -134,7 +134,7 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad
default: default:
return false; return false;
} }
} else if (type == IPMATCHTYPE::IMT_ADDREONLY) { } else if (type == IPMATCHTYPE::ADDRESS_ONLY) {
switch (addr1.ss_family) { switch (addr1.ss_family) {
case AF_INET: case AF_INET:
struct sockaddr_in *in_1, *in_2; struct sockaddr_in *in_1, *in_2;

6
UDPSocket.h
View file

@ -37,8 +37,8 @@
#endif #endif
enum class IPMATCHTYPE { enum class IPMATCHTYPE {
IMT_ADDREAND_PORT, ADDRESS_AND_PORT,
IMT_ADDREONLY ADDRESS_ONLY
}; };
class CUDPSocket { class CUDPSocket {
@ -61,7 +61,7 @@ public:
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);
static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength, struct addrinfo& hints); 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 = IPMATCHTYPE::IMT_ADDREAND_PORT); static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IPMATCHTYPE::ADDRESS_AND_PORT);
static bool isNone(const sockaddr_storage& addr); static bool isNone(const sockaddr_storage& addr);