X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspsocket.h;h=43555ff438cc27e2fd154741473323abdb4937c0;hb=5e9a6b9186a8cbaaf65ae7d9cd9c0c033c91b497;hp=b644151dc06b7e3205a9f290c60425068100bc6a;hpb=1d6b72a5ba80b7f56f20b67b92677ffba3994991;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspsocket.h b/include/inspsocket.h
index b644151dc..43555ff43 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -23,6 +20,8 @@
 #include "dns.h"
 #include "inspircd_config.h"
 #include "socket.h"
+#include "inspsocket.h"
+#include "timer.h"
 
 /**
  * States which a socket may be in
@@ -32,9 +31,28 @@ enum InspSocketState { I_DISCONNECTED, I_CONNECTING, I_CONNECTED, I_LISTENING, I
 /**
  * Error types which a socket may exhibit
  */
-enum InspSocketError { I_ERR_TIMEOUT, I_ERR_SOCKET, I_ERR_CONNECT, I_ERR_BIND, I_ERR_RESOLVE, I_ERR_WRITE };
+enum InspSocketError { I_ERR_TIMEOUT, I_ERR_SOCKET, I_ERR_CONNECT, I_ERR_BIND, I_ERR_RESOLVE, I_ERR_WRITE, I_ERR_NOMOREFDS };
 
 class InspSocket;
+class InspIRCd;
+
+using irc::sockets::insp_sockaddr;
+using irc::sockets::insp_inaddr;
+using irc::sockets::insp_ntoa;
+using irc::sockets::insp_aton;
+
+/** Used to time out socket connections
+ */
+class SocketTimeout : public InspTimer
+{
+ private:
+	InspSocket* sock;
+	InspIRCd* ServerInstance;
+	int sfd;
+ public:
+	SocketTimeout(int fd, InspIRCd* Instance, InspSocket* thesock, long secs_from_now, time_t now) : InspTimer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { };
+	virtual void Tick(time_t now);
+};
 
 /**
  * InspSocket is an extendable socket class which modules
@@ -47,16 +65,19 @@ class InspSocket;
  * and use the InspSocket constructors to establish connections
  * and bindings.
  */
-class InspSocket : public Extensible
+class InspSocket : public EventHandler
 {
  public:
 
-	std::deque<std::string> outbuffer;
+	bool IsIOHooked;
 
-	/**
-	 * The file descriptor of this socket
-	 */
-        int fd;
+	InspIRCd* Instance;
+
+	SocketTimeout* Timeout;
+
+	unsigned long timeout_val;
+
+	std::deque<std::string> outbuffer;
 
 	/**
 	 * The hostname connected to
@@ -88,13 +109,6 @@ class InspSocket : public Extensible
 	 */
         insp_inaddr addy;
 
-	/**
-	 * When this time is reached,
-	 * the socket times out if it is
-	 * in the CONNECTING state
-	 */
-        time_t timeout_end;
-
 	/**
 	 * This value is true if the
 	 * socket has timed out.
@@ -165,7 +179,7 @@ class InspSocket : public Extensible
 	 * The default constructor does nothing
 	 * and should not be used.
 	 */
-	InspSocket();
+	InspSocket(InspIRCd* SI);
 
 	/**
 	 * This constructor is used to associate
@@ -175,7 +189,7 @@ class InspSocket : public Extensible
 	 * will be set with the given IP address
 	 * and placed in CONNECTED state.
 	 */
-	InspSocket(int newfd, const char* ip);
+	InspSocket(InspIRCd* SI, int newfd, const char* ip);
 
 	/**
 	 * This constructor is used to create a new
@@ -188,7 +202,7 @@ class InspSocket : public Extensible
 	 * @param listening true to listen on the given host:port pair, or false to connect to them
 	 * @param maxtime Number of seconds to wait, if connecting, before the connection times out and an OnTimeout() event is generated
 	 */
-	InspSocket(const std::string &ipaddr, int port, bool listening, unsigned long maxtime);
+	InspSocket(InspIRCd* SI, const std::string &ipaddr, int port, bool listening, unsigned long maxtime);
 
 	/**
 	 * This method is called when an outbound
@@ -264,14 +278,6 @@ class InspSocket : public Extensible
 	 */
 	std::string GetIP();
 
-	/**
-	 * This function checks if the socket has
-	 * timed out yet, given the current time
-	 * in the parameter.
-	 * @return true if timed out, false if not timed out
-	 */
-	bool Timeout(time_t current);
-
 	/**
 	 * Writes a std::string to the socket. No carriage
 	 * returns or linefeeds are appended to the string.
@@ -358,6 +364,10 @@ class InspSocket : public Extensible
 	 * memory reclaimed.
 	 */
 	void MarkAsClosed();
+
+	void HandleEvent(EventType et, int errornum = 0);
+
+	bool Readable();
 };
 
 #endif