Don't close socket on Communicator error

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

diff --git a/source/socket.cpp b/source/socket.cpp
index c4e98a363a89b9779517f9aab9c95a9cb1a84742..c845471a58ed13d20608b4768e13879389370016 100644 (file)
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -4,7 +4,10 @@
 #include <sys/socket.h>
 #endif
 #include <iostream>
-#include <msp/strings/formatter.h>
+#include <msp/core/systemerror.h>
+#include <msp/io/handle_private.h>
+#include <msp/strings/format.h>
+#include <msp/time/rawtime_private.h>
 #include <msp/time/units.h>
 #include "socket.h"
 
@@ -49,6 +52,8 @@ Socket::Socket(SocketHandle h, const SockAddr &paddr):
 
 #ifdef WIN32
        event = CreateEvent(0, false, false, 0);
+#else
+       *event = handle;
 #endif
 }
 
@@ -61,6 +66,8 @@ Socket::Socket(Family af, int type, int proto):
 
 #ifdef WIN32
        event = CreateEvent(0, false, false, 0);
+#else
+       *event = handle;
 #endif
 }
 
@@ -84,13 +91,9 @@ void Socket::set_block(bool b)
 #endif
 }
 
-IO::Handle Socket::get_event_handle()
+const IO::Handle &Socket::get_event_handle()
 {
-#ifdef WIN32
        return event;
-#else
-       return handle;
-#endif
 }
 
 
@@ -103,7 +106,7 @@ void Socket::bind(const SockAddr &addr)
 
        int err = ::bind(handle, reinterpret_cast<sockaddr *>(&sa), size);
        if(err==-1)
-               throw SystemError("Unable to bind", errno);
+               throw system_error("bind");
 
        delete local_addr;
        local_addr = addr.copy();
@@ -136,8 +139,7 @@ void Socket::close()
 void Socket::set_timeout(const Time::TimeDelta &timeout)
 {
 #ifndef WIN32
-       timeval tv;
-       timeout.fill_timeval(tv);
+       timeval tv = Time::rawtime_to_timeval(timeout.raw());
        set_option(SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(timeval));
        set_option(SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(timeval));
 #else
@@ -150,23 +152,23 @@ void Socket::set_timeout(const Time::TimeDelta &timeout)
 const SockAddr &Socket::get_local_address() const
 {
        if(local_addr==0)
-               throw InvalidState("Local address not set");
+               throw bad_socket_state("not bound");
        return *local_addr;
 }
 
 const SockAddr &Socket::get_peer_address() const
 {
        if(peer_addr==0)
-               throw InvalidState("Peer address not set");
+               throw bad_socket_state("not connected");
        return *peer_addr;
 }
 
 void Socket::check_state(bool conn) const
 {
        if(handle==MSP_NET_INVALID_SOCKET_HANDLE)
-               throw Exception("Socket is closed");
+               throw bad_socket_state("socket is closed");
        if(conn && !connected)
-               throw Exception("Socket is not connected");
+               throw bad_socket_state("not connected");
 }
 
 int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen)
@@ -200,7 +202,7 @@ unsigned Socket::do_write(const char *buf, unsigned size)
                if(errno==EAGAIN)
                        return 0;
                else
-                       throw SystemError("Writing to socket failed", errno);
+                       throw system_error("send");
        }
 
        return ret;
@@ -219,7 +221,7 @@ unsigned Socket::do_read(char *buf, unsigned size)
                if(errno==EAGAIN)
                        return 0;
                else
-                       throw SystemError("Reading from socket failed", errno);
+                       throw system_error("recv");
        }
        else if(ret==0 && !eof_flag)
        {