@@ -1971,26 +1971,158 @@ static void ensure_socket_initialization(void)
1971
1971
initialized = 1 ;
1972
1972
}
1973
1973
1974
+ static int winsock_error_to_errno (DWORD err )
1975
+ {
1976
+ switch (err ) {
1977
+ case WSAEINTR : return EINTR ;
1978
+ case WSAEBADF : return EBADF ;
1979
+ case WSAEACCES : return EACCES ;
1980
+ case WSAEFAULT : return EFAULT ;
1981
+ case WSAEINVAL : return EINVAL ;
1982
+ case WSAEMFILE : return EMFILE ;
1983
+ case WSAEWOULDBLOCK : return EWOULDBLOCK ;
1984
+ case WSAEINPROGRESS : return EINPROGRESS ;
1985
+ case WSAEALREADY : return EALREADY ;
1986
+ case WSAENOTSOCK : return ENOTSOCK ;
1987
+ case WSAEDESTADDRREQ : return EDESTADDRREQ ;
1988
+ case WSAEMSGSIZE : return EMSGSIZE ;
1989
+ case WSAEPROTOTYPE : return EPROTOTYPE ;
1990
+ case WSAENOPROTOOPT : return ENOPROTOOPT ;
1991
+ case WSAEPROTONOSUPPORT : return EPROTONOSUPPORT ;
1992
+ case WSAEOPNOTSUPP : return EOPNOTSUPP ;
1993
+ case WSAEAFNOSUPPORT : return EAFNOSUPPORT ;
1994
+ case WSAEADDRINUSE : return EADDRINUSE ;
1995
+ case WSAEADDRNOTAVAIL : return EADDRNOTAVAIL ;
1996
+ case WSAENETDOWN : return ENETDOWN ;
1997
+ case WSAENETUNREACH : return ENETUNREACH ;
1998
+ case WSAENETRESET : return ENETRESET ;
1999
+ case WSAECONNABORTED : return ECONNABORTED ;
2000
+ case WSAECONNRESET : return ECONNRESET ;
2001
+ case WSAENOBUFS : return ENOBUFS ;
2002
+ case WSAEISCONN : return EISCONN ;
2003
+ case WSAENOTCONN : return ENOTCONN ;
2004
+ case WSAETIMEDOUT : return ETIMEDOUT ;
2005
+ case WSAECONNREFUSED : return ECONNREFUSED ;
2006
+ case WSAELOOP : return ELOOP ;
2007
+ case WSAENAMETOOLONG : return ENAMETOOLONG ;
2008
+ case WSAEHOSTUNREACH : return EHOSTUNREACH ;
2009
+ case WSAENOTEMPTY : return ENOTEMPTY ;
2010
+ /* No errno equivalent; default to EIO */
2011
+ case WSAESOCKTNOSUPPORT :
2012
+ case WSAEPFNOSUPPORT :
2013
+ case WSAESHUTDOWN :
2014
+ case WSAETOOMANYREFS :
2015
+ case WSAEHOSTDOWN :
2016
+ case WSAEPROCLIM :
2017
+ case WSAEUSERS :
2018
+ case WSAEDQUOT :
2019
+ case WSAESTALE :
2020
+ case WSAEREMOTE :
2021
+ case WSASYSNOTREADY :
2022
+ case WSAVERNOTSUPPORTED :
2023
+ case WSANOTINITIALISED :
2024
+ case WSAEDISCON :
2025
+ case WSAENOMORE :
2026
+ case WSAECANCELLED :
2027
+ case WSAEINVALIDPROCTABLE :
2028
+ case WSAEINVALIDPROVIDER :
2029
+ case WSAEPROVIDERFAILEDINIT :
2030
+ case WSASYSCALLFAILURE :
2031
+ case WSASERVICE_NOT_FOUND :
2032
+ case WSATYPE_NOT_FOUND :
2033
+ case WSA_E_NO_MORE :
2034
+ case WSA_E_CANCELLED :
2035
+ case WSAEREFUSED :
2036
+ case WSAHOST_NOT_FOUND :
2037
+ case WSATRY_AGAIN :
2038
+ case WSANO_RECOVERY :
2039
+ case WSANO_DATA :
2040
+ case WSA_QOS_RECEIVERS :
2041
+ case WSA_QOS_SENDERS :
2042
+ case WSA_QOS_NO_SENDERS :
2043
+ case WSA_QOS_NO_RECEIVERS :
2044
+ case WSA_QOS_REQUEST_CONFIRMED :
2045
+ case WSA_QOS_ADMISSION_FAILURE :
2046
+ case WSA_QOS_POLICY_FAILURE :
2047
+ case WSA_QOS_BAD_STYLE :
2048
+ case WSA_QOS_BAD_OBJECT :
2049
+ case WSA_QOS_TRAFFIC_CTRL_ERROR :
2050
+ case WSA_QOS_GENERIC_ERROR :
2051
+ case WSA_QOS_ESERVICETYPE :
2052
+ case WSA_QOS_EFLOWSPEC :
2053
+ case WSA_QOS_EPROVSPECBUF :
2054
+ case WSA_QOS_EFILTERSTYLE :
2055
+ case WSA_QOS_EFILTERTYPE :
2056
+ case WSA_QOS_EFILTERCOUNT :
2057
+ case WSA_QOS_EOBJLENGTH :
2058
+ case WSA_QOS_EFLOWCOUNT :
2059
+ #ifndef _MSC_VER
2060
+ case WSA_QOS_EUNKNOWNPSOBJ :
2061
+ #endif
2062
+ case WSA_QOS_EPOLICYOBJ :
2063
+ case WSA_QOS_EFLOWDESC :
2064
+ case WSA_QOS_EPSFLOWSPEC :
2065
+ case WSA_QOS_EPSFILTERSPEC :
2066
+ case WSA_QOS_ESDMODEOBJ :
2067
+ case WSA_QOS_ESHAPERATEOBJ :
2068
+ case WSA_QOS_RESERVED_PETYPE :
2069
+ default : return EIO ;
2070
+ }
2071
+ }
2072
+
2073
+ /*
2074
+ * On Windows, `errno` is a global macro to a function call.
2075
+ * This makes it difficult to debug and single-step our mappings.
2076
+ */
2077
+ static inline void set_wsa_errno (void )
2078
+ {
2079
+ DWORD wsa = WSAGetLastError ();
2080
+ int e = winsock_error_to_errno (wsa );
2081
+ errno = e ;
2082
+
2083
+ #ifdef DEBUG_WSA_ERRNO
2084
+ fprintf (stderr , "winsock error: %d -> %d\n" , wsa , e );
2085
+ fflush (stderr );
2086
+ #endif
2087
+ }
2088
+
2089
+ static inline int winsock_return (int ret )
2090
+ {
2091
+ if (ret < 0 )
2092
+ set_wsa_errno ();
2093
+
2094
+ return ret ;
2095
+ }
2096
+
2097
+ #define WINSOCK_RETURN (x ) do { return winsock_return(x); } while (0)
2098
+
1974
2099
#undef gethostname
1975
2100
int mingw_gethostname (char * name , int namelen )
1976
2101
{
1977
- ensure_socket_initialization ();
1978
- return gethostname (name , namelen );
2102
+ ensure_socket_initialization ();
2103
+ WINSOCK_RETURN ( gethostname (name , namelen ) );
1979
2104
}
1980
2105
1981
2106
#undef gethostbyname
1982
2107
struct hostent * mingw_gethostbyname (const char * host )
1983
2108
{
2109
+ struct hostent * ret ;
2110
+
1984
2111
ensure_socket_initialization ();
1985
- return gethostbyname (host );
2112
+
2113
+ ret = gethostbyname (host );
2114
+ if (!ret )
2115
+ set_wsa_errno ();
2116
+
2117
+ return ret ;
1986
2118
}
1987
2119
1988
2120
#undef getaddrinfo
1989
2121
int mingw_getaddrinfo (const char * node , const char * service ,
1990
2122
const struct addrinfo * hints , struct addrinfo * * res )
1991
2123
{
1992
2124
ensure_socket_initialization ();
1993
- return getaddrinfo (node , service , hints , res );
2125
+ WINSOCK_RETURN ( getaddrinfo (node , service , hints , res ) );
1994
2126
}
1995
2127
1996
2128
int mingw_socket (int domain , int type , int protocol )
@@ -2010,7 +2142,7 @@ int mingw_socket(int domain, int type, int protocol)
2010
2142
* in errno so that _if_ someone looks up the code somewhere,
2011
2143
* then it is at least the number that are usually listed.
2012
2144
*/
2013
- errno = WSAGetLastError ();
2145
+ set_wsa_errno ();
2014
2146
return -1 ;
2015
2147
}
2016
2148
/* convert into a file descriptor */
@@ -2026,35 +2158,35 @@ int mingw_socket(int domain, int type, int protocol)
2026
2158
int mingw_connect (int sockfd , struct sockaddr * sa , size_t sz )
2027
2159
{
2028
2160
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2029
- return connect (s , sa , sz );
2161
+ WINSOCK_RETURN ( connect (s , sa , sz ) );
2030
2162
}
2031
2163
2032
2164
#undef bind
2033
2165
int mingw_bind (int sockfd , struct sockaddr * sa , size_t sz )
2034
2166
{
2035
2167
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2036
- return bind (s , sa , sz );
2168
+ WINSOCK_RETURN ( bind (s , sa , sz ) );
2037
2169
}
2038
2170
2039
2171
#undef setsockopt
2040
2172
int mingw_setsockopt (int sockfd , int lvl , int optname , void * optval , int optlen )
2041
2173
{
2042
2174
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2043
- return setsockopt (s , lvl , optname , (const char * )optval , optlen );
2175
+ WINSOCK_RETURN ( setsockopt (s , lvl , optname , (const char * )optval , optlen ) );
2044
2176
}
2045
2177
2046
2178
#undef shutdown
2047
2179
int mingw_shutdown (int sockfd , int how )
2048
2180
{
2049
2181
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2050
- return shutdown (s , how );
2182
+ WINSOCK_RETURN ( shutdown (s , how ) );
2051
2183
}
2052
2184
2053
2185
#undef listen
2054
2186
int mingw_listen (int sockfd , int backlog )
2055
2187
{
2056
2188
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2057
- return listen (s , backlog );
2189
+ WINSOCK_RETURN ( listen (s , backlog ) );
2058
2190
}
2059
2191
2060
2192
#undef accept
@@ -2065,6 +2197,11 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
2065
2197
SOCKET s1 = (SOCKET )_get_osfhandle (sockfd1 );
2066
2198
SOCKET s2 = accept (s1 , sa , sz );
2067
2199
2200
+ if (s2 == INVALID_SOCKET ) {
2201
+ set_wsa_errno ();
2202
+ return -1 ;
2203
+ }
2204
+
2068
2205
/* convert into a file descriptor */
2069
2206
if ((sockfd2 = _open_osfhandle (s2 , O_RDWR |O_BINARY )) < 0 ) {
2070
2207
int err = errno ;
0 commit comments