@@ -2044,26 +2044,158 @@ static void ensure_socket_initialization(void)
2044
2044
initialized = 1 ;
2045
2045
}
2046
2046
2047
+ static int winsock_error_to_errno (DWORD err )
2048
+ {
2049
+ switch (err ) {
2050
+ case WSAEINTR : return EINTR ;
2051
+ case WSAEBADF : return EBADF ;
2052
+ case WSAEACCES : return EACCES ;
2053
+ case WSAEFAULT : return EFAULT ;
2054
+ case WSAEINVAL : return EINVAL ;
2055
+ case WSAEMFILE : return EMFILE ;
2056
+ case WSAEWOULDBLOCK : return EWOULDBLOCK ;
2057
+ case WSAEINPROGRESS : return EINPROGRESS ;
2058
+ case WSAEALREADY : return EALREADY ;
2059
+ case WSAENOTSOCK : return ENOTSOCK ;
2060
+ case WSAEDESTADDRREQ : return EDESTADDRREQ ;
2061
+ case WSAEMSGSIZE : return EMSGSIZE ;
2062
+ case WSAEPROTOTYPE : return EPROTOTYPE ;
2063
+ case WSAENOPROTOOPT : return ENOPROTOOPT ;
2064
+ case WSAEPROTONOSUPPORT : return EPROTONOSUPPORT ;
2065
+ case WSAEOPNOTSUPP : return EOPNOTSUPP ;
2066
+ case WSAEAFNOSUPPORT : return EAFNOSUPPORT ;
2067
+ case WSAEADDRINUSE : return EADDRINUSE ;
2068
+ case WSAEADDRNOTAVAIL : return EADDRNOTAVAIL ;
2069
+ case WSAENETDOWN : return ENETDOWN ;
2070
+ case WSAENETUNREACH : return ENETUNREACH ;
2071
+ case WSAENETRESET : return ENETRESET ;
2072
+ case WSAECONNABORTED : return ECONNABORTED ;
2073
+ case WSAECONNRESET : return ECONNRESET ;
2074
+ case WSAENOBUFS : return ENOBUFS ;
2075
+ case WSAEISCONN : return EISCONN ;
2076
+ case WSAENOTCONN : return ENOTCONN ;
2077
+ case WSAETIMEDOUT : return ETIMEDOUT ;
2078
+ case WSAECONNREFUSED : return ECONNREFUSED ;
2079
+ case WSAELOOP : return ELOOP ;
2080
+ case WSAENAMETOOLONG : return ENAMETOOLONG ;
2081
+ case WSAEHOSTUNREACH : return EHOSTUNREACH ;
2082
+ case WSAENOTEMPTY : return ENOTEMPTY ;
2083
+ /* No errno equivalent; default to EIO */
2084
+ case WSAESOCKTNOSUPPORT :
2085
+ case WSAEPFNOSUPPORT :
2086
+ case WSAESHUTDOWN :
2087
+ case WSAETOOMANYREFS :
2088
+ case WSAEHOSTDOWN :
2089
+ case WSAEPROCLIM :
2090
+ case WSAEUSERS :
2091
+ case WSAEDQUOT :
2092
+ case WSAESTALE :
2093
+ case WSAEREMOTE :
2094
+ case WSASYSNOTREADY :
2095
+ case WSAVERNOTSUPPORTED :
2096
+ case WSANOTINITIALISED :
2097
+ case WSAEDISCON :
2098
+ case WSAENOMORE :
2099
+ case WSAECANCELLED :
2100
+ case WSAEINVALIDPROCTABLE :
2101
+ case WSAEINVALIDPROVIDER :
2102
+ case WSAEPROVIDERFAILEDINIT :
2103
+ case WSASYSCALLFAILURE :
2104
+ case WSASERVICE_NOT_FOUND :
2105
+ case WSATYPE_NOT_FOUND :
2106
+ case WSA_E_NO_MORE :
2107
+ case WSA_E_CANCELLED :
2108
+ case WSAEREFUSED :
2109
+ case WSAHOST_NOT_FOUND :
2110
+ case WSATRY_AGAIN :
2111
+ case WSANO_RECOVERY :
2112
+ case WSANO_DATA :
2113
+ case WSA_QOS_RECEIVERS :
2114
+ case WSA_QOS_SENDERS :
2115
+ case WSA_QOS_NO_SENDERS :
2116
+ case WSA_QOS_NO_RECEIVERS :
2117
+ case WSA_QOS_REQUEST_CONFIRMED :
2118
+ case WSA_QOS_ADMISSION_FAILURE :
2119
+ case WSA_QOS_POLICY_FAILURE :
2120
+ case WSA_QOS_BAD_STYLE :
2121
+ case WSA_QOS_BAD_OBJECT :
2122
+ case WSA_QOS_TRAFFIC_CTRL_ERROR :
2123
+ case WSA_QOS_GENERIC_ERROR :
2124
+ case WSA_QOS_ESERVICETYPE :
2125
+ case WSA_QOS_EFLOWSPEC :
2126
+ case WSA_QOS_EPROVSPECBUF :
2127
+ case WSA_QOS_EFILTERSTYLE :
2128
+ case WSA_QOS_EFILTERTYPE :
2129
+ case WSA_QOS_EFILTERCOUNT :
2130
+ case WSA_QOS_EOBJLENGTH :
2131
+ case WSA_QOS_EFLOWCOUNT :
2132
+ #ifndef _MSC_VER
2133
+ case WSA_QOS_EUNKNOWNPSOBJ :
2134
+ #endif
2135
+ case WSA_QOS_EPOLICYOBJ :
2136
+ case WSA_QOS_EFLOWDESC :
2137
+ case WSA_QOS_EPSFLOWSPEC :
2138
+ case WSA_QOS_EPSFILTERSPEC :
2139
+ case WSA_QOS_ESDMODEOBJ :
2140
+ case WSA_QOS_ESHAPERATEOBJ :
2141
+ case WSA_QOS_RESERVED_PETYPE :
2142
+ default : return EIO ;
2143
+ }
2144
+ }
2145
+
2146
+ /*
2147
+ * On Windows, `errno` is a global macro to a function call.
2148
+ * This makes it difficult to debug and single-step our mappings.
2149
+ */
2150
+ static inline void set_wsa_errno (void )
2151
+ {
2152
+ DWORD wsa = WSAGetLastError ();
2153
+ int e = winsock_error_to_errno (wsa );
2154
+ errno = e ;
2155
+
2156
+ #ifdef DEBUG_WSA_ERRNO
2157
+ fprintf (stderr , "winsock error: %d -> %d\n" , wsa , e );
2158
+ fflush (stderr );
2159
+ #endif
2160
+ }
2161
+
2162
+ static inline int winsock_return (int ret )
2163
+ {
2164
+ if (ret < 0 )
2165
+ set_wsa_errno ();
2166
+
2167
+ return ret ;
2168
+ }
2169
+
2170
+ #define WINSOCK_RETURN (x ) do { return winsock_return(x); } while (0)
2171
+
2047
2172
#undef gethostname
2048
2173
int mingw_gethostname (char * name , int namelen )
2049
2174
{
2050
- ensure_socket_initialization ();
2051
- return gethostname (name , namelen );
2175
+ ensure_socket_initialization ();
2176
+ WINSOCK_RETURN ( gethostname (name , namelen ) );
2052
2177
}
2053
2178
2054
2179
#undef gethostbyname
2055
2180
struct hostent * mingw_gethostbyname (const char * host )
2056
2181
{
2182
+ struct hostent * ret ;
2183
+
2057
2184
ensure_socket_initialization ();
2058
- return gethostbyname (host );
2185
+
2186
+ ret = gethostbyname (host );
2187
+ if (!ret )
2188
+ set_wsa_errno ();
2189
+
2190
+ return ret ;
2059
2191
}
2060
2192
2061
2193
#undef getaddrinfo
2062
2194
int mingw_getaddrinfo (const char * node , const char * service ,
2063
2195
const struct addrinfo * hints , struct addrinfo * * res )
2064
2196
{
2065
2197
ensure_socket_initialization ();
2066
- return getaddrinfo (node , service , hints , res );
2198
+ WINSOCK_RETURN ( getaddrinfo (node , service , hints , res ) );
2067
2199
}
2068
2200
2069
2201
int mingw_socket (int domain , int type , int protocol )
@@ -2083,7 +2215,7 @@ int mingw_socket(int domain, int type, int protocol)
2083
2215
* in errno so that _if_ someone looks up the code somewhere,
2084
2216
* then it is at least the number that are usually listed.
2085
2217
*/
2086
- errno = WSAGetLastError ();
2218
+ set_wsa_errno ();
2087
2219
return -1 ;
2088
2220
}
2089
2221
/* convert into a file descriptor */
@@ -2099,35 +2231,35 @@ int mingw_socket(int domain, int type, int protocol)
2099
2231
int mingw_connect (int sockfd , struct sockaddr * sa , size_t sz )
2100
2232
{
2101
2233
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2102
- return connect (s , sa , sz );
2234
+ WINSOCK_RETURN ( connect (s , sa , sz ) );
2103
2235
}
2104
2236
2105
2237
#undef bind
2106
2238
int mingw_bind (int sockfd , struct sockaddr * sa , size_t sz )
2107
2239
{
2108
2240
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2109
- return bind (s , sa , sz );
2241
+ WINSOCK_RETURN ( bind (s , sa , sz ) );
2110
2242
}
2111
2243
2112
2244
#undef setsockopt
2113
2245
int mingw_setsockopt (int sockfd , int lvl , int optname , void * optval , int optlen )
2114
2246
{
2115
2247
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2116
- return setsockopt (s , lvl , optname , (const char * )optval , optlen );
2248
+ WINSOCK_RETURN ( setsockopt (s , lvl , optname , (const char * )optval , optlen ) );
2117
2249
}
2118
2250
2119
2251
#undef shutdown
2120
2252
int mingw_shutdown (int sockfd , int how )
2121
2253
{
2122
2254
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2123
- return shutdown (s , how );
2255
+ WINSOCK_RETURN ( shutdown (s , how ) );
2124
2256
}
2125
2257
2126
2258
#undef listen
2127
2259
int mingw_listen (int sockfd , int backlog )
2128
2260
{
2129
2261
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2130
- return listen (s , backlog );
2262
+ WINSOCK_RETURN ( listen (s , backlog ) );
2131
2263
}
2132
2264
2133
2265
#undef accept
@@ -2138,6 +2270,11 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
2138
2270
SOCKET s1 = (SOCKET )_get_osfhandle (sockfd1 );
2139
2271
SOCKET s2 = accept (s1 , sa , sz );
2140
2272
2273
+ if (s2 == INVALID_SOCKET ) {
2274
+ set_wsa_errno ();
2275
+ return -1 ;
2276
+ }
2277
+
2141
2278
/* convert into a file descriptor */
2142
2279
if ((sockfd2 = _open_osfhandle (s2 , O_RDWR |O_BINARY )) < 0 ) {
2143
2280
int err = errno ;
0 commit comments