Don't close socket on Communicator error

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

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index 43b86615b2ee2e631cef68be878c69299f73701e..e15a1d143c0281cc9686abd9b4e36a1da97a168c 100644 (file)
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,5 +1,6 @@
-#include <errno.h>
-#include <msp/strings/formatter.h>
+#include <cerrno>
+#include <msp/core/systemerror.h>
+#include <msp/strings/format.h>
 #include "datagramsocket.h"
 
 namespace Msp {
@@ -19,21 +20,27 @@ int DatagramSocket::connect(const SockAddr &addr)
        check_state(false);
 
        sockaddr_storage sa;
-       socklen_t size=addr.fill_sockaddr(sa);
+       socklen_t size = addr.fill_sockaddr(sa);
 
-       int err=::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
+       int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
        if(err==-1)
-               throw SystemError("Unable to connect", errno);
+       {
+#ifdef WIN32
+               throw system_error("connect", WSAGetLastError());
+#else
+               throw system_error("connect");
+#endif
+       }
 
        delete peer_addr;
-       peer_addr=addr.copy();
+       peer_addr = addr.copy();
 
        delete local_addr;
-       size=sizeof(sockaddr_storage);
+       size = sizeof(sockaddr_storage);
        getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
-       local_addr=SockAddr::create(sa);
+       local_addr = SockAddr::create(sa);
 
-       connected=true;
+       connected = true;
 
        return (err==0)?0:1;
 }
@@ -46,15 +53,21 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
                return 0;
 
        sockaddr_storage addr;
-       socklen_t addr_len=addr_.fill_sockaddr(addr);
+       socklen_t addr_len = addr_.fill_sockaddr(addr);
 
-       int ret=::sendto(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), addr_len);
+       int ret = ::sendto(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), addr_len);
        if(ret<0)
        {
                if(errno==EAGAIN)
                        return 0;
                else
-                       throw SystemError("Sendto failed", errno);
+               {
+#ifdef WIN32
+                       throw system_error("sendto", WSAGetLastError());
+#else
+                       throw system_error("sendto");
+#endif
+               }
        }
 
        return ret;
@@ -68,18 +81,24 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
                return 0;
 
        sockaddr_storage addr;
-       socklen_t addr_len=sizeof(sockaddr_storage);
+       socklen_t addr_len = sizeof(sockaddr_storage);
 
-       int ret=::recvfrom(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), &addr_len);
+       int ret = ::recvfrom(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), &addr_len);
        if(ret<0)
        {
                if(errno==EAGAIN)
                        return 0;
                else
-                       throw SystemError("Recvfrom failed", errno);
+               {
+#ifdef WIN32
+                       throw system_error("recvfrom", WSAGetLastError());
+#else
+                       throw system_error("recvfrom");
+#endif
+               }
        }
 
-       addr_=SockAddr::create(addr);
+       addr_ = SockAddr::create(addr);
 
        return ret;
 }