@@ -15,10 +15,12 @@
  * file.
  */
 
 #import "OFObject.h"
 #import "OFString.h"
+
+#import "socket.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 /*! @file */
 
@@ -119,17 +121,17 @@
  *
  * @brief A class representing an A DNS resource record.
  */
 @interface OFADNSResourceRecord: OFDNSResourceRecord
 {
-	OFString *_address;
+	of_socket_address_t _address;
 }
 
 /*!
  * @brief The IPv4 address of the resource record.
  */
-@property (readonly, nonatomic) OFString *address;
+@property (readonly, nonatomic) const of_socket_address_t *address;
 
 - (instancetype)initWithName: (OFString *)name
 		 recordClass: (of_dns_resource_record_class_t)recordClass
 		  recordType: (of_dns_resource_record_type_t)recordType
 			 TTL: (uint32_t)TTL OF_UNAVAILABLE;
@@ -142,11 +144,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: (OFString *)address
+		     address: (const of_socket_address_t *)address
 			 TTL: (uint32_t)TTL OF_DESIGNATED_INITIALIZER;
 @end
 
 /*!
  * @class OFAAAADNSResourceRecord \
@@ -154,17 +156,17 @@
  *
  * @brief A class represenging a DNS resource record.
  */
 @interface OFAAAADNSResourceRecord: OFDNSResourceRecord
 {
-	OFString *_address;
+	of_socket_address_t _address;
 }
 
 /*!
  * @brief The IPv6 address of the resource record.
  */
-@property (readonly, nonatomic) OFString *address;
+@property (readonly, nonatomic) const of_socket_address_t *address;
 
 - (instancetype)initWithName: (OFString *)name
 		 recordClass: (of_dns_resource_record_class_t)recordClass
 		  recordType: (of_dns_resource_record_type_t)recordType
 			 TTL: (uint32_t)TTL OF_UNAVAILABLE;
@@ -177,11 +179,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: (OFString *)address
+		     address: (const of_socket_address_t *)address
 			 TTL: (uint32_t)TTL OF_DESIGNATED_INITIALIZER;
 @end
 
 /*!
  * @class OFCNAMEDNSResourceRecord \