X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fclientsocket.cpp;h=04d07000a7bb1286c105a1697fdc71f0bc880901;hb=HEAD;hp=e07b1f60bcfa887fca56b85939be5417376ea2a6;hpb=c2eeb0da9f5e5de1b8de1bc66a42709e54d504e2;p=libs%2Fnet.git

diff --git a/source/net/clientsocket.cpp b/source/net/clientsocket.cpp
index e07b1f6..51a8dfa 100644
--- a/source/net/clientsocket.cpp
+++ b/source/net/clientsocket.cpp
@@ -1,21 +1,19 @@
 #include "platform_api.h"
-#include <msp/core/systemerror.h>
 #include "clientsocket.h"
+#include <msp/core/systemerror.h>
 #include "socket_private.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Net {
 
 ClientSocket::ClientSocket(Family af, int type, int proto):
-	Socket(af, type, proto),
-	connecting(false),
-	connected(false),
-	peer_addr(0)
+	Socket(af, type, proto)
 { }
 
 ClientSocket::ClientSocket(const Private &p, const SockAddr &paddr):
 	Socket(p),
-	connecting(false),
 	connected(true),
 	peer_addr(paddr.copy())
 { }
@@ -23,8 +21,6 @@ ClientSocket::ClientSocket(const Private &p, const SockAddr &paddr):
 ClientSocket::~ClientSocket()
 {
 	signal_flush_required.emit();
-
-	delete peer_addr;
 }
 
 void ClientSocket::shutdown(IO::Mode m)
@@ -55,7 +51,7 @@ void ClientSocket::shutdown(IO::Mode m)
 
 const SockAddr &ClientSocket::get_peer_address() const
 {
-	if(peer_addr==0)
+	if(!peer_addr)
 		throw bad_socket_state("not connected");
 	return *peer_addr;
 }
@@ -78,18 +74,22 @@ size_t ClientSocket::do_read(char *buf, size_t size)
 	if(!connected)
 		throw bad_socket_state("not connected");
 
+	// XXX This breaks level-triggered semantics on Windows
 	if(size==0)
 		return 0;
 
-	size_t ret = check_sys_error(::recv(priv->handle, buf, size, 0), "recv");
-	if(ret==0 && !eof_flag)
+	make_signed<size_t>::type ret = ::recv(priv->handle, buf, size, 0);
+	if(ret==0)
 	{
-		eof_flag = true;
-		signal_end_of_file.emit();
-		set_socket_events(S_NONE);
+		if(!eof_flag)
+		{
+			set_socket_events(S_NONE);
+			set_eof();
+		}
+		return 0;
 	}
 
-	return ret;
+	return check_sys_error(ret, "recv");
 }
 
 } // namespace Net