Hide platform details of Socket behind pimpl

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

diff --git a/source/socket.cpp b/source/socket.cpp
index 7a82463bcd16609a89bd69bf816aece68ab66b3a..e91b684be8187407a6d323ff276f692756041a2e 100644 (file)
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -10,6 +10,7 @@
 #include <msp/time/rawtime_private.h>
 #include <msp/time/units.h>
 #include "socket.h"
+#include "socket_private.h"
 
 namespace {
 
@@ -39,35 +40,38 @@ WinSockHelper wsh;
 namespace Msp {
 namespace Net {
 
-Socket::Socket(SocketHandle h, const SockAddr &paddr):
-       handle(h),
+Socket::Socket(const Private &p, const SockAddr &paddr):
+       priv(new Private),
        connected(true),
        local_addr(0),
        peer_addr(paddr.copy())
 {
+       priv->handle = p.handle;
+
        sockaddr_storage sa;
        socklen_t size = sizeof(sockaddr_storage);
-       getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
+       getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa), &size);
        local_addr = SockAddr::create(sa);
 
 #ifdef WIN32
-       event = CreateEvent(0, false, false, 0);
+       *priv->event = CreateEvent(0, false, false, 0);
 #else
-       *event = handle;
+       *priv->event = priv->handle;
 #endif
 }
 
 Socket::Socket(Family af, int type, int proto):
+       priv(new Private),
        connected(false),
        local_addr(0),
        peer_addr(0)
 {
-       handle = socket(af, type, proto);
+       priv->handle = socket(af, type, proto);
 
 #ifdef WIN32
-       event = CreateEvent(0, false, false, 0);
+       *priv->event = CreateEvent(0, false, false, 0);
 #else
-       *event = handle;
+       *priv->event = priv->handle;
 #endif
 }
 
@@ -75,14 +79,15 @@ Socket::~Socket()
 {
        signal_flush_required.emit();
 #ifdef WIN32
-       closesocket(handle);
-       CloseHandle(event);
+       closesocket(priv->handle);
+       CloseHandle(*priv->event);
 #else
-       ::close(handle);
+       ::close(priv->handle);
 #endif
 
        delete local_addr;
        delete peer_addr;
+       delete priv;
 }
 
 void Socket::set_block(bool b)
@@ -93,16 +98,16 @@ void Socket::set_block(bool b)
 
 #ifdef WIN32
        u_long flag = !b;
-       ioctlsocket(handle, FIONBIO, &flag);
+       ioctlsocket(priv->handle, FIONBIO, &flag);
 #else
-       int flags = fcntl(handle, F_GETFL);
-       fcntl(handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
+       int flags = fcntl(priv->handle, F_GETFL);
+       fcntl(priv->handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
 #endif
 }
 
 const IO::Handle &Socket::get_event_handle()
 {
-       return event;
+       return priv->event;
 }
 
 
@@ -111,7 +116,7 @@ void Socket::bind(const SockAddr &addr)
        sockaddr_storage sa;
        unsigned size = addr.fill_sockaddr(sa);
 
-       int err = ::bind(handle, reinterpret_cast<sockaddr *>(&sa), size);
+       int err = ::bind(priv->handle, reinterpret_cast<sockaddr *>(&sa), size);
        if(err==-1)
                throw system_error("bind");
 
@@ -149,18 +154,18 @@ const SockAddr &Socket::get_peer_address() const
 int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen)
 {
 #ifdef WIN32
-       return setsockopt(handle, level, optname, reinterpret_cast<const char *>(optval), optlen);
+       return setsockopt(priv->handle, level, optname, reinterpret_cast<const char *>(optval), optlen);
 #else
-       return setsockopt(handle, level, optname, optval, optlen);
+       return setsockopt(priv->handle, level, optname, optval, optlen);
 #endif
 }
 
 int Socket::get_option(int level, int optname, void *optval, socklen_t *optlen) const
 {
 #ifdef WIN32
-       return getsockopt(handle, level, optname, reinterpret_cast<char *>(optval), optlen);
+       return getsockopt(priv->handle, level, optname, reinterpret_cast<char *>(optval), optlen);
 #else
-       return getsockopt(handle, level, optname, optval, optlen);
+       return getsockopt(priv->handle, level, optname, optval, optlen);
 #endif
 }
 
@@ -172,7 +177,7 @@ unsigned Socket::do_write(const char *buf, unsigned size)
        if(size==0)
                return 0;
 
-       int ret = ::send(handle, buf, size, 0);
+       int ret = ::send(priv->handle, buf, size, 0);
        if(ret<0)
        {
                if(errno==EAGAIN)
@@ -193,7 +198,7 @@ unsigned Socket::do_read(char *buf, unsigned size)
        if(size==0)
                return 0;
 
-       int ret = ::recv(handle, buf, size, 0);
+       int ret = ::recv(priv->handle, buf, size, 0);
        if(ret<0)
        {
                if(errno==EAGAIN)