Add ClientSocket and ServerSocket abstractions

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

diff --git a/source/socket.cpp b/source/socket.cpp
index 0e2950930f0e653d7348bcff826d3b0d53fcb57c..b5a6ec856ed615b9e3a8db920b4950f1a657917b 100644 (file)
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -41,11 +41,9 @@ WinSockHelper wsh;
 namespace Msp {
 namespace Net {
 
-Socket::Socket(const Private &p, const SockAddr &paddr):
+Socket::Socket(const Private &p):
        priv(new Private),
-       connected(true),
-       local_addr(0),
-       peer_addr(paddr.copy())
+       local_addr(0)
 {
        priv->handle = p.handle;
 
@@ -62,9 +60,7 @@ Socket::Socket(const Private &p, const SockAddr &paddr):
 
 Socket::Socket(Family af, int type, int proto):
        priv(new Private),
-       connected(false),
-       local_addr(0),
-       peer_addr(0)
+       local_addr(0)
 {
        priv->handle = socket(family_to_sys(af), type, proto);
 
@@ -77,7 +73,6 @@ Socket::Socket(Family af, int type, int proto):
 
 Socket::~Socket()
 {
-       signal_flush_required.emit();
 #ifdef WIN32
        closesocket(priv->handle);
        CloseHandle(*priv->event);
@@ -86,7 +81,6 @@ Socket::~Socket()
 #endif
 
        delete local_addr;
-       delete peer_addr;
        delete priv;
 }
 
@@ -143,13 +137,6 @@ const SockAddr &Socket::get_local_address() const
        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
@@ -168,52 +155,5 @@ int Socket::get_option(int level, int optname, void *optval, socklen_t *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(priv->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(priv->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