[DXFC-395] Add the ability to enumerate all resolved IP addresses by DNS names

Author: ttldtor

src/AddressesManager.cpp

@@ -122,4 +122,13 @@ const char* dx_am_get_current_connected_address(dxf_connection_t connection) {
 
 	return currentConnectedAddress.c_str();
 }
+
+const char* dx_am_get_current_connected_socket_address(dxf_connection_t connection) {
+	thread_local std::string currentConnectedSocketAddress{};
+
+	currentConnectedSocketAddress = dx::AddressesManager::getInstance()->getCurrentSocketIpAddress(connection) + ":" +
+		dx::AddressesManager::getInstance()->getCurrentAddressPort(connection);
+
+	return currentConnectedSocketAddress.c_str();
+}
 }

src/AddressesManager.h

@@ -51,6 +51,7 @@ void dx_am_set_current_address_tls_trust_store_len(dxf_connection_t connection,
 void dx_am_set_current_address_tls_key_store_mem(dxf_connection_t connection, uint8_t* key_store_mem);
 void dx_am_set_current_address_tls_key_store_len(dxf_connection_t connection, size_t key_store_len);
 const char* dx_am_get_current_connected_address(dxf_connection_t connection);
+const char* dx_am_get_current_connected_socket_address(dxf_connection_t connection);
 
 #ifdef __cplusplus
 }

src/AddressesManager.hpp

@@ -300,7 +300,7 @@ class AddressesManager {
 	}
 
 	// Non thread-safe. Checks the connection
