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();
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)
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;