X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstreamsocket.cpp;h=7ede11552aeba1326928e8e845b0eabe23544c6a;hb=5ed4af50473e707d76b22c5394a1ab88be4b3b7c;hp=b06cf69ca9314cb6c750c1147513f9b4dc9c3a0a;hpb=6489612c788dd57721fc181ff26a981b35668d1e;p=libs%2Fnet.git diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp index b06cf69..7ede115 100644 --- a/source/streamsocket.cpp +++ b/source/streamsocket.cpp @@ -33,8 +33,8 @@ bool StreamSocket::connect(const SockAddr &addr) SockAddr::SysAddr sa = addr.to_sys(); + int err = ::connect(priv->handle, reinterpret_cast(&sa.addr), sa.size); #ifdef WIN32 - int err = WSAConnect(priv->handle, reinterpret_cast(&sa.addr), sa.size, 0, 0, 0, 0); if(err==SOCKET_ERROR) { int err_code = WSAGetLastError(); @@ -48,7 +48,6 @@ bool StreamSocket::connect(const SockAddr &addr) throw system_error("connect", err_code); } #else - int err = ::connect(priv->handle, reinterpret_cast(&sa.addr), sa.size); if(err==-1) { if(errno==EINPROGRESS) @@ -82,16 +81,10 @@ bool StreamSocket::connect(const SockAddr &addr) bool StreamSocket::poll_connect(const Time::TimeDelta &timeout) { if(!connecting) - throw bad_socket_state("not connecting"); + return false; - int res = poll(*this, IO::P_OUTPUT, timeout); - if(res==-1) -#ifdef WIN32 - throw system_error("poll", WSAGetLastError()); -#else - throw system_error("poll"); -#endif - else if(res>0) + IO::PollEvent res = poll(*this, IO::P_OUTPUT, timeout); + if(res&IO::P_OUTPUT) { connecting = false;