Fixes for tokenization oddness with metadata, and weird behaviour of std::istringstre...

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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 42ce01a27d55bbb0223d9e943ed4280f2c4a16f6..3e65bf677f07606860d2420f38c4355a60579608 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -2,14 +2,11 @@
  *       | 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.
+ *         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
@@ -37,6 +36,24 @@ enum InspSocketError { I_ERR_TIMEOUT, I_ERR_SOCKET, I_ERR_CONNECT, I_ERR_BIND, I
 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 CoreExport 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
@@ -48,17 +65,21 @@ class InspIRCd;
  * and use the InspSocket constructors to establish connections
  * and bindings.
  */
-class InspSocket : public Extensible
+class CoreExport InspSocket : public EventHandler
 {
  public:
+
+       std::string cbindip;
+
+       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
@@ -78,30 +99,11 @@ class InspSocket : public Extensible
         */
        InspSocketState state;
 
-       /**
-        * The host being connected to,
-        * in sockaddr form
-        */
-        insp_sockaddr addr;
-
-       /** 
-        * The host being connected to,
-        * in in_addr form
-        */
-        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.
         */
-        bool timeout;
+       bool timeout;
        
        /**
         * Socket input buffer, used by read(). The class which
@@ -119,18 +121,6 @@ class InspSocket : public Extensible
         */
        char IP[MAXBUF];
 
-       /**
-        * Client sockaddr structure used
-        * by accept()
-        */
-       insp_sockaddr client;
-
-       /**
-        * Server sockaddr structure used
-        * by accept()
-        */
-       insp_sockaddr server;
-
        /**
         * Used by accept() to indicate the
         * sizes of the sockaddr_in structures
@@ -161,7 +151,7 @@ class InspSocket : public Extensible
         */
        bool WaitingForWriteEvent;
 
-       bool BindAddr();
+       bool BindAddr(const std::string &ip);
 
        /**
         * The default constructor does nothing
@@ -189,8 +179,10 @@ class InspSocket : public Extensible
         * @param port The port number to connect to, or bind to
         * @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
+        * @param connectbindip When creating an outbound connection, the IP to bind the connection to. If not defined, the port is not bound.
+        * @return On exit, GetState() returns I_ERROR if an error occured, and errno can be used to read the socket error.
         */
-       InspSocket(InspIRCd* SI, 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, const std::string &connectbindip = "");
 
        /**
         * This method is called when an outbound
@@ -266,14 +258,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.
@@ -360,6 +344,10 @@ class InspSocket : public Extensible
         * memory reclaimed.
         */
        void MarkAsClosed();
+
+       void HandleEvent(EventType et, int errornum = 0);
+
+       bool Readable();
 };
 
 #endif