@@ -1920,26 +1920,158 @@ static void ensure_socket_initialization(void)
1920
1920
initialized = 1 ;
1921
1921
}
1922
1922
1923
+ static int winsock_error_to_errno (DWORD err )
1924
+ {
1925
+ switch (err ) {
1926
+ case WSAEINTR : return EINTR ;
1927
+ case WSAEBADF : return EBADF ;
1928
+ case WSAEACCES : return EACCES ;
1929
+ case WSAEFAULT : return EFAULT ;
1930
+ case WSAEINVAL : return EINVAL ;
1931
+ case WSAEMFILE : return EMFILE ;
1932
+ case WSAEWOULDBLOCK : return EWOULDBLOCK ;
1933
+ case WSAEINPROGRESS : return EINPROGRESS ;
1934
+ case WSAEALREADY : return EALREADY ;
1935
+ case WSAENOTSOCK : return ENOTSOCK ;
1936
+ case WSAEDESTADDRREQ : return EDESTADDRREQ ;
1937
+ case WSAEMSGSIZE : return EMSGSIZE ;
1938
+ case WSAEPROTOTYPE : return EPROTOTYPE ;
1939
+ case WSAENOPROTOOPT : return ENOPROTOOPT ;
1940
+ case WSAEPROTONOSUPPORT : return EPROTONOSUPPORT ;
1941
+ case WSAEOPNOTSUPP : return EOPNOTSUPP ;
1942
+ case WSAEAFNOSUPPORT : return EAFNOSUPPORT ;
1943
+ case WSAEADDRINUSE : return EADDRINUSE ;
1944
+ case WSAEADDRNOTAVAIL : return EADDRNOTAVAIL ;
1945
+ case WSAENETDOWN : return ENETDOWN ;
1946
+ case WSAENETUNREACH : return ENETUNREACH ;
1947
+ case WSAENETRESET : return ENETRESET ;
1948
+ case WSAECONNABORTED : return ECONNABORTED ;
1949
+ case WSAECONNRESET : return ECONNRESET ;
1950
+ case WSAENOBUFS : return ENOBUFS ;
1951
+ case WSAEISCONN : return EISCONN ;
1952
+ case WSAENOTCONN : return ENOTCONN ;
1953
+ case WSAETIMEDOUT : return ETIMEDOUT ;
1954
+ case WSAECONNREFUSED : return ECONNREFUSED ;
1955
+ case WSAELOOP : return ELOOP ;
1956
+ case WSAENAMETOOLONG : return ENAMETOOLONG ;
1957
+ case WSAEHOSTUNREACH : return EHOSTUNREACH ;
1958
+ case WSAENOTEMPTY : return ENOTEMPTY ;
1959
+ /* No errno equivalent; default to EIO */
1960
+ case WSAESOCKTNOSUPPORT :
1961
+ case WSAEPFNOSUPPORT :
1962
+ case WSAESHUTDOWN :
1963
+ case WSAETOOMANYREFS :
1964
+ case WSAEHOSTDOWN :
1965
+ case WSAEPROCLIM :
1966
+ case WSAEUSERS :
1967
+ case WSAEDQUOT :
1968
+ case WSAESTALE :
1969
+ case WSAEREMOTE :
1970
+ case WSASYSNOTREADY :
1971
+ case WSAVERNOTSUPPORTED :
1972
+ case WSANOTINITIALISED :
1973
+ case WSAEDISCON :
1974
+ case WSAENOMORE :
1975
+ case WSAECANCELLED :
1976
+ case WSAEINVALIDPROCTABLE :
1977
+ case WSAEINVALIDPROVIDER :
1978
+ case WSAEPROVIDERFAILEDINIT :
1979
+ case WSASYSCALLFAILURE :
1980
+ case WSASERVICE_NOT_FOUND :
1981
+ case WSATYPE_NOT_FOUND :
1982
+ case WSA_E_NO_MORE :
1983
+ case WSA_E_CANCELLED :
1984
+ case WSAEREFUSED :
1985
+ case WSAHOST_NOT_FOUND :
1986
+ case WSATRY_AGAIN :
1987
+ case WSANO_RECOVERY :
1988
+ case WSANO_DATA :
1989
+ case WSA_QOS_RECEIVERS :
1990
+ case WSA_QOS_SENDERS :
1991
+ case WSA_QOS_NO_SENDERS :
1992
+ case WSA_QOS_NO_RECEIVERS :
1993
+ case WSA_QOS_REQUEST_CONFIRMED :
1994
+ case WSA_QOS_ADMISSION_FAILURE :
1995
+ case WSA_QOS_POLICY_FAILURE :
1996
+ case WSA_QOS_BAD_STYLE :
1997
+ case WSA_QOS_BAD_OBJECT :
1998
+ case WSA_QOS_TRAFFIC_CTRL_ERROR :
1999
+ case WSA_QOS_GENERIC_ERROR :
2000
+ case WSA_QOS_ESERVICETYPE :
2001
+ case WSA_QOS_EFLOWSPEC :
2002
+ case WSA_QOS_EPROVSPECBUF :
2003
+ case WSA_QOS_EFILTERSTYLE :
2004
+ case WSA_QOS_EFILTERTYPE :
2005
+ case WSA_QOS_EFILTERCOUNT :
2006
+ case WSA_QOS_EOBJLENGTH :
2007
+ case WSA_QOS_EFLOWCOUNT :
2008
+ #ifndef _MSC_VER
2009
+ case WSA_QOS_EUNKNOWNPSOBJ :
2010
+ #endif
2011
+ case WSA_QOS_EPOLICYOBJ :
2012
+ case WSA_QOS_EFLOWDESC :
2013
+ case WSA_QOS_EPSFLOWSPEC :
2014
+ case WSA_QOS_EPSFILTERSPEC :
2015
+ case WSA_QOS_ESDMODEOBJ :
2016
+ case WSA_QOS_ESHAPERATEOBJ :
2017
+ case WSA_QOS_RESERVED_PETYPE :
2018
+ default : return EIO ;
2019
+ }
2020
+ }
2021
+
2022
+ /*
2023
+ * On Windows, `errno` is a global macro to a function call.
2024
+ * This makes it difficult to debug and single-step our mappings.
2025
+ */
2026
+ static inline void set_wsa_errno (void )
2027
+ {
2028
+ DWORD wsa = WSAGetLastError ();
2029
+ int e = winsock_error_to_errno (wsa );
2030
+ errno = e ;
2031
+
2032
+ #ifdef DEBUG_WSA_ERRNO
2033
+ fprintf (stderr , "winsock error: %d -> %d\n" , wsa , e );
2034
+ fflush (stderr );
2035
+ #endif
2036
+ }
2037
+
2038
+ static inline int winsock_return (int ret )
2039
+ {
2040
+ if (ret < 0 )
2041
+ set_wsa_errno ();
2042
+
2043
+ return ret ;
2044
+ }
2045
+
2046
+ #define WINSOCK_RETURN (x ) do { return winsock_return(x); } while (0)
2047
+
1923
2048
#undef gethostname
1924
2049
int mingw_gethostname (char * name , int namelen )
1925
2050
{
1926
- ensure_socket_initialization ();
1927
- return gethostname (name , namelen );
2051
+ ensure_socket_initialization ();
2052
+ WINSOCK_RETURN ( gethostname (name , namelen ) );
1928
2053
}
1929
2054
1930
2055
#undef gethostbyname
1931
2056
struct hostent * mingw_gethostbyname (const char * host )
1932
2057
{
2058
+ struct hostent * ret ;
2059
+
1933
2060
ensure_socket_initialization ();
1934
- return gethostbyname (host );
2061
+
2062
+ ret = gethostbyname (host );
2063
+ if (!ret )
2064
+ set_wsa_errno ();
2065
+
2066
+ return ret ;
1935
2067
}
1936
2068
1937
2069
#undef getaddrinfo
1938
2070
int mingw_getaddrinfo (const char * node , const char * service ,
1939
2071
const struct addrinfo * hints , struct addrinfo * * res )
1940
2072
{
1941
2073
ensure_socket_initialization ();
1942
- return getaddrinfo (node , service , hints , res );
2074
+ WINSOCK_RETURN ( getaddrinfo (node , service , hints , res ) );
1943
2075
}
1944
2076
1945
2077
int mingw_socket (int domain , int type , int protocol )
@@ -1959,7 +2091,7 @@ int mingw_socket(int domain, int type, int protocol)
1959
2091
* in errno so that _if_ someone looks up the code somewhere,
1960
2092
* then it is at least the number that are usually listed.
1961
2093
*/
1962
- errno = WSAGetLastError ();
2094
+ set_wsa_errno ();
1963
2095
return -1 ;
1964
2096
}
1965
2097
/* convert into a file descriptor */
@@ -1975,35 +2107,35 @@ int mingw_socket(int domain, int type, int protocol)
1975
2107
int mingw_connect (int sockfd , struct sockaddr * sa , size_t sz )
1976
2108
{
1977
2109
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
1978
- return connect (s , sa , sz );
2110
+ WINSOCK_RETURN ( connect (s , sa , sz ) );
1979
2111
}
1980
2112
1981
2113
#undef bind
1982
2114
int mingw_bind (int sockfd , struct sockaddr * sa , size_t sz )
1983
2115
{
1984
2116
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
1985
- return bind (s , sa , sz );
2117
+ WINSOCK_RETURN ( bind (s , sa , sz ) );
1986
2118
}
1987
2119
1988
2120
#undef setsockopt
1989
2121
int mingw_setsockopt (int sockfd , int lvl , int optname , void * optval , int optlen )
1990
2122
{
1991
2123
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
1992
- return setsockopt (s , lvl , optname , (const char * )optval , optlen );
2124
+ WINSOCK_RETURN ( setsockopt (s , lvl , optname , (const char * )optval , optlen ) );
1993
2125
}
1994
2126
1995
2127
#undef shutdown
1996
2128
int mingw_shutdown (int sockfd , int how )
1997
2129
{
1998
2130
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
1999
- return shutdown (s , how );
2131
+ WINSOCK_RETURN ( shutdown (s , how ) );
2000
2132
}
2001
2133
2002
2134
#undef listen
2003
2135
int mingw_listen (int sockfd , int backlog )
2004
2136
{
2005
2137
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2006
- return listen (s , backlog );
2138
+ WINSOCK_RETURN ( listen (s , backlog ) );
2007
2139
}
2008
2140
2009
2141
#undef accept
@@ -2014,6 +2146,11 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
2014
2146
SOCKET s1 = (SOCKET )_get_osfhandle (sockfd1 );
2015
2147
SOCKET s2 = accept (s1 , sa , sz );
2016
2148
2149
+ if (s2 == INVALID_SOCKET ) {
2150
+ set_wsa_errno ();
2151
+ return -1 ;
2152
+ }
2153
+
2017
2154
/* convert into a file descriptor */
2018
2155
if ((sockfd2 = _open_osfhandle (s2 , O_RDWR |O_BINARY )) < 0 ) {
2019
2156
int err = errno ;
0 commit comments