@@ -60,12 +60,11 @@
  * To create a server, create a socket, bind it and listen on it.
  */
 @interface OFTCPSocket: OFStreamSocket
 {
 	bool _listening;
-	struct sockaddr *_Nullable _address;
-	socklen_t _addressLength;
+	of_socket_address_t _remoteAddress;
 	OFString *_Nullable _SOCKS5Host;
 	uint16_t _SOCKS5Port;
 #ifdef OF_WII
 	uint16_t _port;
 #endif
@@ -80,15 +79,15 @@
  * @brief Whether the socket is a listening socket.
  */
 @property (readonly, nonatomic, getter=isListening) bool listening;
 
 /*!
- * @brief The remote address as a string
+ * @brief The remote address.
  *
  * @note This only works for accepted sockets!
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *remoteAddress;
+@property (readonly, nonatomic) const of_socket_address_t *remoteAddress;
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 /*!
  * @brief Whether keep alives are enabled for the connection.
  *