MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use defined lengths instead of magic numbers.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-10-19 11:00:45 +01:00
parent 28e013acb7
commit 9567ac0b20
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
M17LICH.cpp
View File

@@ -18,6 +18,7 @@
#include "M17LICH.h" #include "M17LICH.h"
#include "M17Utils.h" #include "M17Utils.h"
#include "M17Defines.h"
#include "M17CRC.h" #include "M17CRC.h"
#include <cassert> #include <cassert>
@@ -27,7 +28,7 @@ CM17LICH::CM17LICH() :
m_lich(NULL), m_lich(NULL),
m_valid(false) m_valid(false)
{ {
m_lich = new unsigned char[30U]; m_lich = new unsigned char[M17_LICH_LENGTH_BYTES];
} }
CM17LICH::~CM17LICH() CM17LICH::~CM17LICH()
@@ -39,23 +40,20 @@ void CM17LICH::getNetwork(unsigned char* data) const
{ {
assert(data != NULL); assert(data != NULL);
::memcpy(data, m_lich, 28U); ::memcpy(data, m_lich, M17_LICH_LENGTH_BYTES);
} }
void CM17LICH::setNetwork(const unsigned char* data) void CM17LICH::setNetwork(const unsigned char* data)
{ {
assert(data != NULL); assert(data != NULL);
::memcpy(m_lich, data, 28U); ::memcpy(m_lich, data, M17_LICH_LENGTH_BYTES);
m_valid = true; m_valid = true;
} }
std::string CM17LICH::getSource() const std::string CM17LICH::getSource() const
{ {
if (!m_valid)
return "";
std::string callsign; std::string callsign;
CM17Utils::decodeCallsign(m_lich + 6U, callsign); CM17Utils::decodeCallsign(m_lich + 6U, callsign);
@@ -69,9 +67,6 @@ void CM17LICH::setSource(const std::string& callsign)
std::string CM17LICH::getDest() const std::string CM17LICH::getDest() const
{ {
if (!m_valid)
return "";
std::string callsign; std::string callsign;
CM17Utils::decodeCallsign(m_lich + 0U, callsign); CM17Utils::decodeCallsign(m_lich + 0U, callsign);
@@ -85,9 +80,6 @@ void CM17LICH::setDest(const std::string& callsign)
unsigned char CM17LICH::getDataType() const unsigned char CM17LICH::getDataType() const
{ {
if (!m_valid)
return 0U;
return (m_lich[12U] >> 1) & 0x03U; return (m_lich[12U] >> 1) & 0x03U;
} }
@@ -113,29 +105,29 @@ void CM17LICH::getLinkSetup(unsigned char* data) const
{ {
assert(data != NULL); assert(data != NULL);
::memcpy(data, m_lich, 30U); ::memcpy(data, m_lich, M17_LICH_LENGTH_BYTES);
CM17CRC::encodeCRC(data, 30U); CM17CRC::encodeCRC(data, M17_LICH_LENGTH_BYTES);
} }
void CM17LICH::setLinkSetup(const unsigned char* data) void CM17LICH::setLinkSetup(const unsigned char* data)
{ {
assert(data != NULL); assert(data != NULL);
::memcpy(m_lich, data, 30U); ::memcpy(m_lich, data, M17_LICH_LENGTH_BYTES);
m_valid = CM17CRC::checkCRC(m_lich, 30U); m_valid = CM17CRC::checkCRC(m_lich, M17_LICH_LENGTH_BYTES);
} }
void CM17LICH::getFragment(unsigned char* data, unsigned short fn) const void CM17LICH::getFragment(unsigned char* data, unsigned short fn) const
{ {
assert(data != NULL); assert(data != NULL);
CM17CRC::encodeCRC(m_lich, 30U); CM17CRC::encodeCRC(m_lich, M17_LICH_LENGTH_BYTES);
unsigned int n = (fn & 0x7FFFU) % 5U; unsigned int n = (fn & 0x7FFFU) % 5U;
::memcpy(data, m_lich + (n * 6U), 6U); ::memcpy(data, m_lich + (n * M17_LICH_FRAGMENT_LENGTH_BYTES), M17_LICH_FRAGMENT_LENGTH_BYTES);
} }
void CM17LICH::setFragment(const unsigned char* data, unsigned short fn) void CM17LICH::setFragment(const unsigned char* data, unsigned short fn)
@@ -144,7 +136,7 @@ void CM17LICH::setFragment(const unsigned char* data, unsigned short fn)
unsigned int n = (fn & 0x7FFFU) % 5U; unsigned int n = (fn & 0x7FFFU) % 5U;
::memcpy(m_lich + (n * 6U), data, 6U); ::memcpy(m_lich + (n * M17_LICH_FRAGMENT_LENGTH_BYTES), data, M17_LICH_FRAGMENT_LENGTH_BYTES);
m_valid = CM17CRC::checkCRC(m_lich, 30U); m_valid = CM17CRC::checkCRC(m_lich, M17_LICH_LENGTH_BYTES);
} }