-	SocketAddress* getCurrentSocketAddress(dxf_connection_t connection) {
+	SocketAddress* getCurrentSocketAddressImpl(dxf_connection_t connection) {
 		if (connection == nullptr) {
 			return nullptr;
 		}
@@ -392,7 +392,7 @@ class AddressesManager {
 
 	bool isCurrentSocketAddressConnectionFailed(dxf_connection_t connection) {
 		std::lock_guard<std::mutex> guard(mutex_);
-		const auto* sa = getCurrentSocketAddress(connection);
+		const auto* sa = getCurrentSocketAddressImpl(connection);
 
 		if (!sa) {
 			return true;
@@ -403,7 +403,7 @@ class AddressesManager {
 
 	void setCurrentSocketAddressConnectionFailed(dxf_connection_t connection, bool connectionFailed) {
 		std::lock_guard<std::mutex> guard(mutex_);
-		auto* sa = getCurrentSocketAddress(connection);
+		auto* sa = getCurrentSocketAddressImpl(connection);
 
 		if (!sa) {
 			return;
@@ -434,6 +434,17 @@ class AddressesManager {
 		return a->password;
 	}
 
+	std::string getCurrentSocketIpAddress(dxf_connection_t connection) {
+		std::lock_guard<std::mutex> guard(mutex_);
+		const auto* sa = getCurrentSocketAddressImpl(connection);
+
+		if (!sa) {
+			return "";
+		}
+
+		return sa->resolvedIp;
+	}
+
 	std::string getCurrentAddressHost(dxf_connection_t connection) {
 		std::lock_guard<std::mutex> guard(mutex_);
 		const auto* a = getCurrentAddressImpl(connection);
@@ -471,7 +482,7 @@ class AddressesManager {
 									 int* addressProtocol, sockaddr* nativeSocketAddress,
 									 std::size_t* nativeSocketAddressLength) {
 		std::lock_guard<std::mutex> guard(mutex_);
-		const auto* sa = getCurrentSocketAddress(connection);
+		const auto* sa = getCurrentSocketAddressImpl(connection);
 
 		if (!sa || !addressFamily || !addressSocketType || !addressProtocol || !nativeSocketAddress ||
 			!nativeSocketAddressLength) {

src/DXNetwork.c

@@ -691,9 +691,14 @@ static int dx_connect_via_socket(dx_network_connection_context_t* context) {
 		return false;
 	}
 
+	dx_logging_info(L"Connecting to %hs (%hs)", dx_am_get_current_connected_address(context->connection),
+					dx_am_get_current_connected_socket_address(context->connection));
 	context->s = dx_socket(address_family, address_socket_type, address_protocol);
 
 	if (context->s == INVALID_SOCKET) {
+		dx_logging_info(L"Failed to connect to %hs (%hs): Invalid socket",
+						dx_am_get_current_connected_address(context->connection),
+						dx_am_get_current_connected_socket_address(context->connection));
 		/* failed to create a new socket */
 
 		return false;
@@ -702,6 +707,8 @@ static int dx_connect_via_socket(dx_network_connection_context_t* context) {
 	if (!dx_connect(context->s, &native_socket_address, (socklen_t)native_socket_address_length)) {
 		/* failed to connect */
 
+		dx_logging_info(L"Failed to connect to %hs (%hs)", dx_am_get_current_connected_address(context->connection),
+						dx_am_get_current_connected_socket_address(context->connection));
 		dx_close(context->s);
 
 		return false;
@@ -940,7 +947,8 @@ int dx_bind_to_address(dxf_connection_t connection, const char* address, const d
 
 	context->set_fields_flags |= MUTEX_FIELD_FLAG;
 
-	if ((context->address = dx_ansi_create_string_src(address)) == NULL || !dx_check_if_address_is_file_and_set_raw_dump_file_flag(context) ||
+	if ((context->address = dx_ansi_create_string_src(address)) == NULL ||
+		!dx_check_if_address_is_file_and_set_raw_dump_file_flag(context) ||
 		!dx_connect_to_file_or_open_socket(context)) {
 		return false;
 	}

src/DXSockets.h

@@ -33,17 +33,18 @@
 #	include <WS2tcpip.h>
 #	pragma warning(pop)
 
-	typedef SOCKET dx_socket_t;
+typedef SOCKET dx_socket_t;
 #else
 #	include <unistd.h>
 #	include <sys/types.h>
 #	include <sys/socket.h>
 #	include <netinet/in.h>
+#	include <arpa/inet.h>
 #	include <netdb.h>
 #	include <errno.h>
 
 #	define INVALID_SOCKET -1
-#	define SOCKET_ERROR -1
+#	define SOCKET_ERROR   -1
 
 typedef int dx_socket_t;
 #endif /* _WIN32 */
@@ -58,22 +59,21 @@ typedef int dx_socket_t;
  */
 /* -------------------------------------------------------------------------- */
 
-int dx_on_connection_created (void);
-int dx_on_connection_destroyed (void);
+int dx_on_connection_created(void);
+int dx_on_connection_destroyed(void);
 
 /* -------------------------------------------------------------------------- */
 /*
  *	Socket function wrappers
  */
 /* -------------------------------------------------------------------------- */
 
-dx_socket_t dx_socket (int family, int type, int protocol);
-int dx_connect (dx_socket_t s, const struct sockaddr* addr, socklen_t addrlen);
-int dx_send (dx_socket_t s, const void* buffer, int buflen);
-int dx_recv (dx_socket_t s, void* buffer, int buflen);
-int dx_close (dx_socket_t s);
-int dx_getaddrinfo (const char* nodename, const char* servname,
-					const struct addrinfo* hints, struct addrinfo** res);
-void dx_freeaddrinfo (struct addrinfo* res);
+dx_socket_t dx_socket(int family, int type, int protocol);
+int dx_connect(dx_socket_t s, const struct sockaddr* addr, socklen_t addrlen);
+int dx_send(dx_socket_t s, const void* buffer, int buflen);
+int dx_recv(dx_socket_t s, void* buffer, int buflen);
+int dx_close(dx_socket_t s);
+int dx_getaddrinfo(const char* nodename, const char* servname, const struct addrinfo* hints, struct addrinfo** res);
+void dx_freeaddrinfo(struct addrinfo* res);
 
 #endif /* DX_SOCKETS_H_INCLUDED */