dd getIPString

BaseCommon/NetUtils.cpp

@@ -125,14 +125,22 @@ void CNetUtils::getIPString(const struct sockaddr_storage& sas, std::string& str
 {
 	const struct sockaddr_storage* sasptr = &sas;
 	switch(sasptr->ss_family) {
-		char s[1024];
+		
         case AF_INET:
-            inet_ntop(AF_INET, &(TOIPV4(sas)->sin_addr), s, 1024);
+		{
+			char s[INET_ADDRSTRLEN];
+            inet_ntop(AF_INET, &(TOIPV4(sas)->sin_addr), s, INET_ADDRSTRLEN);
+			str.assign(s);
             break;
+		}
 
         case AF_INET6:
-			inet_ntop(AF_INET6, &(TOIPV6(sas)->sin6_addr), s, 1024);
+		{
+			char s[INET6_ADDRSTRLEN];
+			inet_ntop(AF_INET6, &(TOIPV6(sas)->sin6_addr), s, INET6_ADDRSTRLEN);
+			str.assign(s);
             break;
+		}
 
         default:
             str.clear();

Tests/NetUtils/getIPString.cpp

@@ -0,0 +1,42 @@
+/*
+ *   Copyright (C) 2021-2023 by Geoffrey Merck F4FXL / KC3FRA
+ *
+ *   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
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gtest/gtest.h>
+
+#include <netdb.h>
+
+#include "NetUtils.h"
+
+namespace NetUtilsTests
+{
+    class NetUtils_getIPString: public ::testing::Test {
+    
+    };
+
+    TEST_F(NetUtils_getIPString, anyAddrV4)
+    {
+        sockaddr_storage addr;
+        std::string s;
+
+        TOIPV4(addr)->sin_addr.s_addr = INADDR_ANY;
+
+        CNetUtils::getIPString(addr, s);
+
+        EXPECT_STREQ(s.c_str(), "0.0.0.0");
+    }
+}