ShaYmez/P25Clients
1
0
Fork 0
mirror of https://github.com/ShaYmez/P25Clients.git synced 2024-11-25 05:38:39 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #281 from f1rmb/network_status

Browse Source 
Add new remote command:
This commit is contained in:
Jonathan Naylor 2022-01-24 07:10:50 +00:00 committed by GitHub
commit 46a2d6334d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
P25Gateway/P25Gateway.cpp
View File

@ -36,6 +36,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
@ -514,6 +515,21 @@ void CP25Gateway::run()
voice->linkedTo(currentTG); voice->linkedTo(currentTG);
} }
} }
} else if (::memcmp(buffer + 0U, "status", 6U) == 0) {
std::string state = std::string("p25:") + ((currentAddrLen > 0) ? "conn" : "disc");
remoteSocket->write((unsigned char*)state.c_str(), (unsigned int)state.length(), addr, addrLen);
} else if (::memcmp(buffer + 0U, "host", 4U) == 0) {
std::string ref;
if (currentAddrLen > 0) {
char buffer[INET6_ADDRSTRLEN];
if (getnameinfo((struct sockaddr*)&currentAddr, currentAddrLen, buffer, sizeof(buffer), 0, 0, NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
ref = std::string(buffer);
}
}
std::string host = std::string("p25:\"") + ((ref.length() == 0) ? "NONE" : ref) + "\"";
remoteSocket->write((unsigned char*)host.c_str(), (unsigned int)host.length(), addr, addrLen);
} else { } else {
CUtils::dump("Invalid remote command received", buffer, res); CUtils::dump("Invalid remote command received", buffer, res);
} }