Add an overload for resolve that takes host and service separately

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

diff --git a/source/socket.h b/source/socket.h
index a2cbae1a285ded03a645b377b3e2a85188213664..f97588415b1e5df052b1138a1e706f596810fc0b 100644 (file)
--- a/source/socket.h
+++ b/source/socket.h
@@ -1,55 +1,53 @@
 #ifndef MSP_NET_SOCKET_H_
 #define MSP_NET_SOCKET_H_
 
-#include <msp/io/base.h>
+#include <msp/io/eventobject.h>
+#include <msp/io/handle.h>
 #include "constants.h"
 #include "sockaddr.h"
-#include "types.h"
 
 namespace Msp {
 namespace Net {
 
-class Socket: public IO::Base
-{
-protected:
-       SocketHandle handle;
 #ifdef WIN32
-       IO::Handle event;
+typedef int socklen_t;
 #endif
-       bool connected;
+
+
+class bad_socket_state: public std::logic_error
+{
+public:
+       bad_socket_state(const std::string &w): std::logic_error(w) { }
+       virtual ~bad_socket_state() throw() { }
+};
+
+
+class Socket: public IO::EventObject
+{
+protected:
+       struct Private;
+
+       Private *priv;
        SockAddr *local_addr;
-       SockAddr *peer_addr;
 
-       Socket(SocketHandle, const SockAddr &);
+       Socket(const Private &);
        Socket(Family, int, int);
 public:
        ~Socket();
 
-       void set_block(bool);
-       IO::Handle get_event_handle();
+       virtual void set_block(bool);
+       virtual const IO::Handle &get_event_handle();
 
-       bool is_connected() const { return connected; }
-       
        /** Associates the socket with a local address.  There must be no existing
        users of the address. */
        void bind(const SockAddr &);
 
-       /** Connects to a remote address.  Exact semantics depend on the socket
-       type. */
-       virtual int connect(const SockAddr &) = 0;
-
-       /// Closes the socket.  Most operations will throw an exception after this.
-       void close();
+       const SockAddr &get_local_address() const;
 
        void set_timeout(const Time::TimeDelta &);
-       const SockAddr &get_local_address() const;
-       const SockAddr &get_peer_address() const;
 protected:
-       void check_state(bool) const;
        int set_option(int, int, const void *, socklen_t);
        int get_option(int, int, void *, socklen_t *) const;
-       unsigned do_write(const char *, unsigned);
-       unsigned do_read(char *, unsigned);
 };
 
 } // namespace Net