There's no good reason to prefer WASConnect over connect

[libs/net.git] / source / streamsocket.cpp

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index 9147ad88861f02cfb4f01502b8df40fde3633698..7ede11552aeba1326928e8e845b0eabe23544c6a 100644 (file)
--- 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<sockaddr *>(&sa.addr), sa.size);
 #ifdef WIN32
-       int err = WSAConnect(priv->handle, reinterpret_cast<sockaddr *>(&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<sockaddr *>(&sa.addr), sa.size);
        if(err==-1)
        {
                if(errno==EINPROGRESS)
@@ -82,7 +81,7 @@ bool StreamSocket::connect(const SockAddr &addr)
 bool StreamSocket::poll_connect(const Time::TimeDelta &timeout)
 {
        if(!connecting)
-               throw bad_socket_state("not connecting");
+               return false;
 
        IO::PollEvent res = poll(*this, IO::P_OUTPUT, timeout);
        if(res&IO::P_OUTPUT)