Fixes for tokenization oddness with metadata, and weird behaviour of std::istringstream where the .str() method returns the whole string from the start to end, even AFTER youve read elements from it!

Use irc::tokenstream instead and add some overridden methods to it. This is smarter as it reuses code and allows us to format metadata the same way we format irc data.
NOTE: If you run any old servers alongside new servers (this revision) you might see spurious colons on the start of reasons for svsholds, cbans and filters. These can safely be ignored)


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7283 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 8 insertions, 9 deletions

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 04a99674d..3b6c4eccd 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -202,20 +202,19 @@ class ModuleCBan : public Module
 	std::string EncodeCBan(const CBan &ban)
 	{
 		std::ostringstream stream;	
-		stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason;
-		return stream.str();	
+		stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " :" << ban.reason;
+		return stream.str();
 	}
 
 	CBan DecodeCBan(const std::string &data)
 	{
 		CBan res;
-		std::istringstream stream(data);
-		stream >> res.chname;
-		stream >> res.set_by;
-		stream >> res.set_on;
-		stream >> res.length;
-		res.reason = stream.str();
-	
+		irc::tokenstream tokens(data);
+		tokens.GetToken(res.chname);
+		tokens.GetToken(res.set_by);
+		tokens.GetToken(res.set_on);
+		tokens.GetToken(res.length);
+		tokens.GetToken(res.reason);
 		return res;
 	}