#include "dns.h"
#include "inspircd_config.h"
#include "socket.h"
+#include "inspsocket.h"
+#include "timer.h"
/**
* States which a socket may be in
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;
+
+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
* and use the InspSocket constructors to establish connections
* and bindings.
*/
-class InspSocket : public Extensible
+class InspSocket : public EventHandler
{
public:
+ 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
*/
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.
* The default constructor does nothing
* and should not be used.
*/
- InspSocket();
+ InspSocket(InspIRCd* SI);
/**
* This constructor is used to associate
* 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
* @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
*/
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.
* memory reclaimed.
*/
void MarkAsClosed();
+
+ void HandleEvent(EventType et);
+
+ bool Readable();
};
#endif