@@ -122,17 +122,17 @@
  * @brief A class representing an A DNS resource record.
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFADNSResourceRecord: OFDNSResourceRecord
 {
-	of_socket_address_t _address;
+	OFSocketAddress _address;
 }
 
 /**
  * @brief The IPv4 address of the resource record.
  */
-@property (readonly, nonatomic) const of_socket_address_t *address;
+@property (readonly, nonatomic) const OFSocketAddress *address;
 
 - (instancetype)initWithName: (OFString *)name
 		    DNSClass: (of_dns_class_t)DNSClass
 		  recordType: (of_dns_record_type_t)recordType
 			 TTL: (uint32_t)TTL OF_UNAVAILABLE;
@@ -145,11 +145,11 @@
  * @param address The address for the resource record
  * @param TTL The time to live for the resource record
  * @return An initialized OFADNSResourceRecord
  */
 - (instancetype)initWithName: (OFString *)name
-		     address: (const of_socket_address_t *)address
+		     address: (const OFSocketAddress *)address
 			 TTL: (uint32_t)TTL OF_DESIGNATED_INITIALIZER;
 @end
 
 /**
  * @class OFAAAADNSResourceRecord \
@@ -158,17 +158,17 @@
  * @brief A class represenging a DNS resource record.
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFAAAADNSResourceRecord: OFDNSResourceRecord
 {
-	of_socket_address_t _address;
+	OFSocketAddress _address;
 }
 
 /**
  * @brief The IPv6 address of the resource record.
  */
-@property (readonly, nonatomic) const of_socket_address_t *address;
+@property (readonly, nonatomic) const OFSocketAddress *address;
 
 - (instancetype)initWithName: (OFString *)name
 		    DNSClass: (of_dns_class_t)DNSClass
 		  recordType: (of_dns_record_type_t)recordType
 			 TTL: (uint32_t)TTL OF_UNAVAILABLE;
@@ -181,11 +181,11 @@
  * @param address The address for the resource record
  * @param TTL The time to live for the resource record
  * @return An initialized OFAAAADNSResourceRecord
  */
 - (instancetype)initWithName: (OFString *)name
-		     address: (const of_socket_address_t *)address
+		     address: (const OFSocketAddress *)address
 			 TTL: (uint32_t)TTL OF_DESIGNATED_INITIALIZER;
 @end
 
 /**
  * @class OFCNAMEDNSResourceRecord \