X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstreamsocket.cpp;h=8a262454eca173dfcc6ef93f0fcd0d45c10582f7;hb=9661bcedc3518124bcdd95c239fa92419cd31216;hp=5794ecd82914b16c3c8d22c7edc28a56ffffcbf5;hpb=dbfb303f336037cf7ca4fca3d8bfe504c624b501;p=libs%2Fnet.git

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index 5794ecd..8a26245 100644
--- a/source/streamsocket.cpp
+++ b/source/streamsocket.cpp
@@ -14,8 +14,7 @@ namespace Msp {
 namespace Net {
 
 StreamSocket::StreamSocket(const Private &p, const SockAddr &paddr):
-	Socket(p, paddr),
-	connecting(false)
+	ClientSocket(p, paddr)
 {
 #ifdef WIN32
 	WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
@@ -24,62 +23,18 @@ StreamSocket::StreamSocket(const Private &p, const SockAddr &paddr):
 }
 
 StreamSocket::StreamSocket(Family af, int proto):
-	Socket(af, SOCK_STREAM, proto),
-	connecting(false)
+	ClientSocket(af, SOCK_STREAM, proto)
 { }
 
-int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
-{
-	if(!connecting)
-		throw bad_socket_state("not connecting");
-
-	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)
-	{
-		connecting = false;
-
-		int err;
-		socklen_t len = sizeof(int);
-		get_option(SOL_SOCKET, SO_ERROR, &err, &len);
-
-		if(err!=0)
-		{
-			set_events(IO::P_NONE);
-#ifdef WIN32
-			throw system_error("connect", WSAGetLastError());
-#else
-			throw system_error("connect");
-#endif
-		}
-
-#ifdef WIN32
-		WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
-#endif
-		set_events(IO::P_INPUT);
-
-		connected = true;
-
-		return 0;
-	}
-
-	return 1;
-}
-
-int StreamSocket::connect(const SockAddr &addr)
+bool StreamSocket::connect(const SockAddr &addr)
 {
 	if(connected)
 		throw bad_socket_state("already connected");
 
 	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();
@@ -93,7 +48,6 @@ int 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)
@@ -112,7 +66,7 @@ int 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)
 	{
@@ -121,7 +75,42 @@ int StreamSocket::connect(const SockAddr &addr)
 		signal_connect_finished.emit(0);
 	}
 
-	return (err==0)?0:1;
+	return connected;
+}
+
+bool StreamSocket::poll_connect(const Time::TimeDelta &timeout)
+{
+	if(!connecting)
+		return false;
+
+	IO::PollEvent res = poll(*this, IO::P_OUTPUT, timeout);
+	if(res&IO::P_OUTPUT)
+	{
+		connecting = false;
+
+		int err;
+		socklen_t len = sizeof(int);
+		get_option(SOL_SOCKET, SO_ERROR, &err, &len);
+
+		if(err!=0)
+		{
+			set_events(IO::P_NONE);
+#ifdef WIN32
+			throw system_error("connect", WSAGetLastError());
+#else
+			throw system_error("connect");
+#endif
+		}
+
+#ifdef WIN32
+		WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
+#endif
+		set_events(IO::P_INPUT);
+
+		connected = true;
+	}
+
+	return connected;
 }
 
 void StreamSocket::on_event(IO::PollEvent ev)
@@ -134,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)
 		{