X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspsocket.h;h=a41c3ebc733e666c08ccdf0c4c873c88c99b5236;hb=05756b842f26c647e527ec186c192c8cf448113f;hp=e432f9c16c130600ede422b4e7dbb41fc38cf3cf;hpb=d62c870ffb1bf02e4be65183f3ae4bbe2229fbb2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/inspsocket.h b/include/inspsocket.h index e432f9c16..a41c3ebc7 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -312,8 +312,9 @@ class CoreExport StreamSocket : public EventHandler /** 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 void OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc::sockets::sockaddrs& remote) { } + 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 */ @@ -379,12 +380,11 @@ class CoreExport BufferedSocket : public StreamSocket * This will create a socket, register with socket engine, and start the asynchronous * connection process. If an error is detected at this point (such as out of file descriptors), * OnError will be called; otherwise, the state will become CONNECTING. - * @param ipaddr Address to connect to - * @param aport Port to connect on + * @param dest Remote endpoint to connect to. + * @param bind Local endpoint to connect from. * @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 int maxtime, const std::string& connectbindip); + void DoConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int maxtime); /** This method is called when an outbound connection on your socket is * completed. @@ -411,7 +411,6 @@ class CoreExport BufferedSocket : public StreamSocket protected: void OnEventHandlerWrite() CXX11_OVERRIDE; 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; }