@@ -39,29 +39,26 @@
 #import "socket_helpers.h"
 
 @implementation OFUDPSocket
 @dynamic delegate;
 
-- (uint16_t)of_bindToAddress: (of_socket_address_t *)address
+- (uint16_t)of_bindToAddress: (OFSocketAddress *)address
 		   extraType: (int)extraType OF_DIRECT
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFString *host;
 	uint16_t port;
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	int flags;
 #endif
 
 	if ((_socket = socket(address->sockaddr.sockaddr.sa_family,
-	    SOCK_DGRAM | SOCK_CLOEXEC | extraType, 0)) == INVALID_SOCKET) {
-		host = of_socket_address_ip_string(address, &port);
+	    SOCK_DGRAM | SOCK_CLOEXEC | extraType, 0)) == INVALID_SOCKET)
 		@throw [OFBindFailedException
-		    exceptionWithHost: host
-				 port: port
+		    exceptionWithHost: OFSocketAddressString(address)
+				 port: OFSocketAddressPort(address)
 			       socket: self
 				errNo: of_socket_errno()];
-	}
 
 	_canBlock = true;
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	/* {} needed to avoid warning with Clang 10 if next #if is false. */
@@ -69,24 +66,24 @@
 		fcntl(_socket, F_SETFD, flags | FD_CLOEXEC);
 	}
 #endif
 
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
-	if (of_socket_address_get_port(address) != 0) {
+	if (OFSocketAddressPort(address) != 0) {
 #endif
 		if (bind(_socket, &address->sockaddr.sockaddr,
 		    address->length) != 0) {
 			int errNo = of_socket_errno();
 
 			closesocket(_socket);
 			_socket = INVALID_SOCKET;
 
-			host = of_socket_address_ip_string(address, &port);
-			@throw [OFBindFailedException exceptionWithHost: host
-								   port: port
-								 socket: self
-								  errNo: errNo];
+			@throw [OFBindFailedException
+			    exceptionWithHost: OFSocketAddressString(address)
+					 port: OFSocketAddressPort(address)
+				       socket: self
+					errNo: errNo];
 		}
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	} else {
 		for (;;) {
 			uint16_t rnd = 0;
@@ -93,26 +90,26 @@
 			int ret;
 
 			while (rnd < 1024)
 				rnd = (uint16_t)rand();
 
-			of_socket_address_set_port(address, rnd);
+			OFSocketAddressSetPort(address, rnd);
 
 			if ((ret = bind(_socket, &address->sockaddr.sockaddr,
 			    address->length)) == 0) {
 				port = rnd;
 				break;
 			}
 
 			if (of_socket_errno() != EADDRINUSE) {
 				int errNo = of_socket_errno();
+				OFString *host = OFSocketAddressString(address);
+				uint16_t port = OFSocketAddressPort(port);
 
 				closesocket(_socket);
 				_socket = INVALID_SOCKET;
 
-				host = of_socket_address_ip_string(
-				    address, &port);
 				@throw [OFBindFailedException
 				    exceptionWithHost: host
 						 port: port
 					       socket: self
 						errNo: errNo];
@@ -121,11 +118,11 @@
 	}
 #endif
 
 	objc_autoreleasePoolPop(pool);
 
-	if ((port = of_socket_address_get_port(address)) > 0)
+	if ((port = OFSocketAddressPort(address)) > 0)
 		return port;
 
 #if !defined(OF_HPUX) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	memset(address, 0, sizeof(*address));
 
@@ -135,15 +132,15 @@
 		int errNo = of_socket_errno();
 
 		closesocket(_socket);
 		_socket = INVALID_SOCKET;
 
-		host = of_socket_address_ip_string(address, &port);
-		@throw [OFBindFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindFailedException
+		    exceptionWithHost: OFSocketAddressString(address)
+				 port: OFSocketAddressPort(address)
+			       socket: self
+				errNo: errNo];
 	}
 
 	if (address->sockaddr.sockaddr.sa_family == AF_INET)
 		return OF_BSWAP16_IF_LE(address->sockaddr.in.sin_port);
 # ifdef OF_HAVE_IPV6
@@ -152,46 +149,46 @@
 # endif
 	else {
 		closesocket(_socket);
 		_socket = INVALID_SOCKET;
 
-		host = of_socket_address_ip_string(address, &port);
-		@throw [OFBindFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: EAFNOSUPPORT];
+		@throw [OFBindFailedException
+		    exceptionWithHost: OFSocketAddressString(address)
+				 port: OFSocketAddressPort(address)
+			       socket: self
+				errNo: EAFNOSUPPORT];
 	}
 #else
 	closesocket(_socket);
 	_socket = INVALID_SOCKET;
 
-	host = of_socket_address_ip_string(address, &port);
-	@throw [OFBindFailedException exceptionWithHost: host
-						   port: port
-						 socket: self
-						  errNo: EADDRNOTAVAIL];
+	@throw [OFBindFailedException
+	    exceptionWithHost: OFSocketAddressString(address)
+			 port: OFSocketAddressPort(address)
+		       socket: self
+			errNo: EADDRNOTAVAIL];
 #endif
 }
 
 - (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFData *socketAddresses;
-	of_socket_address_t address;
+	OFSocketAddress address;
 
 	if (_socket != INVALID_SOCKET)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
 	socketAddresses = [[OFThread DNSResolver]
 	    resolveAddressesForHost: host
-		      addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY];
+		      addressFamily: OFSocketAddressFamilyAny];
 
-	address = *(of_socket_address_t *)[socketAddresses itemAtIndex: 0];
-	of_socket_address_set_port(&address, port);
+	address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0];
+	OFSocketAddressSetPort(&address, port);
 
 	port = [self of_bindToAddress: &address extraType: 0];
 
 	objc_autoreleasePoolPop(pool);
 
 	return port;
 }
 @end