@@ -2186,26 +2186,158 @@ static void ensure_socket_initialization(void)
2186
2186
initialized = 1 ;
2187
2187
}
2188
2188
2189
+ static int winsock_error_to_errno (DWORD err )
2190
+ {
2191
+ switch (err ) {
2192
+ case WSAEINTR : return EINTR ;
2193
+ case WSAEBADF : return EBADF ;
2194
+ case WSAEACCES : return EACCES ;
2195
+ case WSAEFAULT : return EFAULT ;
2196
+ case WSAEINVAL : return EINVAL ;
2197
+ case WSAEMFILE : return EMFILE ;
2198
+ case WSAEWOULDBLOCK : return EWOULDBLOCK ;
2199
+ case WSAEINPROGRESS : return EINPROGRESS ;
2200
+ case WSAEALREADY : return EALREADY ;
2201
+ case WSAENOTSOCK : return ENOTSOCK ;
2202
+ case WSAEDESTADDRREQ : return EDESTADDRREQ ;
2203
+ case WSAEMSGSIZE : return EMSGSIZE ;
2204
+ case WSAEPROTOTYPE : return EPROTOTYPE ;
2205
+ case WSAENOPROTOOPT : return ENOPROTOOPT ;
2206
+ case WSAEPROTONOSUPPORT : return EPROTONOSUPPORT ;
2207
+ case WSAEOPNOTSUPP : return EOPNOTSUPP ;
2208
+ case WSAEAFNOSUPPORT : return EAFNOSUPPORT ;
2209
+ case WSAEADDRINUSE : return EADDRINUSE ;
2210
+ case WSAEADDRNOTAVAIL : return EADDRNOTAVAIL ;
2211
+ case WSAENETDOWN : return ENETDOWN ;
2212
+ case WSAENETUNREACH : return ENETUNREACH ;
2213
+ case WSAENETRESET : return ENETRESET ;
2214
+ case WSAECONNABORTED : return ECONNABORTED ;
2215
+ case WSAECONNRESET : return ECONNRESET ;
2216
+ case WSAENOBUFS : return ENOBUFS ;
2217
+ case WSAEISCONN : return EISCONN ;
2218
+ case WSAENOTCONN : return ENOTCONN ;
2219
+ case WSAETIMEDOUT : return ETIMEDOUT ;
2220
+ case WSAECONNREFUSED : return ECONNREFUSED ;
2221
+ case WSAELOOP : return ELOOP ;
2222
+ case WSAENAMETOOLONG : return ENAMETOOLONG ;
2223
+ case WSAEHOSTUNREACH : return EHOSTUNREACH ;
2224
+ case WSAENOTEMPTY : return ENOTEMPTY ;
2225
+ /* No errno equivalent; default to EIO */
2226
+ case WSAESOCKTNOSUPPORT :
2227
+ case WSAEPFNOSUPPORT :
2228
+ case WSAESHUTDOWN :
2229
+ case WSAETOOMANYREFS :
2230
+ case WSAEHOSTDOWN :
2231
+ case WSAEPROCLIM :
2232
+ case WSAEUSERS :
2233
+ case WSAEDQUOT :
2234
+ case WSAESTALE :
2235
+ case WSAEREMOTE :
2236
+ case WSASYSNOTREADY :
2237
+ case WSAVERNOTSUPPORTED :
2238
+ case WSANOTINITIALISED :
2239
+ case WSAEDISCON :
2240
+ case WSAENOMORE :
2241
+ case WSAECANCELLED :
2242
+ case WSAEINVALIDPROCTABLE :
2243
+ case WSAEINVALIDPROVIDER :
2244
+ case WSAEPROVIDERFAILEDINIT :
2245
+ case WSASYSCALLFAILURE :
2246
+ case WSASERVICE_NOT_FOUND :
2247
+ case WSATYPE_NOT_FOUND :
2248
+ case WSA_E_NO_MORE :
2249
+ case WSA_E_CANCELLED :
2250
+ case WSAEREFUSED :
2251
+ case WSAHOST_NOT_FOUND :
2252
+ case WSATRY_AGAIN :
2253
+ case WSANO_RECOVERY :
2254
+ case WSANO_DATA :
2255
+ case WSA_QOS_RECEIVERS :
2256
+ case WSA_QOS_SENDERS :
2257
+ case WSA_QOS_NO_SENDERS :
2258
+ case WSA_QOS_NO_RECEIVERS :
2259
+ case WSA_QOS_REQUEST_CONFIRMED :
2260
+ case WSA_QOS_ADMISSION_FAILURE :
2261
+ case WSA_QOS_POLICY_FAILURE :
2262
+ case WSA_QOS_BAD_STYLE :
2263
+ case WSA_QOS_BAD_OBJECT :
2264
+ case WSA_QOS_TRAFFIC_CTRL_ERROR :
2265
+ case WSA_QOS_GENERIC_ERROR :
2266
+ case WSA_QOS_ESERVICETYPE :
2267
+ case WSA_QOS_EFLOWSPEC :
2268
+ case WSA_QOS_EPROVSPECBUF :
2269
+ case WSA_QOS_EFILTERSTYLE :
2270
+ case WSA_QOS_EFILTERTYPE :
2271
+ case WSA_QOS_EFILTERCOUNT :
2272
+ case WSA_QOS_EOBJLENGTH :
2273
+ case WSA_QOS_EFLOWCOUNT :
2274
+ #ifndef _MSC_VER
2275
+ case WSA_QOS_EUNKNOWNPSOBJ :
2276
+ #endif
2277
+ case WSA_QOS_EPOLICYOBJ :
2278
+ case WSA_QOS_EFLOWDESC :
2279
+ case WSA_QOS_EPSFLOWSPEC :
2280
+ case WSA_QOS_EPSFILTERSPEC :
2281
+ case WSA_QOS_ESDMODEOBJ :
2282
+ case WSA_QOS_ESHAPERATEOBJ :
2283
+ case WSA_QOS_RESERVED_PETYPE :
2284
+ default : return EIO ;
2285
+ }
2286
+ }
2287
+
2288
+ /*
2289
+ * On Windows, `errno` is a global macro to a function call.
2290
+ * This makes it difficult to debug and single-step our mappings.
2291
+ */
2292
+ static inline void set_wsa_errno (void )
2293
+ {
2294
+ DWORD wsa = WSAGetLastError ();
2295
+ int e = winsock_error_to_errno (wsa );
2296
+ errno = e ;
2297
+
2298
+ #ifdef DEBUG_WSA_ERRNO
2299
+ fprintf (stderr , "winsock error: %d -> %d\n" , wsa , e );
2300
+ fflush (stderr );
2301
+ #endif
2302
+ }
2303
+
2304
+ static inline int winsock_return (int ret )
2305
+ {
2306
+ if (ret < 0 )
2307
+ set_wsa_errno ();
2308
+
2309
+ return ret ;
2310
+ }
2311
+
2312
+ #define WINSOCK_RETURN (x ) do { return winsock_return(x); } while (0)
2313
+
2189
2314
#undef gethostname
2190
2315
int mingw_gethostname (char * name , int namelen )
2191
2316
{
2192
- ensure_socket_initialization ();
2193
- return gethostname (name , namelen );
2317
+ ensure_socket_initialization ();
2318
+ WINSOCK_RETURN ( gethostname (name , namelen ) );
2194
2319
}
2195
2320
2196
2321
#undef gethostbyname
2197
2322
struct hostent * mingw_gethostbyname (const char * host )
2198
2323
{
2324
+ struct hostent * ret ;
2325
+
2199
2326
ensure_socket_initialization ();
2200
- return gethostbyname (host );
2327
+
2328
+ ret = gethostbyname (host );
2329
+ if (!ret )
2330
+ set_wsa_errno ();
2331
+
2332
+ return ret ;
2201
2333
}
2202
2334
2203
2335
#undef getaddrinfo
2204
2336
int mingw_getaddrinfo (const char * node , const char * service ,
2205
2337
const struct addrinfo * hints , struct addrinfo * * res )
2206
2338
{
2207
2339
ensure_socket_initialization ();
2208
- return getaddrinfo (node , service , hints , res );
2340
+ WINSOCK_RETURN ( getaddrinfo (node , service , hints , res ) );
2209
2341
}
2210
2342
2211
2343
int mingw_socket (int domain , int type , int protocol )
@@ -2225,7 +2357,7 @@ int mingw_socket(int domain, int type, int protocol)
2225
2357
* in errno so that _if_ someone looks up the code somewhere,
2226
2358
* then it is at least the number that are usually listed.
2227
2359
*/
2228
- errno = WSAGetLastError ();
2360
+ set_wsa_errno ();
2229
2361
return -1 ;
2230
2362
}
2231
2363
/* convert into a file descriptor */
@@ -2241,35 +2373,35 @@ int mingw_socket(int domain, int type, int protocol)
2241
2373
int mingw_connect (int sockfd , struct sockaddr * sa , size_t sz )
2242
2374
{
2243
2375
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2244
- return connect (s , sa , sz );
2376
+ WINSOCK_RETURN ( connect (s , sa , sz ) );
2245
2377
}
2246
2378
2247
2379
#undef bind
2248
2380
int mingw_bind (int sockfd , struct sockaddr * sa , size_t sz )
2249
2381
{
2250
2382
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2251
- return bind (s , sa , sz );
2383
+ WINSOCK_RETURN ( bind (s , sa , sz ) );
2252
2384
}
2253
2385
2254
2386
#undef setsockopt
2255
2387
int mingw_setsockopt (int sockfd , int lvl , int optname , void * optval , int optlen )
2256
2388
{
2257
2389
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2258
- return setsockopt (s , lvl , optname , (const char * )optval , optlen );
2390
+ WINSOCK_RETURN ( setsockopt (s , lvl , optname , (const char * )optval , optlen ) );
2259
2391
}
2260
2392
2261
2393
#undef shutdown
2262
2394
int mingw_shutdown (int sockfd , int how )
2263
2395
{
2264
2396
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2265
- return shutdown (s , how );
2397
+ WINSOCK_RETURN ( shutdown (s , how ) );
2266
2398
}
2267
2399
2268
2400
#undef listen
2269
2401
int mingw_listen (int sockfd , int backlog )
2270
2402
{
2271
2403
SOCKET s = (SOCKET )_get_osfhandle (sockfd );
2272
- return listen (s , backlog );
2404
+ WINSOCK_RETURN ( listen (s , backlog ) );
2273
2405
}
2274
2406
2275
2407
#undef accept
@@ -2280,6 +2412,11 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
2280
2412
SOCKET s1 = (SOCKET )_get_osfhandle (sockfd1 );
2281
2413
SOCKET s2 = accept (s1 , sa , sz );
2282
2414
2415
+ if (s2 == INVALID_SOCKET ) {
2416
+ set_wsa_errno ();
2417
+ return -1 ;
2418
+ }
2419
+
2283
2420
/* convert into a file descriptor */
2284
2421
if ((sockfd2 = _open_osfhandle (s2 , O_RDWR |O_BINARY )) < 0 ) {
2285
2422
int err = errno ;
0 commit comments