@@ -64,23 +64,23 @@
 	return (dots >= minNumberOfDotsInAbsoluteName);
 }
 
 static bool
 addressForRecord(OF_KINDOF(OFDNSResourceRecord *) record,
-    const of_socket_address_t **address, OFSocketAddressFamily addressFamily)
+    const OFSocketAddress **address, OFSocketAddressFamily addressFamily)
 {
 	switch ([record recordType]) {
 #ifdef OF_HAVE_IPV6
 	case OF_DNS_RECORD_TYPE_AAAA:
-		if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_IPV6 &&
-		    addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY)
+		if (addressFamily != OFSocketAddressFamilyIPv6 &&
+		    addressFamily != OFSocketAddressFamilyAny)
 			return false;
 		break;
 #endif
 	case OF_DNS_RECORD_TYPE_A:
-		if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_IPV4 &&
-		    addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY)
+		if (addressFamily != OFSocketAddressFamilyIPv4 &&
+		    addressFamily != OFSocketAddressFamilyAny)
 			return false;
 		break;
 	default:
 		return false;
 	}
@@ -160,12 +160,12 @@
 							 _host, searchDomain];
 	} else
 		domainName = _host;
 
 #ifdef OF_HAVE_IPV6
-	if (_addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV6 ||
-	    _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) {
+	if (_addressFamily == OFSocketAddressFamilyIPv6 ||
+	    _addressFamily == OFSocketAddressFamilyAny) {
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: domainName
 			       DNSClass: OF_DNS_CLASS_IN
 			     recordType: OF_DNS_RECORD_TYPE_AAAA];
 		_numExpectedResponses++;
@@ -173,12 +173,12 @@
 				 runLoopMode: _runLoopMode
 				    delegate: self];
 	}
 #endif
 
-	if (_addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV4 ||
-	    _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) {
+	if (_addressFamily == OFSocketAddressFamilyIPv4 ||
+	    _addressFamily == OFSocketAddressFamilyAny) {
 		OFDNSQuery *query = [OFDNSQuery
 		    queryWithDomainName: domainName
 			       DNSClass: OF_DNS_CLASS_IN
 			     recordType: OF_DNS_RECORD_TYPE_A];
 		_numExpectedResponses++;
@@ -204,11 +204,11 @@
 		return;
 	}
 
 	for (OF_KINDOF(OFDNSResourceRecord *) record in
 	    [response.answerRecords objectForKey: query.domainName]) {
-		const of_socket_address_t *address = NULL;
+		const OFSocketAddress *address = NULL;
 		OFDNSQuery *CNAMEQuery;
 
 		if ([record DNSClass] != OF_DNS_CLASS_IN)
 			continue;
 
@@ -266,17 +266,16 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFArray OF_GENERIC(OFString *) *aliases;
 
 	@try {
-		of_socket_address_t address =
-		    of_socket_address_parse_ip(_host, 0);
+		OFSocketAddress address = OFSocketAddressParseIP(_host, 0);
 		OFData *addresses = nil;
 		id exception = nil;
 
 		if (_addressFamily == address.family ||
-		    _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY)
+		    _addressFamily == OFSocketAddressFamilyAny)
 			addresses = [OFData dataWithItems: &address
 						    count: 1
 						 itemSize: sizeof(address)];
 		else
 			exception = [OFInvalidArgumentException exception];
@@ -289,24 +288,24 @@
 	} @catch (OFInvalidFormatException *e) {
 	}
 
 	if ((aliases = [_settings->_staticHosts objectForKey: _host]) != nil) {
 		OFMutableData *addresses = [OFMutableData
-		    dataWithItemSize: sizeof(of_socket_address_t)];
+		    dataWithItemSize: sizeof(OFSocketAddress)];
 		id exception = nil;
 
 		for (OFString *alias in aliases) {
-			of_socket_address_t address;
+			OFSocketAddress address;
 
 			@try {
-				address = of_socket_address_parse_ip(alias, 0);
+				address = OFSocketAddressParseIP(alias, 0);
 			} @catch (OFInvalidFormatException *e) {
 				continue;
 			}
 
 			if (_addressFamily != address.family &&
-			    _addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY)
+			    _addressFamily != OFSocketAddressFamilyAny)
 				continue;
 
 			[addresses addItem: &address];
 		}
 
@@ -327,11 +326,11 @@
 		return;
 	}
 
 	_isFQDN = isFQDN(_host, _settings->_minNumberOfDotsInAbsoluteName);
 	_addresses = [[OFMutableData alloc]
-	    initWithItemSize: sizeof(of_socket_address_t)];
+	    initWithItemSize: sizeof(OFSocketAddress)];
 
 	[self sendQueries];
 
 	objc_autoreleasePoolPop(pool);
 }