X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=e10781198dca3f080887f9898dd542ccb910c16b;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=0dc680ca0e32f9dfbddc95628650ab9152d3dea5;hpb=a8b146419b2aae36da25b7202292528efd3158a9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0dc680ca0..e10781198 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -33,11 +33,14 @@
 #include "link.h"
 #include "treesocket.h"
 #include "commands.h"
-#include "protocolinterface.h"
 
 ModuleSpanningTree::ModuleSpanningTree()
 	: rconnect(this), rsquit(this), map(this)
-	, commands(NULL), DNS(this, "DNS")
+	, commands(NULL)
+	, currmembid(0)
+	, DNS(this, "DNS")
+	, loopCall(false)
+	, SplitInProgress(false)
 {
 }
 
@@ -47,8 +50,8 @@ SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
 	fmode(module), ftopic(module), fhost(module), fident(module), fname(module),
 	away(module), addline(module), delline(module), encap(module), idle(module),
 	nick(module), ping(module), pong(module), push(module), save(module),
-	server(module), squit(module), snonotice(module), version(module),
-	burst(module), endburst(module)
+	server(module), squit(module), snonotice(module),
+	burst(module), endburst(module), sinfo(module)
 {
 }
 
@@ -61,27 +64,34 @@ namespace
 		for (LocalUserList::const_iterator i = list.begin(); i != list.end(); ++i)
 			(*i)->server = newserver;
 	}
+
+	void ResetMembershipIds()
+	{
+		// Set all membership ids to 0
+		const LocalUserList& list = ServerInstance->Users->local_users;
+		for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
+		{
+			LocalUser* user = *i;
+			for (UCListIter j = user->chans.begin(); j != user->chans.end(); ++j)
+				(*j)->id = 0;
+		}
+	}
 }
 
 void ModuleSpanningTree::init()
 {
 	ServerInstance->SNO->EnableSnomask('l', "LINK");
 
+	ResetMembershipIds();
+
 	Utils = new SpanningTreeUtilities(this);
 	Utils->TreeRoot = new TreeServer;
 	commands = new SpanningTreeCommands(this);
 
-	delete ServerInstance->PI;
-	ServerInstance->PI = new SpanningTreeProtocolInterface;
+	ServerInstance->PI = &protocolinterface;
 
 	delete ServerInstance->FakeClient->server;
 	SetLocalUsersServer(Utils->TreeRoot);
-
-	loopCall = false;
-	SplitInProgress = false;
-
-	// update our local user count
-	Utils->TreeRoot->UserCount = ServerInstance->Users->local_users.size();
 }
 
 void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
@@ -179,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
@@ -349,7 +359,13 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& para
 			// Pass to default VERSION handler.
 			return MOD_RES_PASSTHRU;
 		}
-		std::string Version = found->GetVersion();
+
+		// If an oper wants to see the version then show the full version string instead of the normal,
+		// but only if it is non-empty.
+		// If it's empty it might be that the server is still syncing (full version hasn't arrived yet)
+		// or the server is a 2.0 server and does not send a full version.
+		bool showfull = ((user->IsOper()) && (!found->GetFullVersion().empty()));
+		const std::string& Version = (showfull ? found->GetFullVersion() : found->GetVersion());
 		user->WriteNumeric(RPL_VERSION, ":%s", Version.c_str());
 	}
 	else
@@ -415,6 +431,7 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel,
 		CmdBuilder params(source, "INVITE");
 		params.push_back(dest->uuid);
 		params.push_back(channel->name);
+		params.push_int(channel->age);
 		params.push_back(ConvToStr(expiry));
 		params.Broadcast();
 	}
@@ -494,19 +511,21 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by
 	if (!IS_LOCAL(memb->user))
 		return;
 
+	// Assign the current membership id to the new Membership and increase it
+	memb->id = currmembid++;
+
 	if (created_by_local)
 	{
-		CmdBuilder params("FJOIN");
-		params.push_back(memb->chan->name);
-		params.push_back(ConvToStr(memb->chan->age));
-		params.push_raw(" +").push_raw(memb->chan->ChanModes(true));
-		params.push(memb->modes).push_raw(',').push_raw(memb->user->uuid);
+		CommandFJoin::Builder params(memb->chan);
+		params.add(memb);
+		params.finalize();
 		params.Broadcast();
 	}
 	else
 	{
 		CmdBuilder params(memb->user, "IJOIN");
 		params.push_back(memb->chan->name);
+		params.push_int(memb->id);
 		if (!memb->modes.empty())
 		{
 			params.push_back(ConvToStr(memb->chan->age));
@@ -605,6 +624,9 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 	CmdBuilder params(source, "KICK");
 	params.push_back(memb->chan->name);
 	params.push_back(memb->user->uuid);
+	// If a remote user is being kicked by us then send the membership id in the kick too
+	if (!IS_LOCAL(memb->user))
+		params.push_int(memb->id);
 	params.push_last(reason);
 	params.Broadcast();
 }
@@ -627,6 +649,16 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 
 void ModuleSpanningTree::ReadConfig(ConfigStatus& status)
 {
+	// Did this rehash change the description of this server?
+	const std::string& newdesc = ServerInstance->Config->ServerDesc;
+	if (newdesc != Utils->TreeRoot->GetDesc())
+	{
+		// Broadcast a SINFO desc message to let the network know about the new description. This is the description
+		// string that is sent in the SERVER message initially and shown for example in WHOIS.
+		// We don't need to update the field itself in the Server object - the core does that.
+		CommandSInfo::Builder(Utils->TreeRoot, "desc", newdesc).Broadcast();
+	}
+
 	// Re-read config stuff
 	try
 	{
@@ -737,8 +769,7 @@ CullResult ModuleSpanningTree::cull()
 
 ModuleSpanningTree::~ModuleSpanningTree()
 {
-	delete ServerInstance->PI;
-	ServerInstance->PI = new ProtocolInterface;
+	ServerInstance->PI = &ServerInstance->DefaultProtocolInterface;
 
 	Server* newsrv = new Server(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
 	SetLocalUsersServer(newsrv);