From 3a9941024839320dc9bcaf39e1343ba6bb160db2 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 24 Aug 2021 18:56:59 +0100 Subject: [PATCH] Fix the IP display bug. --- YSFReflector/UDPSocket.cpp | 32 ++++++++++++++++---------------- YSFReflector/Version.h | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/YSFReflector/UDPSocket.cpp b/YSFReflector/UDPSocket.cpp index 206c2f1..d6aee95 100644 --- a/YSFReflector/UDPSocket.cpp +++ b/YSFReflector/UDPSocket.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2006-2016,2020,2021 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -166,23 +166,23 @@ char* CUDPSocket::display(const sockaddr_storage& addr, char* buffer, unsigned i 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_INET: { + struct sockaddr_in* in4 = (struct sockaddr_in*)&addr; + ::inet_ntop(AF_INET, &in4->sin_addr, 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; + case AF_INET6: { + struct sockaddr_in6* in6 = (struct sockaddr_in6*)&addr; + ::inet_ntop(AF_INET6, &in6->sin6_addr, buffer, length); + ::sprintf(buffer + ::strlen(buffer), ":%u", in6->sin6_port); + } + break; - default: - ::strcpy(buffer, "Unknown"); - break; + default: + ::strcpy(buffer, "Unknown"); + break; } return buffer; diff --git a/YSFReflector/Version.h b/YSFReflector/Version.h index 240e69c..ee48a9e 100644 --- a/YSFReflector/Version.h +++ b/YSFReflector/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20210215"; +const char* VERSION = "20210824"; #endif