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

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 0c5f3b3af..a41c3ebc7 100644
--- 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;
 };
 
 /**
@@ -198,6 +202,13 @@ class CoreExport StreamSocket : public EventHandler
 			nbytes = 0;
 		}
 
+		void moveall(SendQueue& other)
+		{
+			nbytes += other.bytes();
+			data.insert(data.end(), other.data.begin(), other.data.end());
+			other.clear();
+		}
+
 	 private:
 	 	/** Private send queue. Note that individual strings may be shared.
 		 */
@@ -208,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;
@@ -240,10 +258,25 @@ class CoreExport StreamSocket : public EventHandler
 	 */
 	int ReadToRecvQ(std::string& rq);
 
+	/** Read data from a hook chain recursively, starting at 'hook'.
+	 * If 'hook' is NULL, the recvq is filled with data from SocketEngine::Recv(), otherwise it is filled with data from the
+	 * next hook in the chain.
+	 * @param hook Next IOHook in the chain, can be NULL
+	 * @param rq Receive queue to put incoming data into
+	 * @return < 0 on error or close, 0 if no new data is ready (but the socket is still connected), > 0 if data was read from
+	 the socket and put into the recvq
+	 */
+	int HookChainRead(IOHook* hook, std::string& rq);
+
  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();
@@ -276,6 +309,13 @@ 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.
+	 * @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);
@@ -286,7 +326,7 @@ class CoreExport StreamSocket : public EventHandler
 	 */
 	bool GetNextLine(std::string& line, char delim = '\n');
 	/** Useful for implementing sendq exceeded */
-	size_t getSendQSize() const { return sendq.size(); }
+	size_t getSendQSize() const;
 
 	SendQueue& GetSendQ() { return sendq; }
 
@@ -295,7 +335,7 @@ class CoreExport StreamSocket : public EventHandler
 	 */
 	virtual void Close();
 	/** This ensures that close is called prior to destructor */
-	virtual CullResult cull();
+	CullResult cull() CXX11_OVERRIDE;
 
 	/** Get the IOHook of a module attached to this socket
 	 * @param mod Module whose IOHook to return
@@ -340,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 long 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.
@@ -355,7 +394,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() = 0;
+	void OnDataReady() CXX11_OVERRIDE = 0;
 
 	/**
 	 * When an outbound connection fails, and the attempt times out, you
@@ -371,10 +410,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);
 };
 
 inline IOHook* StreamSocket::GetIOHook() const { return iohook; }
-inline void StreamSocket::AddIOHook(IOHook* hook) { iohook = hook; }
 inline void StreamSocket::DelIOHook() { iohook = NULL; }