From: Attila Molnar <attilamolnar@hush.com>
Date: Thu, 3 Jul 2014 10:42:36 +0000 (+0200)
Subject: m_spanningtree Replace manual string building of outgoing commands with CmdBuilder... 
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=1d020d132ff6d05ffd865d025cf161d7637f10d8;p=user%2Fhenk%2Fcode%2Finspircd.git

m_spanningtree Replace manual string building of outgoing commands with CmdBuilder where possible
---

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 9a924fea9..e10781198 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -189,7 +189,7 @@ restart:
 			{
 				// They did, send a ping to them
 				s->SetNextPingTime(curtime + Utils->PingFreq);
-				s->GetSocket()->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID());
+				s->GetSocket()->WriteLine(CmdBuilder("PING").push(s->GetID()));
 				s->LastPingMsec = ts;
 			}
 			else
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index ed2bd0756..f96e47d60 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -107,7 +107,7 @@ void TreeSocket::DoBurst(TreeServer* s)
 		capab->auth_fingerprint ? "SSL Fingerprint and " : "",
 		capab->auth_challenge ? "challenge-response" : "plaintext password");
 	this->CleanNegotiationInfo();
-	this->WriteLine(":" + ServerInstance->Config->GetSID() + " BURST " + ConvToStr(ServerInstance->Time()));
+	this->WriteLine(CmdBuilder("BURST").push_int(ServerInstance->Time()));
 	/* Send server tree */
 	this->SendServers(Utils->TreeRoot, s);
 
@@ -121,7 +121,7 @@ void TreeSocket::DoBurst(TreeServer* s)
 
 	this->SendXLines();
 	FOREACH_MOD(OnSyncNetwork, (bs.server));
-	this->WriteLine(":" + ServerInstance->Config->GetSID() + " ENDBURST");
+	this->WriteLine(CmdBuilder("ENDBURST"));
 	ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
 }
 
diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 935ccd6bd..e6bcb21b2 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -128,7 +128,7 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
 		 * so other servers don't need to see the SAVE
 		 */
 		TreeSocket* sock = server->GetSocket();
-		sock->WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
+		sock->WriteLine(CmdBuilder("SAVE").push(remoteuid).push_int(remotets));
 
 		if (remote)
 		{