Implement support for the extended tag space for client tags.

2 files changed, 7 insertions, 1 deletions

diff --git a/include/hashcomp.h b/include/hashcomp.h
index f0e092729..80c02332d 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -197,7 +197,10 @@ namespace irc
 
 	 public:
 		/** Create a tokenstream and fill it with the provided data. */
-		tokenstream(const std::string& msg, size_t start = 0);
+		tokenstream(const std::string& msg, size_t start = 0, size_t end = std::string::npos);
+
+		/** Retrieves the underlying message. */
+		std::string& GetMessage() { return message; }
 
 		/** Retrieve the next \<middle> token in the token stream.
 		 * @param token The next token available, or an empty string if none remain.
diff --git a/include/users.h b/include/users.h
index eaf400c67..3937f74aa 100644
--- a/include/users.h
+++ b/include/users.h
@@ -681,10 +681,13 @@ class CoreExport User : public Extensible
 
 class CoreExport UserIOHandler : public StreamSocket
 {
+ private:
+	 size_t checked_until;
  public:
 	LocalUser* const user;
 	UserIOHandler(LocalUser* me)
 		: StreamSocket(StreamSocket::SS_USER)
+		, checked_until(0)
 		, user(me)
 	{
 	}