@@ -29,24 +29,24 @@
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
 
 #import "OFTCPSocket.h"
+#import "OFAsyncIPSocketConnector.h"
 #import "OFDNSResolver.h"
 #import "OFData.h"
 #import "OFDate.h"
-#import "OFIPSocketAsyncConnector.h"
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 #import "OFString.h"
 #import "OFTCPSocketSOCKS5Connector.h"
 #import "OFThread.h"
 
 #import "OFAlreadyConnectedException.h"
-#import "OFBindFailedException.h"
+#import "OFBindIPSocketFailedException.h"
 #import "OFGetOptionFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFNotOpenException.h"
 #import "OFSetOptionFailedException.h"
 
@@ -54,11 +54,11 @@
     @"OFTCPSocketConnectRunLoopMode";
 
 static OFString *defaultSOCKS5Host = nil;
 static uint16_t defaultSOCKS5Port = 1080;
 
-@interface OFTCPSocket () <OFIPSocketAsyncConnecting>
+@interface OFTCPSocket () <OFAsyncIPSocketConnecting>
 @end
 
 @interface OFTCPSocketConnectDelegate: OFObject <OFTCPSocketDelegate>
 {
 @public
@@ -219,13 +219,10 @@
 	       runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	void *pool = objc_autoreleasePoolPush();
 	id <OFTCPSocketDelegate> delegate;
 
-	if (_socket != OFInvalidSocketHandle)
-		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
-
 	if (_SOCKS5Host != nil) {
 		delegate = [[[OFTCPSocketSOCKS5Connector alloc]
 		    initWithSocket: self
 			      host: host
 			      port: port
@@ -237,11 +234,11 @@
 		host = _SOCKS5Host;
 		port = _SOCKS5Port;
 	} else
 		delegate = _delegate;
 
-	[[[[OFIPSocketAsyncConnector alloc]
+	[[[[OFAsyncIPSocketConnector alloc]
 		  initWithSocket: self
 			    host: host
 			    port: port
 			delegate: delegate
 			   block: NULL
@@ -267,13 +264,10 @@
 		     block: (OFTCPSocketAsyncConnectBlock)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	id <OFTCPSocketDelegate> delegate = nil;
 
-	if (_socket != OFInvalidSocketHandle)
-		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
-
 	if (_SOCKS5Host != nil) {
 		delegate = [[[OFTCPSocketSOCKS5Connector alloc]
 		    initWithSocket: self
 			      host: host
 			      port: port
@@ -281,11 +275,11 @@
 			     block: block] autorelease];
 		host = _SOCKS5Host;
 		port = _SOCKS5Port;
 	}
 
-	[[[[OFIPSocketAsyncConnector alloc]
+	[[[[OFAsyncIPSocketConnector alloc]
 		  initWithSocket: self
 			    host: host
 			    port: port
 			delegate: delegate
 			   block: (delegate == nil ? block : NULL)] autorelease]
@@ -315,16 +309,16 @@
 	socketAddresses = [[OFThread DNSResolver]
 	    resolveAddressesForHost: host
 		      addressFamily: OFSocketAddressFamilyAny];
 
 	address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0];
-	OFSocketAddressSetPort(&address, port);
+	OFSocketAddressSetIPPort(&address, port);
 
 	if ((_socket = socket(
 	    ((struct sockaddr *)&address.sockaddr)->sa_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle)
-		@throw [OFBindFailedException
+		@throw [OFBindIPSocketFailedException
 		    exceptionWithHost: host
 				 port: port
 			       socket: self
 				errNo: OFSocketErrNo()];
 
@@ -346,14 +340,15 @@
 			int errNo = OFSocketErrNo();
 
 			closesocket(_socket);
 			_socket = OFInvalidSocketHandle;
 
-			@throw [OFBindFailedException exceptionWithHost: host
-								   port: port
-								 socket: self
-								  errNo: errNo];
+			@throw [OFBindIPSocketFailedException
+			    exceptionWithHost: host
+					 port: port
+				       socket: self
+					errNo: errNo];
 		}
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	} else {
 		for (;;) {
 			uint16_t rnd = 0;
@@ -360,11 +355,11 @@
 			int ret;
 
 			while (rnd < 1024)
 				rnd = (uint16_t)rand();
 
-			OFSocketAddressSetPort(&address, rnd);
+			OFSocketAddressSetIPPort(&address, rnd);
 
 			if ((ret = bind(_socket,
 			    (struct sockaddr *)&address.sockaddr,
 			    address.length)) == 0) {
 				port = rnd;
@@ -375,11 +370,11 @@
 				int errNo = OFSocketErrNo();
 
 				closesocket(_socket);
 				_socket = OFInvalidSocketHandle;
 
-				@throw [OFBindFailedException
+				@throw [OFBindIPSocketFailedException
 				    exceptionWithHost: host
 						 port: port
 					       socket: self
 						errNo: errNo];
 			}
@@ -401,14 +396,14 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindIPSocketFailedException exceptionWithHost: host
+								   port: port
+								 socket: self
+								  errNo: errNo];
 	}
 
 	switch (((struct sockaddr *)&address.sockaddr)->sa_family) {
 	case AF_INET:
 		return OFFromBigEndian16(address.sockaddr.in.sin_port);
@@ -418,22 +413,23 @@
 # endif
 	default:
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: EAFNOSUPPORT];
+		@throw [OFBindIPSocketFailedException
+		    exceptionWithHost: host
+				 port: port
+			       socket: self
+				errNo: EAFNOSUPPORT];
 	}
 #else
 	closesocket(_socket);
 	_socket = OFInvalidSocketHandle;
-	@throw [OFBindFailedException exceptionWithHost: host
-						   port: port
-						 socket: self
-						  errNo: EADDRNOTAVAIL];
+	@throw [OFBindIPSocketFailedException exceptionWithHost: host
+							   port: port
+							 socket: self
+							  errNo: EADDRNOTAVAIL];
 #endif
 }
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 - (void)setSendsKeepAlives: (bool)sendsKeepAlives