ShaYmez
/
P25Clients
mirror of https://github.com/ShaYmez/P25Clients.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hopefully fix the display of IP addresses in the reflector.

This commit is contained in:
Jonathan Naylor 2021-09-12 20:24:14 +01:00
parent c367659664
commit ba9a11615a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P25Reflector/P25Reflector.cpp
View File

@ -357,7 +357,7 @@ void CP25Reflector::dumpRepeaters() const
char buffer[80U]; char buffer[80U];
LogMessage(" %s: %s %u/%u", (*it)->m_callsign.c_str(), LogMessage(" %s: %s %u/%u", (*it)->m_callsign.c_str(),
CUDPSocket::display((*it)->m_addr, buffer, 80U), CUDPSocket::display((*it)->m_addr, buffer, 80U),
(*it)->m_timer.getTimeout(), (*it)->m_timer.getTimer(),
(*it)->m_timer.getTimeout()); (*it)->m_timer.getTimeout());
} }
} }

18
P25Reflector/UDPSocket.cpp
View File

@ -167,18 +167,18 @@ char* CUDPSocket::display(const sockaddr_storage& addr, char* buffer, unsigned i
assert(length > INET6_ADDRSTRLEN); assert(length > INET6_ADDRSTRLEN);
switch (addr.ss_family) { switch (addr.ss_family) {
case AF_INET: { case AF_INET: {
struct sockaddr_in* in4 = (struct sockaddr_in*)&addr; struct sockaddr_in* in4 = (struct sockaddr_in*)&addr;
::inet_ntop(AF_INET, &in4->sin_addr, buffer, length); ::inet_ntop(AF_INET, &in4->sin_addr, buffer, length);
::sprintf(buffer + ::strlen(buffer), ":%u", in4->sin_port); ::sprintf(buffer + ::strlen(buffer), ":%u", in4->sin_port);
} }
break; break;
case AF_INET6: { case AF_INET6: {
struct sockaddr_in6* in6 = (struct sockaddr_in6*)&addr; struct sockaddr_in6* in6 = (struct sockaddr_in6*)&addr;
::inet_ntop(AF_INET6, &in6->sin6_addr, buffer, length); ::inet_ntop(AF_INET6, &in6->sin6_addr, buffer, length);
::sprintf(buffer + ::strlen(buffer), ":%u", in6->sin6_port); ::sprintf(buffer + ::strlen(buffer), ":%u", in6->sin6_port);
} }
break; break;
default: default:

2
P25Reflector/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 = "20210824"; const char* VERSION = "20210912";
#endif #endif