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

Include the fragment LICH in the network data.

Browse Source
This commit is contained in:
Jonathan Naylor
2021-08-22 21:56:46 +01:00
parent e966d355cd
commit ef6ce0ef88
4 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
M17Network.cpp
View File

@@ -74,12 +74,12 @@ bool CM17Network::open()
}
}
bool CM17Network::writeHeader(const std::string& source, const std::string& dest, const unsigned char* data)
bool CM17Network::writeHeader(const std::string& source, const std::string& dest, const unsigned char* lsf)
{
if (m_addrLen == 0U)
return false;
assert(data != NULL);
assert(lsf != NULL);
unsigned char buffer[60U];
@@ -103,7 +103,7 @@ bool CM17Network::writeHeader(const std::string& source, const std::string& dest
::memset(buffer + 15U, ' ', 9U);
::memcpy(buffer + 15U, dest.c_str(), dest.size());
::memcpy(buffer + 24U, data, 28U);
::memcpy(buffer + 24U, lsf, 28U);
if (m_debug)
CUtils::dump(1U, "M17 header transmitted", buffer, 52U);
@@ -111,12 +111,13 @@ bool CM17Network::writeHeader(const std::string& source, const std::string& dest
return m_socket.write(buffer, 52U, m_addr, m_addrLen);
}
bool CM17Network::writeData(const std::string& source, const std::string& dest, const unsigned char* data)
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];
@@ -134,12 +135,14 @@ bool CM17Network::writeData(const std::string& source, const std::string& dest,
::memset(buffer + 15U, ' ', 9U);
::memcpy(buffer + 15U, dest.c_str(), dest.size());
::memcpy(buffer + 24U, data, 18U);
::memcpy(buffer + 24U, lsf, 6U);
::memcpy(buffer + 30U, data, 18U);
if (m_debug)
CUtils::dump(1U, "M17 data transmitted", buffer, 42U);
CUtils::dump(1U, "M17 data transmitted", buffer, 48U);
return m_socket.write(buffer, 42U, m_addr, m_addrLen);
return m_socket.write(buffer, 48U, m_addr, m_addrLen);
}
void CM17Network::clock(unsigned int ms)