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