MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the LSF processing to allow changed META field data changed

Browse Source 
through.
This commit is contained in:
Jonathan Naylor
2021-08-26 21:49:46 +01:00
parent ef6ce0ef88
commit d1dc6bb7a0
7 changed files with 148 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
M17Network.cpp
View File

@@ -74,19 +74,19 @@ bool CM17Network::open()
}
}
bool CM17Network::writeHeader(const std::string& source, const std::string& dest, const unsigned char* lsf)
bool CM17Network::write(const unsigned char* data)
{
if (m_addrLen == 0U)
return false;
assert(lsf != NULL);
assert(data != NULL);
unsigned char buffer[60U];
unsigned char buffer[100U];
buffer[0U] = 'M';
buffer[1U] = '1';
buffer[2U] = '7';
buffer[3U] = 'H';
buffer[3U] = ' ';
// Create a random id for this transmission if needed
if (m_outId == 0U) {
@@ -97,52 +97,16 @@ bool CM17Network::writeHeader(const std::string& source, const std::string& dest
buffer[4U] = m_outId / 256U; // Unique session id
buffer[5U] = m_outId % 256U;
::memset(buffer + 6U, ' ', 9U);
::memcpy(buffer + 6U, source.c_str(), source.size());
::memcpy(buffer + 6U, data, 46U);
::memset(buffer + 15U, ' ', 9U);
::memcpy(buffer + 15U, dest.c_str(), dest.size());
::memcpy(buffer + 24U, lsf, 28U);
// Dummy CRC
buffer[52U] = 0x00U;
buffer[53U] = 0x00U;
if (m_debug)
CUtils::dump(1U, "M17 header transmitted", buffer, 52U);
CUtils::dump(1U, "M17 data transmitted", buffer, 54U);
return m_socket.write(buffer, 52U, m_addr, m_addrLen);
}
bool CM17Network::writeData(const std::string& source, const std::string& dest,const unsigned char* lsf, const unsigned char* data)
{
if (m_addrLen == 0U)
return false;
assert(data != NULL);
assert(lsf != NULL);
unsigned char buffer[50U];
buffer[0U] = 'M';
buffer[1U] = '1';
buffer[2U] = '7';
buffer[3U] = 'D';
buffer[4U] = m_outId / 256U; // Unique session id
buffer[5U] = m_outId % 256U;
::memset(buffer + 6U, ' ', 9U);
::memcpy(buffer + 6U, source.c_str(), source.size());
::memset(buffer + 15U, ' ', 9U);
::memcpy(buffer + 15U, dest.c_str(), dest.size());
::memcpy(buffer + 24U, lsf, 6U);
::memcpy(buffer + 30U, data, 18U);
if (m_debug)
CUtils::dump(1U, "M17 data transmitted", buffer, 48U);
return m_socket.write(buffer, 48U, m_addr, m_addrLen);
return m_socket.write(buffer, 54U, m_addr, m_addrLen);
}
void CM17Network::clock(unsigned int ms)
@@ -175,7 +139,7 @@ void CM17Network::clock(unsigned int ms)
if (::memcmp(buffer + 0U, "PING", 4U) == 0)
return;
if (::memcmp(buffer + 0U, "M17H", 4U) != 0 && ::memcmp(buffer + 0U, "M17D", 4U) != 0) {
if (::memcmp(buffer + 0U, "M17 ", 4U) != 0) {
CUtils::dump(2U, "M17, received unknown packet", buffer, length);
return;
}
@@ -188,19 +152,10 @@ void CM17Network::clock(unsigned int ms)
return;
}
if (::memcmp(buffer + 0U, "M17H", 4U) == 0) {
unsigned char c = length - 5U;
m_buffer.addData(&c, 1U);
unsigned char c = length - 6U;
m_buffer.addData(&c, 1U);
m_buffer.addData(&TAG_HEADER, 1U);
m_buffer.addData(buffer + 6U, length - 6U);
} else {
unsigned char c = length - 5U;
m_buffer.addData(&c, 1U);
m_buffer.addData(&TAG_DATA, 1U);
m_buffer.addData(buffer + 6U, length - 6U);
}
m_buffer.addData(buffer + 6U, length - 6U);
}
bool CM17Network::read(unsigned char* data)