X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstreamsocket.cpp;h=8a262454eca173dfcc6ef93f0fcd0d45c10582f7;hb=21c596567e3b6fd794ed6af73d304ce2bc70e58f;hp=b06cf69ca9314cb6c750c1147513f9b4dc9c3a0a;hpb=6489612c788dd57721fc181ff26a981b35668d1e;p=libs%2Fnet.git

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index b06cf69..8a26245 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<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)
@@ -67,7 +66,7 @@ bool StreamSocket::connect(const SockAddr &addr)
 	delete local_addr;
 	SockAddr::SysAddr lsa;
 	getsockname(priv->handle, reinterpret_cast<sockaddr *>(&lsa.addr), &lsa.size);
-	local_addr = SockAddr::from_sys(lsa);
+	local_addr = SockAddr::new_from_sys(lsa);
 
 	if(err==0)
 	{
@@ -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;
 
@@ -130,7 +123,13 @@ void StreamSocket::on_event(IO::PollEvent ev)
 
 		connecting = false;
 		connected = (err==0);
-		signal_connect_finished.emit(err);
+		if(err)
+		{
+			system_error exc("connect", err);
+			signal_connect_finished.emit(&exc);
+		}
+		else
+			signal_connect_finished.emit(0);
 
 		if(err!=0)
 		{