diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-08-18 10:26:20 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-08-18 10:26:20 +0000 |
| commit | 834625364f0a7116bb903e7eb6e65ae7e97558fd (patch) | |
| tree | 8a8ebd55e461d2b34cf840abd91a3365a0033ae5 /src/SocketCore.cc | |
| parent | 657a40935e73bcb8a71e98b5716d31dd30aa458b (diff) | |
Fixed MinGW non-blocking bug.
* src/SocketCore.cc
* src/HttpRequestCommand.cc
Added src/timegm,{h,c}
Diffstat (limited to 'src/SocketCore.cc')
| -rw-r--r-- | src/SocketCore.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/SocketCore.cc b/src/SocketCore.cc index b71e6111..66466a9e 100644 --- a/src/SocketCore.cc +++ b/src/SocketCore.cc @@ -188,16 +188,21 @@ void SocketCore::establishConnection(const string& host, int32_t port) { } // make socket non-blocking mode setNonBlockingMode(); - if(connect(sockfd, (struct sockaddr*)&sockaddr, (socklen_t)sizeof(sockaddr)) == -1 && SOCKET_ERRNO != EINPROGRESS) { + if(connect(sockfd, (struct sockaddr*)&sockaddr, (socklen_t)sizeof(sockaddr)) == -1 && SOCKET_ERRNO != +#ifndef __MINGW32__ +EINPROGRESS +#else +WSAEWOULDBLOCK +#endif // __MINGW32__ + ) { throw new DlAbortEx(EX_SOCKET_CONNECT, host.c_str(), errorMsg()); } } void SocketCore::setNonBlockingMode() { #ifdef __MINGW32__ - u_long flag = 0; - ::ioctlsocket(sockfd, FIONBIO, &flag); - if (WSAGetLastError()) { + static u_long flag = 1; + if (::ioctlsocket(sockfd, FIONBIO, &flag) == -1) { throw new DlAbortEx(EX_SOCKET_NONBLOCKING, errorMsg()); } #else @@ -210,8 +215,10 @@ void SocketCore::setNonBlockingMode() { void SocketCore::setBlockingMode() { #ifdef __MINGW32__ - u_long flag = 1; - ::ioctlsocket(sockfd, FIONBIO, &flag); + static u_long flag = 0; + if (::ioctlsocket(sockfd, FIONBIO, &flag) == -1) { + throw new DlAbortEx(EX_SOCKET_BLOCKING, errorMsg()); + } #else int32_t flags = fcntl(sockfd, F_GETFL, 0); // TODO add error handling |