#include <sstream>
#include <string>
#include <deque>
-#include "inspircd_config.h"
#include "dns.h"
+#include "inspircd_config.h"
#include "socket.h"
+#include "inspsocket.h"
+#include "timer.h"
/**
* States which a socket may be in
*/
-enum InspSocketState { I_DISCONNECTED, I_RESOLVING, I_CONNECTING, I_CONNECTED, I_LISTENING, I_ERROR };
+enum InspSocketState { I_DISCONNECTED, I_CONNECTING, I_CONNECTED, I_LISTENING, I_ERROR };
/**
* 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;
+
+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
+class InspSocket : public EventHandler
{
-private:
+ public:
+ InspIRCd* Instance;
- std::deque<std::string> outbuffer;
+ SocketTimeout* Timeout;
- /**
- * The file descriptor of this socket
- */
- int fd;
+ unsigned long timeout_val;
- /**
- * The resolver for this socket
- */
- DNS dns;
+ 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.
*/
bool ClosePending;
-public:
+ /** Set to true when we're waiting for a write event.
+ * If this is true and a write event comes in, we
+ * call the write instead of the read method.
+ */
+ bool WaitingForWriteEvent;
+
+ bool BindAddr();
/**
* 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, char* ip);
+ InspSocket(InspIRCd* SI, int newfd, const char* ip);
/**
* This constructor is used to create a new
* socket, either listening for connections, or an outbound connection to another host.
- * Note that if you specify a hostname in the 'host' parameter, then there will be an extra
- * step involved (a nonblocking DNS lookup) which will cause your connection to be established
- * slower than if it was an IP. Therefore, use an IP address where it is available instead.
- * @param host The hostname to connect to, or bind to
+ * Note that if you specify a hostname in the 'ipaddr' parameter, this class will not
+ * connect. You must resolve your hostnames before passing them to InspSocket. To do so,
+ * you should use the nonblocking class 'Resolver'.
+ * @param ipaddr The IP to connect to, or bind to
* @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
*/
- InspSocket(const std::string &host, 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
*/
virtual bool OnDataReady();
+ virtual bool OnWriteReady();
+
/**
* When an outbound connection fails, and the
* attempt times out, you will receive this event.
*/
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.
*/
void SetState(InspSocketState s);
+ /**
+ * Call this to receive the next write event
+ * that comes along for this fd to the OnWriteReady
+ * method.
+ */
+ void WantWrite();
+
/**
* Returns the current socket state.
*/
*/
virtual ~InspSocket();
- /**
- * This method attempts to resolve the hostname,
- * if a hostname is given and not an IP,
- * before a connection can occur. This method is
- * asyncronous.
- */
- virtual bool DoResolve();
-
/**
* This method attempts to connect to a hostname.
* This only occurs on a non-listening socket. This
* memory reclaimed.
*/
void MarkAsClosed();
+
+ void HandleEvent(EventType et);
+
+ bool Readable();
};
#endif