1 files changed, 13 insertions, 17 deletions

diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h
index ffe2015947..962f228c3c 100644
--- a/drivers/unix/socket_helpers.h
+++ b/drivers/unix/socket_helpers.h
@@ -20,31 +20,30 @@ static size_t _set_sockaddr(struct sockaddr_storage* p_addr, const IP_Address& p
 
 	memset(p_addr, 0, sizeof(struct sockaddr_storage));
 
-	// Dual stack (ANY) or matching ip type is required
-	ERR_FAIL_COND_V(p_sock_type != IP::TYPE_ANY && p_sock_type != p_ip.type,0);
+	ERR_FAIL_COND_V(p_ip==IP_Address(),0);
 
 	// IPv6 socket
 	if (p_sock_type == IP::TYPE_IPV6 || p_sock_type == IP::TYPE_ANY) {
 
+		// IPv6 only socket with IPv4 address
+		ERR_FAIL_COND_V(p_sock_type == IP::TYPE_IPV6 && p_ip.is_ipv4(),0);
+
 		struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
 		addr6->sin6_family = AF_INET6;
 		addr6->sin6_port = htons(p_port);
-		if(p_ip.type == IP_Address::TYPE_IPV4) {
-			// Remapping needed
-			uint16_t base[8] = {0x0, 0x0, 0x0, 0x0, 0x0, 0xffff, p_ip.field16[0], p_ip.field16[1]};
-			copymem(&addr6->sin6_addr.s6_addr, base, 16);
-
-		} else {
-			copymem(&addr6->sin6_addr.s6_addr, p_ip.field8, 16);
-		}
+		copymem(&addr6->sin6_addr.s6_addr, p_ip.get_ipv6(), 16);
 		return sizeof(sockaddr_in6);
 
 	} else { // IPv4 socket
 
+		// IPv4 socket with IPv6 address
+		ERR_FAIL_COND_V(!p_ip.is_ipv4(),0);
+
+		uint32_t ipv4 = *((uint32_t *)p_ip.get_ipv4());
 		struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
-		addr4->sin_family = AF_INET;    // host byte order
+		addr4->sin_family = AF_INET;
 		addr4->sin_port = htons(p_port);  // short, network byte order
-		addr4->sin_addr = *((struct in_addr*)&p_ip.field32[0]);
+		copymem(&addr4->sin_addr.s_addr, p_ip.get_ipv4(), 16);
 		return sizeof(sockaddr_in);
 	};
 };
@@ -92,19 +91,16 @@ static int _socket_create(IP::Type p_type, int type, int protocol) {
 static void _set_ip_addr_port(IP_Address& r_ip, int& r_port, struct sockaddr_storage* p_addr) {
 
 	if (p_addr->ss_family == AF_INET) {
-		r_ip.type = IP_Address::TYPE_IPV4;
 
 		struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
-		r_ip.field32[0] = (uint32_t)addr4->sin_addr.s_addr;
+		r_ip.set_ipv4((uint8_t *)&(addr4->sin_addr.s_addr));
 
 		r_port = ntohs(addr4->sin_port);
 
 	} else if (p_addr->ss_family == AF_INET6) {
 
-		r_ip.type = IP_Address::TYPE_IPV6;
-
 		struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
-		copymem(&r_ip.field8, addr6->sin6_addr.s6_addr, 16);
+		r_ip.set_ipv6(addr6->sin6_addr.s6_addr);
 
 		r_port = ntohs(addr6->sin6_port);
 	};