Add/use SOCKET_ERRNO (in place of ERROR_VALUE)

src/xpdev/ini_file.c

@@ -2052,13 +2052,13 @@ int iniGetSocketOptions(str_list_t list, const char* section, SOCKET sock
 
 	len=sizeof(type);
 	if((result=getsockopt(sock, SOL_SOCKET, SO_TYPE, (char*)&type, &len)) != 0) {
-		safe_snprintf(error,errlen,"%d (%s) getting socket type", ERROR_VALUE, SOCKET_STRERROR(err,sizeof(err)));
+		safe_snprintf(error,errlen,"%d (%s) getting socket type", SOCKET_ERRNO, SOCKET_STRERROR(err,sizeof(err)));
 		return(result);
 	}
 #ifdef IPPROTO_IPV6
 	len=sizeof(addr);
 	if((result=getsockname(sock, &addr.addr, &len)) != 0) {
-		safe_snprintf(error,errlen,"%d (%s) getting socket name", ERROR_VALUE, SOCKET_STRERROR(err,sizeof(err)));
+		safe_snprintf(error,errlen,"%d (%s) getting socket name", SOCKET_ERRNO, SOCKET_STRERROR(err,sizeof(err)));
 		return(result);
 	}
 #endif
@@ -2094,7 +2094,7 @@ int iniGetSocketOptions(str_list_t list, const char* section, SOCKET sock
 
 		if((result=setsockopt(sock,level,option,(const char *)vp,len)) != 0) {
 			safe_snprintf(error,errlen,"%d (%s) setting socket option (%s, %d) to %d"
-				,ERROR_VALUE, SOCKET_STRERROR(err,sizeof(err)), name, option, value);
+				,SOCKET_ERRNO, SOCKET_STRERROR(err,sizeof(err)), name, option, value);
 			return(result);
 		}
 	}

src/xpdev/multisock.c

