Hide platform details of Socket behind pimpl

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

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index aa097f13707a6efe71fc191f21fc17b9a7511145..7aee3f868d455429c575f77f0d93cf817aaa860f 100644 (file)
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,6 +1,9 @@
 #include <cerrno>
+#include <msp/core/systemerror.h>
+#include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
 #include "datagramsocket.h"
+#include "socket_private.h"
 
 namespace Msp {
 namespace Net {
@@ -9,28 +12,32 @@ DatagramSocket::DatagramSocket(Family f, int p):
        Socket(f, SOCK_DGRAM, p)
 {
 #ifdef WIN32
-       WSAEventSelect(handle, event, FD_READ|FD_CLOSE);
+       WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
 #endif
        set_events(IO::P_INPUT);
 }
 
 int DatagramSocket::connect(const SockAddr &addr)
 {
-       check_state(false);
-
        sockaddr_storage sa;
        socklen_t size = addr.fill_sockaddr(sa);
 
-       int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
+       int err = ::connect(priv->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();
 
        delete local_addr;
        size = sizeof(sockaddr_storage);
-       getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
+       getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa), &size);
        local_addr = SockAddr::create(sa);
 
        connected = true;
@@ -40,21 +47,25 @@ int DatagramSocket::connect(const SockAddr &addr)
 
 unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr_)
 {
-       check_state(false);
-
        if(size==0)
                return 0;
 
        sockaddr_storage 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(priv->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;
@@ -62,21 +73,25 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
 
 unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
 {
-       check_state(false);
-
        if(size==0)
                return 0;
 
        sockaddr_storage addr;
        socklen_t addr_len = sizeof(sockaddr_storage);
 
-       int ret = ::recvfrom(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), &addr_len);
+       int ret = ::recvfrom(priv->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);