@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -162,13 +162,13 @@
 
 #if defined(OF_WINDOWS) || defined(OF_AMIGAOS)
 - (void)setCanBlock: (bool)canBlock
 {
 # ifdef OF_WINDOWS
-	u_long v = canBlock;
+	u_long v = !canBlock;
 # else
-	char v = canBlock;
+	char v = !canBlock;
 # endif
 
 	if (ioctlsocket(_socket, FIONBIO, &v) == SOCKET_ERROR)
 		@throw [OFSetOptionFailedException
 		    exceptionWithObject: self
@@ -253,27 +253,27 @@
 	client->_remoteAddress.length =
 	    (socklen_t)sizeof(client->_remoteAddress.sockaddr);
 
 #if defined(HAVE_PACCEPT) && defined(SOCK_CLOEXEC)
 	if ((client->_socket = paccept(_socket,
-	    &client->_remoteAddress.sockaddr.sockaddr,
+	    (struct sockaddr *)&client->_remoteAddress.sockaddr,
 	    &client->_remoteAddress.length, NULL, SOCK_CLOEXEC)) ==
 	    OFInvalidSocketHandle)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
 				  errNo: OFSocketErrNo()];
 #elif defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
 	if ((client->_socket = accept4(_socket,
-	    &client->_remoteAddress.sockaddr.sockaddr,
+	    (struct sockaddr * )&client->_remoteAddress.sockaddr,
 	    &client->_remoteAddress.length, SOCK_CLOEXEC)) ==
 	    OFInvalidSocketHandle)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
 				  errNo: OFSocketErrNo()];
 #else
 	if ((client->_socket = accept(_socket,
-	    &client->_remoteAddress.sockaddr.sockaddr,
+	    (struct sockaddr *)&client->_remoteAddress.sockaddr,
 	    &client->_remoteAddress.length)) == OFInvalidSocketHandle)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
 				  errNo: OFSocketErrNo()];
 
@@ -284,18 +284,24 @@
 #endif
 
 	assert(client->_remoteAddress.length <=
 	    (socklen_t)sizeof(client->_remoteAddress.sockaddr));
 
-	switch (client->_remoteAddress.sockaddr.sockaddr.sa_family) {
+	switch (((struct sockaddr *)&client->_remoteAddress.sockaddr)
+	    ->sa_family) {
 	case AF_INET:
 		client->_remoteAddress.family = OFSocketAddressFamilyIPv4;
 		break;
 #ifdef OF_HAVE_IPV6
 	case AF_INET6:
 		client->_remoteAddress.family = OFSocketAddressFamilyIPv6;
 		break;
+#endif
+#ifdef OF_HAVE_UNIX_SOCKETS
+	case AF_UNIX:
+		client->_remoteAddress.family = OFSocketAddressFamilyUNIX;
+		break;
 #endif
 #ifdef OF_HAVE_IPX
 	case AF_IPX:
 		client->_remoteAddress.family = OFSocketAddressFamilyIPX;
 		break;