X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=b2967af3bd377bb7789f4f268cc98f598682a2eb;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=63fc9cf6ce97e4f347fbc45ea1498467fc359f73;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 63fc9cf6c..b2967af3b 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -253,7 +253,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				}
 				else if (command == "SINFO")
 				{
-					// :22D SINFO version :InspIRCd-2.2
+					// :22D SINFO version :InspIRCd-3.0
 					//     A     B       C
 					std::string::size_type c = line.find(' ', b + 1);
 					if (c == std::string::npos)
@@ -267,7 +267,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				}
 				else if (command == "SERVER")
 				{
-					// :001 SERVER inspircd.test 002 [<anything> ...] :gecos
+					// :001 SERVER inspircd.test 002 [<anything> ...] :description
 					//     A      B             C
 					std::string::size_type c = line.find(' ', b + 1);
 					if (c == std::string::npos)
@@ -320,7 +320,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 
 namespace
 {
-	bool InsertCurrentChannelTS(std::vector<std::string>& params, unsigned int chanindex = 0, unsigned int pos = 1)
+	bool InsertCurrentChannelTS(CommandBase::Params& params, unsigned int chanindex = 0, unsigned int pos = 1)
 	{
 		Channel* chan = ServerInstance->FindChan(params[chanindex]);
 		if (!chan)
@@ -332,7 +332,7 @@ namespace
 	}
 }
 
-bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector<std::string>& params)
+bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, CommandBase::Params& params)
 {
 	if ((cmd == "METADATA") && (params.size() >= 3) && (params[0][0] == '#'))
 	{
@@ -381,7 +381,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		if ((params.size() != 1) && (params.size() != 3))
 			return false;
 
-		parameterlist p;
+		CommandBase::Params p;
 		p.push_back(cmd.substr(0, 1));
 		p.push_back(params[0]);
 
@@ -424,7 +424,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 	}
 	else if (cmd == "MODENOTICE")
 	{
-		// MODENOTICE is always supported by 2.0 but it's optional in 2.2.
+		// MODENOTICE is always supported by 2.0 but it's optional in 3.0.
 		params.insert(params.begin(), "*");
 		params.insert(params.begin()+1, cmd);
 		cmd = "ENCAP";
@@ -512,11 +512,11 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		irc::tokenstream ts(params.back());
 
 		std::string srcstr;
-		ts.GetToken(srcstr);
+		ts.GetMiddle(srcstr);
 		srcstr.erase(0, 1);
 
 		std::string token;
-		ts.GetToken(token);
+		ts.GetMiddle(token);
 
 		// See if it's a numeric being sent to the target via PUSH
 		unsigned int numeric_number = 0;
@@ -545,10 +545,10 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 			params.push_back(InspIRCd::Format("%03u", numeric_number));
 
 			// Ignore the nickname in the numeric in PUSH
-			ts.GetToken(token);
+			ts.GetMiddle(token);
 
 			// Rest of the tokens are the numeric parameters, add them to NUM
-			while (ts.GetToken(token))
+			while (ts.GetTrailing(token))
 				params.push_back(token);
 		}
 		else if ((token == "PRIVMSG") || (token == "NOTICE"))
@@ -557,7 +557,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 			cmd.swap(token);
 
 			// Check if the PRIVMSG/NOTICE target is a nickname
-			ts.GetToken(token);
+			ts.GetMiddle(token);
 			if (token.c_str()[0] == '#')
 			{
 				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH %s to user %s from 1202 protocol server %s, target \"%s\"", cmd.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), token.c_str());
@@ -565,7 +565,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 			}
 
 			// Replace second parameter with the message
-			ts.GetToken(params[1]);
+			ts.GetTrailing(params[1]);
 		}
 		else
 		{