ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-07-30 19:52:25 -04:00
Code Issues Projects Releases Wiki Activity

Reinstate the IP address logging for the reflector.

Browse Source
This commit is contained in:
Jonathan Naylor 2020-11-24 12:51:39 +00:00
parent 614823558d
commit 3f5d3fb358
4 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NXDNReflector/NXDNReflector.cpp
View File

@ -257,7 +257,8 @@ void CNXDNReflector::run()
rpt->m_callsign = std::string((char*)(buffer + 5U), 10U); rpt->m_callsign = std::string((char*)(buffer + 5U), 10U);
m_repeaters.push_back(rpt); m_repeaters.push_back(rpt);
LogMessage("Adding %s", rpt->m_callsign.c_str()); char buff[80U];
LogMessage("Adding %s (%s)", rpt->m_callsign.c_str(), CUDPSocket::display(address, buff, 80U));
} else { } else {
rpt->m_timer.start(); rpt->m_timer.start();
} }
@ -270,7 +271,9 @@ void CNXDNReflector::run()
if (id == tg) { if (id == tg) {
if (rpt != NULL) { if (rpt != NULL) {
std::string callsign = std::string((char*)(buffer + 5U), 10U); std::string callsign = std::string((char*)(buffer + 5U), 10U);
LogMessage("Removing %s", callsign.c_str());
char buff[80U];
LogMessage("Removing %s (%s) unlinked", callsign.c_str(), CUDPSocket::display(address, buff, 80U));
for (std::vector<CNXDNRepeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
if (*it == rpt) { if (*it == rpt) {
@ -514,7 +517,10 @@ void CNXDNReflector::run()
CNXDNRepeater* itRpt = *it; CNXDNRepeater* itRpt = *it;
if (itRpt->m_timer.hasExpired()) { if (itRpt->m_timer.hasExpired()) {
std::string callsign = itRpt->m_callsign; std::string callsign = itRpt->m_callsign;
LogMessage("Removing %s disappeared", callsign.c_str());
char buff[80U];
LogMessage("Removing %s (%s) disappeared", callsign.c_str(), CUDPSocket::display(itRpt->m_addr, buff, 80U));
m_repeaters.erase(it); m_repeaters.erase(it);
delete itRpt; delete itRpt;
break; break;
@ -576,10 +582,13 @@ void CNXDNReflector::dumpRepeaters() const
LogMessage("Currently linked repeaters:"); LogMessage("Currently linked repeaters:");
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
std::string callsign = (*it)->m_callsign; std::string callsign = (*it)->m_callsign;
unsigned int timer = (*it)->m_timer.getTimer(); sockaddr_storage addr = (*it)->m_addr;
unsigned int timeout = (*it)->m_timer.getTimeout(); unsigned int timer = (*it)->m_timer.getTimer();
LogMessage(" %s %u/%u", callsign.c_str(), timer, timeout); unsigned int timeout = (*it)->m_timer.getTimeout();
char buffer[80U];
LogMessage(" %s: %s %u/%u", callsign.c_str(), CUDPSocket::display(addr, buffer, 80U), timer, timeout);
} }
} }

28
NXDNReflector/UDPSocket.cpp
View File

@ -160,6 +160,34 @@ bool CUDPSocket::isNone(const sockaddr_storage& addr)
return ((addr.ss_family == AF_INET) && (in->sin_addr.s_addr == htonl(INADDR_NONE))); return ((addr.ss_family == AF_INET) && (in->sin_addr.s_addr == htonl(INADDR_NONE)));
} }
char* CUDPSocket::display(const sockaddr_storage& addr, char* buffer, unsigned int length)
{
assert(buffer != NULL);
assert(length > INET6_ADDRSTRLEN);
switch (addr.ss_family) {
case AF_INET: {
struct sockaddr_in* in4 = (struct sockaddr_in*)&addr;
::inet_ntop(AF_INET, &in4, buffer, length);
::sprintf(buffer + ::strlen(buffer), ":%u", in4->sin_port);
}
break;
case AF_INET6: {
struct sockaddr_in6* in6 = (struct sockaddr_in6*)&addr;
::inet_ntop(AF_INET6, &in6, buffer, length);
::sprintf(buffer + ::strlen(buffer), ":%u", in6->sin6_port);
}
break;
default:
::strcpy(buffer, "Unknown");
break;
}
return buffer;
}
bool CUDPSocket::open(const sockaddr_storage& address) bool CUDPSocket::open(const sockaddr_storage& address)
{ {
return open(address.ss_family); return open(address.ss_family);

2
NXDNReflector/UDPSocket.h
View File

@ -70,6 +70,8 @@ public:
static bool isNone(const sockaddr_storage& addr); static bool isNone(const sockaddr_storage& addr);
static char* display(const sockaddr_storage& address, char* buffer, unsigned int length);
private: private:
std::string m_address_save; std::string m_address_save;
unsigned short m_port_save; unsigned short m_port_save;

2
NXDNReflector/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20201101"; const char* VERSION = "20201124";
#endif #endif