X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspsocket.h;h=a41c3ebc733e666c08ccdf0c4c873c88c99b5236;hb=05756b842f26c647e527ec186c192c8cf448113f;hp=d88c350ba966a2fb58d76e8629aca096ad2f3b7f;hpb=0e6b18ff9180fc7794cea53d0566411b9afb0d7e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspsocket.h b/include/inspsocket.h
index d88c350ba..a41c3ebc7 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -219,6 +219,13 @@ class CoreExport StreamSocket : public EventHandler
 		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;
@@ -264,7 +271,12 @@ class CoreExport StreamSocket : public EventHandler
  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();
@@ -300,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
 	 */
@@ -367,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.
@@ -399,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; }