X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsocket.h;h=5536146544c3de098993d1af06295caeecd075be;hb=65b029e8334d4dfc9a6161fc04740b03d56a8e2f;hp=f275a7e2b35a0712fd97f78fe6774e226fdce8fe;hpb=f59eded7c3e162bbdfc6db424c9badc730017698;p=libs%2Fnet.git

diff --git a/source/socket.h b/source/socket.h
index f275a7e..5536146 100644
--- a/source/socket.h
+++ b/source/socket.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspnet
-Copyright © 2008  Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
 #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"
@@ -16,32 +10,43 @@ Distributed under the LGPL
 namespace Msp {
 namespace Net {
 
-class Socket: public IO::Base
+class Socket: public IO::EventObject
 {
+protected:
+	SocketHandle handle;
+	IO::Handle event;
+	bool connected;
+	SockAddr *local_addr;
+	SockAddr *peer_addr;
+
+	Socket(SocketHandle, const SockAddr &);
+	Socket(Family, int, int);
 public:
+	~Socket();
+
 	void set_block(bool);
-	IO::Handle get_event_handle();
+	const IO::Handle &get_event_handle();
 
-	bool get_connected() const { return connected; }
+	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 &);
-	virtual int connect(const SockAddr &) =0;
+
+	/** 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();
+
+	void set_timeout(const Time::TimeDelta &);
 	const SockAddr &get_local_address() const;
 	const SockAddr &get_peer_address() const;
-	~Socket();
 protected:
-	SocketHandle handle;
-#ifdef WIN32
-	IO::Handle event;
-#endif
-	bool       connected;
-	SockAddr   *local_addr;
-	SockAddr   *peer_addr;
-
-	Socket(SocketHandle, const SockAddr &);
-	Socket(Family, int, int);
 	void check_state(bool) const;
-	int get_option(int, int, void *, socklen_t *);
+	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);
 };