1
0
Fork 0

Merge pull request #282 from f1rmb/fix_remote_commands

master
Jonathan Naylor 3 years ago committed by GitHub
commit 267b8e0809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -881,8 +881,8 @@ void CYSFGateway::processRemoteCommands()
int res = m_remoteSocket->read(buffer, 200U, addr, addrLen); int res = m_remoteSocket->read(buffer, 200U, addr, addrLen);
if (res > 0) { if (res > 0) {
buffer[res] = '\0'; buffer[res] = '\0';
if (::memcmp(buffer + 0U, "LinkYSF", 7U) == 0) { if ((::memcmp(buffer + 0U, "LinkYSF", 7U) == 0) && (strlen((char*)buffer + 0U) > 8)) {
std::string id = std::string((char*)(buffer + 7U)); std::string id = std::string((char*)(buffer + 8U));
// Left trim // Left trim
id.erase(id.begin(), std::find_if(id.begin(), id.end(), std::not1(std::ptr_fun<int, int>(std::isspace)))); id.erase(id.begin(), std::find_if(id.begin(), id.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
CYSFReflector* reflector = m_reflectors->findById(id); CYSFReflector* reflector = m_reflectors->findById(id);
@ -912,8 +912,8 @@ void CYSFGateway::processRemoteCommands()
LogWarning("Invalid YSF reflector id/name - \"%s\"", id.c_str()); LogWarning("Invalid YSF reflector id/name - \"%s\"", id.c_str());
return; return;
} }
} else if (::memcmp(buffer + 0U, "LinkFCS", 7U) == 0) { } else if ((::memcmp(buffer + 0U, "LinkFCS", 7U) == 0) && (strlen((char*)buffer + 0U) > 8)) {
std::string raw = std::string((char*)(buffer + 7U)); std::string raw = std::string((char*)(buffer + 8U));
// Left trim // Left trim
raw.erase(raw.begin(), std::find_if(raw.begin(), raw.end(), std::not1(std::ptr_fun<int, int>(std::isspace)))); raw.erase(raw.begin(), std::find_if(raw.begin(), raw.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
std::string id = "FCS00"; std::string id = "FCS00";

Loading…
Cancel
Save