* @param thesock BufferedSocket to attach to
* @param secs_from_now Seconds from now to time out
*/
- SocketTimeout(int fd, BufferedSocket* thesock, long secs_from_now) : Timer(secs_from_now), sock(thesock), sfd(fd) { }
+ SocketTimeout(int fd, BufferedSocket* thesock, unsigned int secs_from_now)
+ : Timer(secs_from_now)
+ , sock(thesock)
+ , sfd(fd)
+ {
+ }
/** Handle tick event
*/
- virtual bool Tick(time_t now);
+ bool Tick(time_t now) CXX11_OVERRIDE;
};
/**
size_t nbytes;
};
+ /** The type of socket this IOHook represents. */
+ enum Type
+ {
+ SS_UNKNOWN,
+ SS_USER
+ };
+
private:
/** The IOHook that handles raw I/O for this socket, or NULL */
IOHook* iohook;
protected:
std::string recvq;
public:
- StreamSocket() : iohook(NULL) { }
+ const Type type;
+ StreamSocket(Type sstype = SS_UNKNOWN)
+ : iohook(NULL)
+ , type(sstype)
+ {
+ }
IOHook* GetIOHook() const;
void AddIOHook(IOHook* hook);
void DelIOHook();
/** Called when the socket gets an error from socket engine or IO hook */
virtual void OnError(BufferedSocketError e) = 0;
+ /** Called when the endpoint addresses are changed.
+ * @param local The new local endpoint.
+ * @param remote The new remote endpoint.
+ * @return true if the connection is still open, false if it has been closed
+ */
+ virtual bool OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc::sockets::sockaddrs& remote);
+
/** Send the given data out the socket, either now or when writes unblock
*/
void WriteData(const std::string& data);
*/
virtual void Close();
/** This ensures that close is called prior to destructor */
- virtual CullResult cull() CXX11_OVERRIDE;
+ CullResult cull() CXX11_OVERRIDE;
/** Get the IOHook of a module attached to this socket
* @param mod Module whose IOHook to return
* @param maxtime Time to wait for connection
* @param connectbindip Address to bind to (if NULL, no bind will be done)
*/
- void DoConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip);
+ void DoConnect(const std::string& ipaddr, int aport, unsigned int maxtime, const std::string& connectbindip);
/** This method is called when an outbound connection on your socket is
* completed.
/** When there is data waiting to be read on a socket, the OnDataReady()
* method is called.
*/
- virtual void OnDataReady() CXX11_OVERRIDE = 0;
+ void OnDataReady() CXX11_OVERRIDE = 0;
/**
* When an outbound connection fails, and the attempt times out, you
virtual ~BufferedSocket();
protected:
void OnEventHandlerWrite() CXX11_OVERRIDE;
- BufferedSocketError BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout);
- BufferedSocketError BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip);
+ BufferedSocketError BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int timeout);
+ BufferedSocketError BeginConnect(const std::string& ipaddr, int aport, unsigned int maxtime, const std::string& connectbindip);
};
inline IOHook* StreamSocket::GetIOHook() const { return iohook; }