Move some functions around a bit

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

diff --git a/source/socket.cpp b/source/socket.cpp
index 7a82463bcd16609a89bd69bf816aece68ab66b3a..2bfdecc5b07794976ddaab3d5d528081c492d9a7 100644 (file)
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -9,7 +9,9 @@
 #include <msp/strings/format.h>
 #include <msp/time/rawtime_private.h>
 #include <msp/time/units.h>
+#include "sockaddr_private.h"
 #include "socket.h"
+#include "socket_private.h"
 
 namespace {
 
@@ -39,50 +41,47 @@ WinSockHelper wsh;
 namespace Msp {
 namespace Net {
 
-Socket::Socket(SocketHandle h, const SockAddr &paddr):
-       handle(h),
-       connected(true),
-       local_addr(0),
-       peer_addr(paddr.copy())
+Socket::Socket(const Private &p):
+       priv(new Private),
+       local_addr(0)
 {
-       sockaddr_storage sa;
-       socklen_t size = sizeof(sockaddr_storage);
-       getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
-       local_addr = SockAddr::create(sa);
+       priv->handle = p.handle;
+
+       SockAddr::SysAddr sa;
+       getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size);
+       local_addr = SockAddr::from_sys(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):
-       connected(false),
-       local_addr(0),
-       peer_addr(0)
+       priv(new Private),
+       local_addr(0)
 {
-       handle = socket(af, type, proto);
+       priv->handle = socket(family_to_sys(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
 }
 
 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,25 +92,24 @@ 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;
 }
 
 
 void Socket::bind(const SockAddr &addr)
 {
-       sockaddr_storage sa;
-       unsigned size = addr.fill_sockaddr(sa);
+       SockAddr::SysAddr sa = addr.to_sys();
 
-       int err = ::bind(handle, reinterpret_cast<sockaddr *>(&sa), size);
+       int err = ::bind(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), sa.size);
        if(err==-1)
                throw system_error("bind");
 
@@ -119,6 +117,13 @@ void Socket::bind(const SockAddr &addr)
        local_addr = addr.copy();
 }
 
+const SockAddr &Socket::get_local_address() const
+{
+       if(local_addr==0)
+               throw bad_socket_state("not bound");
+       return *local_addr;
+}
+
 void Socket::set_timeout(const Time::TimeDelta &timeout)
 {
 #ifndef WIN32
@@ -132,84 +137,23 @@ void Socket::set_timeout(const Time::TimeDelta &timeout)
 #endif
 }
 
-const SockAddr &Socket::get_local_address() const
-{
-       if(local_addr==0)
-               throw bad_socket_state("not bound");
-       return *local_addr;
-}
-
-const SockAddr &Socket::get_peer_address() const
-{
-       if(peer_addr==0)
-               throw bad_socket_state("not connected");
-       return *peer_addr;
-}
-
 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
 }
 
-unsigned Socket::do_write(const char *buf, unsigned size)
-{
-       if(!connected)
-               throw bad_socket_state("not connected");
-
-       if(size==0)
-               return 0;
-
-       int ret = ::send(handle, buf, size, 0);
-       if(ret<0)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("send");
-       }
-
-       return ret;
-}
-
-unsigned Socket::do_read(char *buf, unsigned size)
-{
-       if(!connected)
-               throw bad_socket_state("not connected");
-
-
-       if(size==0)
-               return 0;
-
-       int ret = ::recv(handle, buf, size, 0);
-       if(ret<0)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("recv");
-       }
-       else if(ret==0 && !eof_flag)
-       {
-               eof_flag = true;
-               signal_end_of_file.emit();
-               set_events(IO::P_NONE);
-       }
-
-       return ret;
-}
-
 } // namespace Net
 } // namespace Msp