Add a dynamic receiver class for more flexible packet handling

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

diff --git a/source/net/socket.h b/source/net/socket.h
index 1f60f9bb2276942ce31e7eaf69612e4e67641f02..b89c175bda040d2e22b17ba3335cdefd225616bb 100644 (file)
--- a/source/net/socket.h
+++ b/source/net/socket.h
@@ -1,23 +1,24 @@
 #ifndef MSP_NET_SOCKET_H_
 #define MSP_NET_SOCKET_H_
 
+#include <memory>
+#include <msp/core/except.h>
 #include <msp/io/eventobject.h>
 #include <msp/io/handle.h>
-#include "constants.h"
+#include "mspnet_api.h"
 #include "sockaddr.h"
 
 namespace Msp {
 namespace Net {
 
-class bad_socket_state: public std::logic_error
+class MSPNET_API bad_socket_state: public invalid_state
 {
 public:
-       bad_socket_state(const std::string &w): std::logic_error(w) { }
-       virtual ~bad_socket_state() throw() { }
+       bad_socket_state(const std::string &w): invalid_state(w) { }
 };
 
 
-class Socket: public IO::EventObject
+class MSPNET_API Socket: public IO::EventObject
 {
 protected:
        enum SocketEvent
@@ -30,8 +31,8 @@ protected:
 
        struct Private;
 
-       Private *priv;
-       SockAddr *local_addr;
+       std::unique_ptr<Private> priv;
+       std::unique_ptr<SockAddr> local_addr;
 
        Socket(const Private &);
        Socket(Family, int, int);
@@ -41,13 +42,16 @@ private:
 public:
        ~Socket();
 
-       virtual void set_block(bool);
-       virtual const IO::Handle &get_event_handle();
+       void set_block(bool) override;
+       void set_inherit(bool) override;
+       const IO::Handle &get_handle(IO::Mode) override;
+       const IO::Handle &get_event_handle() override;
 
        /** Associates the socket with a local address.  There must be no existing
        users of the address. */
        void bind(const SockAddr &);
 
+       bool is_bound() const { return static_cast<bool>(local_addr); }
        const SockAddr &get_local_address() const;
 
        void set_timeout(const Time::TimeDelta &);