dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request from f1rmb/fix_remote_commands

Browse source
This commit is contained in:
Jonathan Naylor 2022-01-05 09:26:00 +00:00 • committed by GitHub
commit d3ee33ab0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions

5
YSFGateway/YSFGateway.cpp
View file

@ -47,6 +47,7 @@ const char* DEFAULT_INI_FILE = "/etc/YSFGateway.ini";
#include <cstring> #include <cstring>
#include <clocale> #include <clocale>
#include <cmath> #include <cmath>
#include <algorithm>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
@ -880,6 +881,8 @@ void CYSFGateway::processRemoteCommands()
buffer[res] = '\0'; buffer[res] = '\0';
if (::memcmp(buffer + 0U, "LinkYSF", 7U) == 0) { if (::memcmp(buffer + 0U, "LinkYSF", 7U) == 0) {
std::string id = std::string((char*)(buffer + 7U)); std::string id = std::string((char*)(buffer + 7U));
// Left trim
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);
if (reflector == NULL) if (reflector == NULL)
reflector = m_reflectors->findByName(id); reflector = m_reflectors->findByName(id);
@ -909,6 +912,8 @@ void CYSFGateway::processRemoteCommands()
} }
} else if (::memcmp(buffer + 0U, "LinkFCS", 7U) == 0) { } else if (::memcmp(buffer + 0U, "LinkFCS", 7U) == 0) {
std::string raw = std::string((char*)(buffer + 7U)); std::string raw = std::string((char*)(buffer + 7U));
// Left trim
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";
std::string idShort = "FCS"; std::string idShort = "FCS";
if (raw.length() == 3U) { if (raw.length() == 3U) {