@@ -155,7 +155,7 @@ bool xpms_add(struct xpms_set *xpms_set, int domain, int type,
 			if(listen(xpms_set->socks[xpms_set->sock_count].sock, SOMAXCONN)==-1) {
 				if(xpms_set->lprintf)
 					xpms_set->lprintf(LOG_WARNING, "%04d !%s ERROR %d listening on port %d: %s"
-						,xpms_set->socks[xpms_set->sock_count].sock, prot, ERROR_VALUE
+						,xpms_set->socks[xpms_set->sock_count].sock, prot,SOCKET_ERRNO
 						,port, SOCKET_STRERROR(err,sizeof(err)));
 				closesocket(xpms_set->socks[xpms_set->sock_count].sock);
 				FREE_AND_NULL(xpms_set->socks[xpms_set->sock_count].address);

src/xpdev/sockwrap.c

@@ -197,7 +197,7 @@ off_t sendfilesocket(int sock, int file, off_t *offset, off_t count)
 			wr=sendsocket(sock,buf+i,rd-i);
 			if(wr>0)
 				continue;
-			if(wr==SOCKET_ERROR && ERROR_VALUE==EWOULDBLOCK) {
+			if(wr==SOCKET_ERROR && SOCKET_ERRNO==EWOULDBLOCK) {
 				wr=0;
 				SLEEP(1);
 				continue;
@@ -337,7 +337,7 @@ bool socket_check(SOCKET sock, bool* rd_p, bool* wr_p, DWORD timeout)
 
 		if(pfd.revents & ~(POLLOUT) && (rd_p !=NULL || wr_p==NULL))  {
 			rd=recv(sock,&ch,1,MSG_PEEK);
-			if(rd==1 || (rd==SOCKET_ERROR && ERROR_VALUE==EMSGSIZE)) {
+			if(rd==1 || (rd==SOCKET_ERROR && SOCKET_ERRNO==EMSGSIZE)) {
 				if(rd_p!=NULL)
 					*rd_p=true;
 				return true;
@@ -400,7 +400,7 @@ bool socket_check(SOCKET sock, bool* rd_p, bool* wr_p, DWORD timeout)
 	if(rd_p !=NULL || wr_p==NULL)  {
 		rd=recv(sock,&ch,1,MSG_PEEK);
 		if(rd==1
-			|| (rd==SOCKET_ERROR && ERROR_VALUE==EMSGSIZE)) {
+			|| (rd==SOCKET_ERROR && SOCKET_ERRNO==EMSGSIZE)) {
 			if(rd_p!=NULL)
 				*rd_p=true;
 			return(true);
@@ -514,7 +514,7 @@ bool socket_recvdone(SOCKET sock, int timeout)
 		case 1:
 			if (pfd.revents) {
 				rd = recv(sock,&ch,1,MSG_PEEK);
-				if (rd == 1 || (rd==SOCKET_ERROR && ERROR_VALUE==EMSGSIZE))
+				if (rd == 1 || (rd==SOCKET_ERROR && SOCKET_ERRNO==EMSGSIZE))
 					return false;
 				return true;
 			}
@@ -548,7 +548,7 @@ bool socket_recvdone(SOCKET sock, int timeout)
 			return false;
 	}
 	rd = recv(sock,&ch,1,MSG_PEEK);
-	if (rd == 1 || (rd==SOCKET_ERROR && ERROR_VALUE==EMSGSIZE))
+	if (rd == 1 || (rd==SOCKET_ERROR && SOCKET_ERRNO==EMSGSIZE))
 		return false;
 	return true;
 #endif
@@ -573,7 +573,7 @@ int retry_bind(SOCKET s, const struct sockaddr *addr, socklen_t addrlen
 			break;
 		if(lprintf!=NULL)
 			lprintf(i<retries ? LOG_WARNING:LOG_CRIT
-				,"%04d !ERROR %d binding %s socket%s: %s", s, ERROR_VALUE, prot, port_str, SOCKET_STRERROR(err, sizeof(err)));
+				,"%04d !ERROR %d binding %s socket%s: %s", s, SOCKET_ERRNO, prot, port_str, SOCKET_STRERROR(err, sizeof(err)));
 		if(i<retries) {
 			if(lprintf!=NULL)
 				lprintf(LOG_WARNING,"%04d Will retry in %u seconds (%u of %u)"
@@ -592,7 +592,7 @@ int nonblocking_connect(SOCKET sock, struct sockaddr* addr, size_t size, unsigne
 	result=connect(sock, addr, size);
 
 	if(result==SOCKET_ERROR) {
-		result=ERROR_VALUE;
+		result=SOCKET_ERRNO;
 		if(result==EWOULDBLOCK || result==EINPROGRESS) {
 			if (socket_writable(sock, timeout * 1000)) {
 				result = 0;
@@ -600,7 +600,7 @@ int nonblocking_connect(SOCKET sock, struct sockaddr* addr, size_t size, unsigne
 			else {
 				optlen = sizeof(result);
 				if(getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*)&result, &optlen)==SOCKET_ERROR)
-					result=ERROR_VALUE;
+					result=SOCKET_ERRNO;
 			}
 		}
 	}

src/xpdev/sockwrap.h

@@ -175,6 +175,7 @@ union xp_sockaddr {
 #define sa_family_t		ushort
 typedef uint32_t                in_addr_t;
 
+#define SOCKET_ERRNO		socket_errno(true)
 #define ERROR_VALUE			socket_errno(true) // Deprecated
 #define sendsocket(s,b,l)	send(s,b,l,0)
 typedef ULONG nfds_t;
@@ -206,6 +207,7 @@ typedef ULONG nfds_t;
 #define INVALID_SOCKET  (SOCKET)(~0)
 #define closesocket		close
 #define ioctlsocket		ioctl
+#define SOCKET_ERRNO	errno
 #define ERROR_VALUE		errno
 #define sendsocket		write		/* FreeBSD send() is broken */