Add a module which implements the HAProxy PROXY v2 protocol.

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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 95f29ff11bf6f235f4f553d982bc2ec3f046c789..5bdbfd6524ec5bc395880b99dd4f9a147d078ebd 100644 (file)
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -88,13 +88,17 @@ class CoreExport SocketTimeout : public Timer
         * @param fd File descriptor of BufferedSocket
         * @param thesock BufferedSocket to attach to
         * @param secs_from_now Seconds from now to time out
-        * @param now The current time
         */
-       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;
 };
 
 /**
@@ -293,6 +297,12 @@ class CoreExport StreamSocket : public EventHandler
        /** 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.
+        */
+       virtual void OnSetEndPoint(const irc::sockets::sockaddrs& server, const irc::sockets::sockaddrs& remote) { }
+
        /** Send the given data out the socket, either now or when writes unblock
         */
        void WriteData(const std::string& data);
@@ -312,7 +322,7 @@ class CoreExport StreamSocket : public EventHandler
         */
        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
@@ -362,7 +372,7 @@ class CoreExport BufferedSocket : public StreamSocket
         * @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.
@@ -372,7 +382,7 @@ class CoreExport BufferedSocket : public StreamSocket
        /** 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
@@ -388,8 +398,8 @@ class CoreExport BufferedSocket : public StreamSocket
        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; }