Add a dynamic receiver class for more flexible packet handling

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

diff --git a/source/net/clientsocket.cpp b/source/net/clientsocket.cpp
index c400f80e9848946a4c6bff0d8b980c86b156ad3a..51a8dfa01b7913485397438ddcc3c24b5e9ae35b 100644 (file)
--- a/source/net/clientsocket.cpp
+++ b/source/net/clientsocket.cpp
@@ -1,8 +1,10 @@
 #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 {
 
@@ -19,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)
@@ -51,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;
 }
@@ -74,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;
-               set_socket_events(S_NONE);
-               signal_end_of_file.emit();
+               if(!eof_flag)
+               {
+                       set_socket_events(S_NONE);
+                       set_eof();
+               }
+               return 0;
        }
 
-       return ret;
+       return check_sys_error(ret, "recv");
 }
 
 } // namespace Net