From 035249b5e09848882a0ce4b0f37f772fc097591f Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 24 Nov 2020 12:52:19 +0000
Subject: [PATCH] Reinstate the IP address logging for the reflector.

---
 YSFReflector/UDPSocket.cpp    | 28 ++++++++++++++++++++++++++++
 YSFReflector/UDPSocket.h      |  2 ++
 YSFReflector/Version.h        |  2 +-
 YSFReflector/YSFReflector.cpp | 23 ++++++++++++++++-------
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/YSFReflector/UDPSocket.cpp b/YSFReflector/UDPSocket.cpp
index 510c8a2..f52249d 100644
--- a/YSFReflector/UDPSocket.cpp
+++ b/YSFReflector/UDPSocket.cpp
@@ -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)));
 }
 
+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)
 {
 	return open(address.ss_family);
diff --git a/YSFReflector/UDPSocket.h b/YSFReflector/UDPSocket.h
index 6e3846c..003483b 100644
--- a/YSFReflector/UDPSocket.h
+++ b/YSFReflector/UDPSocket.h
@@ -70,6 +70,8 @@ public:
 
 	static bool isNone(const sockaddr_storage& addr);
 
+	static char* display(const sockaddr_storage& address, char* buffer, unsigned int length);
+
 private:
 	std::string    m_address_save;
 	unsigned short m_port_save;
diff --git a/YSFReflector/Version.h b/YSFReflector/Version.h
index e9186a6..23a8298 100644
--- a/YSFReflector/Version.h
+++ b/YSFReflector/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201101";
+const char* VERSION = "20201124";
 
 #endif
diff --git a/YSFReflector/YSFReflector.cpp b/YSFReflector/YSFReflector.cpp
index 36a10de..af653d9 100644
--- a/YSFReflector/YSFReflector.cpp
+++ b/YSFReflector/YSFReflector.cpp
@@ -211,12 +211,16 @@ void CYSFReflector::run()
 					rpt->m_addrLen  = addrLen;
 					m_repeaters.push_back(rpt);
 					network.setCount(m_repeaters.size());
-					LogMessage("Adding %s", rpt->m_callsign.c_str());
+
+					char buff[80U];
+					LogMessage("Adding %s (%s)", rpt->m_callsign.c_str(), CUDPSocket::display(addr, buff, 80U));
 				}
 				rpt->m_timer.start();
 				network.writePoll(addr, addrLen);
 			} else if (::memcmp(buffer + 0U, "YSFU", 4U) == 0 && rpt != NULL) {
-				LogMessage("Removing %s unlinked", rpt->m_callsign.c_str());
+				char buff[80U];
+				LogMessage("Removing %s (%s) unlinked", rpt->m_callsign.c_str(), CUDPSocket::display(addr, buff, 80U));
+
 				for (std::vector<CYSFRepeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
 					CYSFRepeater* itRpt = *it;
 					if (CUDPSocket::match(itRpt->m_addr, rpt->m_addr)) {
@@ -291,7 +295,9 @@ void CYSFReflector::run()
 		for (std::vector<CYSFRepeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
 			CYSFRepeater* itRpt = *it;
 			if (itRpt->m_timer.hasExpired()) {
-				LogMessage("Removing %s disappeared", itRpt->m_callsign.c_str());
+				char buff[80U];
+				LogMessage("Removing %s (%s) disappeared", itRpt->m_callsign.c_str(), CUDPSocket::display(itRpt->m_addr, buff, 80U));
+
 				m_repeaters.erase(it);
 				delete itRpt;
 				network.setCount(m_repeaters.size());
@@ -340,9 +346,12 @@ void CYSFReflector::dumpRepeaters() const
 	LogMessage("Currently linked repeaters/gateways:");
 
 	for (std::vector<CYSFRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
-		std::string callsign = (*it)->m_callsign;
-		unsigned int timer   = (*it)->m_timer.getTimer();
-		unsigned int timeout = (*it)->m_timer.getTimeout();
-		LogMessage("    %s: %u/%u", callsign.c_str(), timer, timeout);
+		std::string callsign  = (*it)->m_callsign;
+		sockaddr_storage addr = (*it)->m_addr;
+		unsigned int timer    = (*it)->m_timer.getTimer();
+		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);
 	}
 }