fixed issue with network utils

Author: dac1976

Include/Asio/NetworkUtils.h

@@ -29,6 +29,7 @@
 #include <string>
 #include <vector>
 #include <cstdint>
+#include <utility>
 #include "Platform/PlatformDefines.h"
 #if defined(IS_CPP17)
 #include <string_view>
@@ -136,6 +137,8 @@ CORE_LIBRARY_DLL_SHARED_API std::string BuildBroadcastAddress(std::string_view a
 CORE_LIBRARY_DLL_SHARED_API std::string BuildBroadcastAddress(std::string const& address, std::string const& subnetMask);
 #endif
 
+// Check if 2 addresses (with their subnet masks) are on the same subnet. This is done by checking if the broadcast address
+// for the address and subnet mask is the same as the broadcast address for the adapter address and adapter subnet mask.
 #if defined(IS_CPP17)
 CORE_LIBRARY_DLL_SHARED_API bool IsAddressAndNetmaskOnSameSubnetAsAdapter(std::string_view ipAddress, std::string_view netmask,
                                               std::string_view adapterAddress,
@@ -147,6 +150,14 @@ CORE_LIBRARY_DLL_SHARED_API bool IsAddressAndNetmaskOnSameSubnetAsAdapter(std::s
                                               std::string const& adapterNetmask);
 #endif
 
+// Function to look up the IP address and subnet mask for a given adapter name. The adapter name is the friendly name
+// of the adapter, e.g. "Ethernet", "Wi-Fi" etc.
+#if defined(IS_CPP17)
+CORE_LIBRARY_DLL_SHARED_API std::pair<std::string, std::string> GetIpAddressAndNetmask(std::string_view adapterName);
+#else
+CORE_LIBRARY_DLL_SHARED_API std::pair<std::string, std::string> GetIpAddressAndNetmask(std::string const& adapterName);
+#endif
+
 
 } // namespace core_lib
 

Source/Asio/NetworkUtils.cpp

@@ -289,7 +289,11 @@ bool IsAddressAndNetmaskOnSameSubnetAsAdapter(std::string const& ipAddress,
     }
 }
 
-std::pair<std::string, std::string> GetIpAddressAndNetmask(std::string const& adapterName)
+#if defined(IS_CPP17)
+std::pair<std::string, std::string> GetIpAddressAndNetmask(std::string_view adapterName);
+#else
+std::pair<std::string, std::string> GetIpAddressAndNetmask(std::string const& adapterName);
+#endif
 #if BOOST_OS_LINUX
 {
     // Create a temporary socket so we can grab our adapter details.
@@ -301,7 +305,7 @@ std::pair<std::string, std::string> GetIpAddressAndNetmask(std::string const& ad
 
     // Set the adapter we want to find info for.
     memset(&ifr.ifr_name, 0, sizeof(ifr.ifr_name));
-    adapterName.copy(ifr.ifr_name, IFNAMSIZ - 1);
+    string_utils::SafeCopyCharArray(ifr.ifr_name, IFNAMSIZ, adapterName.data(), adapterName.size());
 
     // Use icotl to retrieve IP address.
     if (ioctl(fd, SIOCGIFADDR, &ifr) < 0)