X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsocket.h;h=861012b8cc50c0bb2114440f0de2439fcacaa744;hb=4b408e693bcb004ccaa6958610e946cfbeff9465;hp=a2cbae1a285ded03a645b377b3e2a85188213664;hpb=4feef9d7a2d96668660686d3812973e6f788359a;p=libs%2Fnet.git

diff --git a/source/socket.h b/source/socket.h
index a2cbae1..861012b 100644
--- a/source/socket.h
+++ b/source/socket.h
@@ -1,32 +1,44 @@
 #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
+
+
+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;
 	bool connected;
 	SockAddr *local_addr;
 	SockAddr *peer_addr;
 
-	Socket(SocketHandle, const SockAddr &);
+	Socket(const Private &, const SockAddr &);
 	Socket(Family, int, int);
 public:
 	~Socket();
 
 	void set_block(bool);
-	IO::Handle get_event_handle();
+	const IO::Handle &get_event_handle();
 
 	bool is_connected() const { return connected; }
 	
@@ -38,14 +50,10 @@ public:
 	type. */
 	virtual int connect(const SockAddr &) = 0;
 
-	/// Closes the socket.  Most operations will throw an exception after this.
-	void close();
-
 	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);