@@ -22,12 +22,12 @@
 #import "OFRunLoop+Private.h"
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 
 #import "OFAlreadyConnectedException.h"
-#import "OFBindFailedException.h"
-#import "OFConnectionFailedException.h"
+#import "OFBindIPXSocketFailedException.h"
+#import "OFConnectSPXSocketFailedException.h"
 #import "OFNotOpenException.h"
 
 #ifndef NSPROTO_SPX
 # define NSPROTO_SPX 0
 #endif
@@ -55,11 +55,11 @@
 #endif
 }
 
 - (instancetype)initWithSocket: (OFSPXStreamSocket *)socket
 		       network: (uint32_t)network
-			  node: (unsigned char [IPX_NODE_LEN])node
+			  node: (const unsigned char [IPX_NODE_LEN])node
 			  port: (uint16_t)port
 #ifdef OF_HAVE_BLOCKS
 			 block: (OFSPXStreamSocketAsyncConnectBlock)block
 #endif
 ;
@@ -67,11 +67,11 @@
 @end
 
 @implementation OFSPXStreamSocketAsyncConnectDelegate
 - (instancetype)initWithSocket: (OFSPXStreamSocket *)sock
 		       network: (uint32_t)network
-			  node: (unsigned char [IPX_NODE_LEN])node
+			  node: (const unsigned char [IPX_NODE_LEN])node
 			  port: (uint16_t)port
 #ifdef OF_HAVE_BLOCKS
 			 block: (OFSPXStreamSocketAsyncConnectBlock)block
 #endif
 {
@@ -166,15 +166,15 @@
 #endif
 }
 
 - (id)of_connectionFailedExceptionForErrNo: (int)errNo
 {
-	return [OFConnectionFailedException exceptionWithNetwork: _network
-							    node: _node
-							    port: _port
-							  socket: _socket
-							   errNo: errNo];
+	return [OFConnectSPXSocketFailedException exceptionWithNetwork: _network
+								  node: _node
+								  port: _port
+								socket: _socket
+								 errNo: errNo];
 }
 @end
 
 @implementation OFSPXStreamSocket
 @dynamic delegate;
@@ -188,11 +188,11 @@
 
 	if (_socket != OFInvalidSocketHandle)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
 	if ((_socket = socket(address->sockaddr.ipx.sipx_family,
-	    SOCK_SEQPACKET | SOCK_CLOEXEC, NSPROTO_SPX)) ==
+	    SOCK_STREAM | SOCK_CLOEXEC, NSPROTO_SPX)) ==
 	    OFInvalidSocketHandle) {
 		*errNo = OFSocketErrNo();
 		return false;
 	}
 
@@ -224,48 +224,48 @@
 	closesocket(_socket);
 	_socket = OFInvalidSocketHandle;
 }
 
 - (void)connectToNetwork: (uint32_t)network
