Add counter system for umodes to get rid of some O(n)

[user/henk/code/inspircd.git] / include / inspsocket.h

diff --git a/include/inspsocket.h b/include/inspsocket.h
index ddb0baedb41074bda2571465fa321ac2b613a0a4..43555ff438cc27e2fd154741473323abdb4937c0 100644 (file)
--- 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
@@ -42,6 +41,19 @@ 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
  * can use for TCP socket support. It is fully integrated
@@ -53,17 +65,19 @@ using irc::sockets::insp_aton;
  * and use the InspSocket constructors to establish connections
  * and bindings.
  */
-class InspSocket : public Extensible
+class InspSocket : public EventHandler
 {
  public:
+
+       bool IsIOHooked;
+
        InspIRCd* Instance;
 
-       std::deque<std::string> outbuffer;
+       SocketTimeout* Timeout;
 
-       /**
-        * The file descriptor of this socket
-        */
-        int fd;
+       unsigned long timeout_val;
+
+       std::deque<std::string> outbuffer;
 
        /**
         * The hostname connected to
@@ -95,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.
@@ -271,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.
@@ -365,6 +364,10 @@ class InspSocket : public Extensible
         * memory reclaimed.
         */
        void MarkAsClosed();
+
+       void HandleEvent(EventType et, int errornum = 0);
+
+       bool Readable();
 };
 
 #endif