-		    node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+		    node: (const unsigned char [IPX_NODE_LEN])node
 		    port: (uint16_t)port
 {
 	OFSocketAddress address = OFSocketAddressMakeIPX(network, node, port);
 	int errNo;
 
 	if (![self of_createSocketForAddress: &address errNo: &errNo])
-		@throw [OFConnectionFailedException
+		@throw [OFConnectSPXSocketFailedException
 		    exceptionWithNetwork: network
 				    node: node
 				    port: port
 				  socket: self
 				   errNo: errNo];
 
 	if (![self of_connectSocketToAddress: &address errNo: &errNo]) {
 		[self of_closeSocket];
 
-		@throw [OFConnectionFailedException
+		@throw [OFConnectSPXSocketFailedException
 		    exceptionWithNetwork: network
 				    node: node
 				    port: port
 				  socket: self
 				   errNo: errNo];
 	}
 }
 
 - (void)asyncConnectToNetwork: (uint32_t)network
-			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 node: (const unsigned char [IPX_NODE_LEN])node
 			 port: (uint16_t)port
 {
 	[self asyncConnectToNetwork: network
 			       node: node
 			       port: port
 			runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncConnectToNetwork: (uint32_t)network
-			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 node: (const unsigned char [IPX_NODE_LEN])node
 			 port: (uint16_t)port
 		  runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	void *pool = objc_autoreleasePoolPush();
 
@@ -282,11 +282,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)asyncConnectToNetwork: (uint32_t)network
-			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 node: (const unsigned char [IPX_NODE_LEN])node
 			 port: (uint16_t)port
 			block: (OFSPXStreamSocketAsyncConnectBlock)block
 {
 	[self asyncConnectToNetwork: network
 			       node: node
@@ -294,11 +294,11 @@
 			runLoopMode: OFDefaultRunLoopMode
 			      block: block];
 }
 
 - (void)asyncConnectToNetwork: (uint32_t)network
-			 node: (unsigned char [_Nonnull IPX_NODE_LEN])node
+			 node: (const unsigned char [IPX_NODE_LEN])node
 			 port: (uint16_t)port
 		  runLoopMode: (OFRunLoopMode)runLoopMode
 			block: (OFSPXStreamSocketAsyncConnectBlock)block
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -313,30 +313,33 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (OFSocketAddress)bindToPort: (uint16_t)port
+- (OFSocketAddress)bindToNetwork: (uint32_t)network
+			    node: (const unsigned char [IPX_NODE_LEN])node
+			    port: (uint16_t)port
 {
-	const unsigned char zeroNode[IPX_NODE_LEN] = { 0 };
 	OFSocketAddress address;
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL_H) && defined(FD_CLOEXEC)
 	int flags;
 #endif
 
 	if (_socket != OFInvalidSocketHandle)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
-	address = OFSocketAddressMakeIPX(0, zeroNode, port);
+	address = OFSocketAddressMakeIPX(network, node, port);
 
 	if ((_socket = socket(address.sockaddr.ipx.sipx_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, NSPROTO_SPX)) == OFInvalidSocketHandle)
-		@throw [OFBindFailedException
-		    exceptionWithPort: port
-			   packetType: SPXPacketType
-			       socket: self
-				errNo: OFSocketErrNo()];
+		@throw [OFBindIPXSocketFailedException
+		    exceptionWithNetwork: network
+				    node: node
+				    port: port
+			      packetType: SPXPacketType
+				  socket: self
+				   errNo: OFSocketErrNo()];
 
 	_canBlock = true;
 
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL_H) && defined(FD_CLOEXEC)
 	if ((flags = fcntl(_socket, F_GETFD, 0)) != -1)
@@ -348,14 +351,17 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPort: port
-						     packetType: SPXPacketType
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindIPXSocketFailedException
+		    exceptionWithNetwork: network
+				    node: node
+				    port: port
+			      packetType: SPXPacketType
+				  socket: self
+				   errNo: errNo];
 	}
 
 	memset(&address, 0, sizeof(address));
 	address.family = OFSocketAddressFamilyIPX;
 	address.length = (socklen_t)sizeof(address.sockaddr);
@@ -365,24 +371,30 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPort: port
-						     packetType: SPXPacketType
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindIPXSocketFailedException
+		    exceptionWithNetwork: network
+				    node: node
+				    port: port
+			      packetType: SPXPacketType
+				  socket: self
+				   errNo: errNo];
 	}
 
 	if (address.sockaddr.ipx.sipx_family != AF_IPX) {
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPort: port
-						     packetType: SPXPacketType
-							 socket: self
-							  errNo: EAFNOSUPPORT];
+		@throw [OFBindIPXSocketFailedException
+		    exceptionWithNetwork: network
+				    node: node
+				    port: port
+			      packetType: SPXPacketType
+				  socket: self
+				   errNo: EAFNOSUPPORT];
 	}
 
 	return address;
 }
 @end