X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=029f5e88867eca24aa0715bc715924bf1affb9c6;hb=1638ee61936bc91758be39c3463c6e46d0d655e7;hp=d8385e47d2f77940df752b12296599222ab792fb;hpb=9a1a6e85f8c3c8792083f0a4042aa3cea48eecae;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index d8385e47d..029f5e888 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -47,8 +47,8 @@ ModuleSpanningTree::ModuleSpanningTree()
 SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
 	: rconnect(module, module->Utils), rsquit(module, module->Utils),
 	svsjoin(module), svspart(module), svsnick(module), metadata(module),
-	uid(module), opertype(module), fjoin(module), fmode(module), ftopic(module),
-	fhost(module), fident(module), fname(module)
+	uid(module), opertype(module), fjoin(module), ijoin(module), resync(module),
+	fmode(module), ftopic(module), fhost(module), fident(module), fname(module)
 {
 }
 
@@ -63,12 +63,14 @@ void ModuleSpanningTree::init()
 	ServerInstance->Modules->AddService(commands->uid);
 	ServerInstance->Modules->AddService(commands->opertype);
 	ServerInstance->Modules->AddService(commands->fjoin);
+	ServerInstance->Modules->AddService(commands->ijoin);
+	ServerInstance->Modules->AddService(commands->resync);
 	ServerInstance->Modules->AddService(commands->fmode);
 	ServerInstance->Modules->AddService(commands->ftopic);
 	ServerInstance->Modules->AddService(commands->fhost);
 	ServerInstance->Modules->AddService(commands->fident);
 	ServerInstance->Modules->AddService(commands->fname);
-	RefreshTimer = new CacheRefreshTimer(Utils);
+	RefreshTimer = new CacheRefreshTimer(this, Utils);
 	ServerInstance->Timers->AddTimer(RefreshTimer);
 
 	Implementation eventlist[] =
@@ -83,11 +85,11 @@ void ModuleSpanningTree::init()
 	ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 	delete ServerInstance->PI;
-	ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils);
+	ServerInstance->PI = new SpanningTreeProtocolInterface(Utils);
 	loopCall = false;
 
 	// update our local user count
-	Utils->TreeRoot->SetUserCount(ServerInstance->Users->local_users.size());
+	Utils->TreeRoot->UserCount = ServerInstance->Users->local_users.size();
 }
 
 void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
@@ -101,7 +103,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 	{
 		if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName()))))
 		{
-			if (IS_OPER(user))
+			if (user->IsOper())
 			{
 				 ShowLinks(Current->GetChild(q),user,hops+1);
 			}
@@ -112,16 +114,16 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 		}
 	}
 	/* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
-	if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!IS_OPER(user)))
+	if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!user->IsOper()))
 		return;
 	/* Or if the server is hidden and they're not an oper */
-	else if ((Current->Hidden) && (!IS_OPER(user)))
+	else if ((Current->Hidden) && (!user->IsOper()))
 		return;
 
 	std::string servername = Current->GetName();
 	user->WriteNumeric(364, "%s %s %s :%d %s",	user->nick.c_str(), servername.c_str(),
-			(Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
-			(Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
+			(Utils->FlatLinks && (!user->IsOper())) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
+			(Utils->FlatLinks && (!user->IsOper())) ? 0 : hops,
 			Current->GetDesc().c_str());
 }
 
@@ -145,9 +147,9 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs)
 	secs = secs % 60;
 	mins_up = mins_up % 60;
 	hours_up = hours_up % 24;
-	return ((days_up ? (ConvToStr(days_up) + "d") : std::string(""))
-			+ (hours_up ? (ConvToStr(hours_up) + "h") : std::string(""))
-			+ (mins_up ? (ConvToStr(mins_up) + "m") : std::string(""))
+	return ((days_up ? (ConvToStr(days_up) + "d") : "")
+			+ (hours_up ? (ConvToStr(hours_up) + "h") : "")
+			+ (mins_up ? (ConvToStr(mins_up) + "m") : "")
 			+ ConvToStr(secs) + "s");
 }
 
@@ -194,8 +196,7 @@ restart:
 					// ... if we can find a proper route to them
 					if (tsock)
 					{
-						tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " +
-								ServerInstance->Config->GetSID() + " " + s->GetID());
+						tsock->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID());
 						s->LastPingMsec = ts;
 					}
 				}
@@ -306,7 +307,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 	{
 		try
 		{
-			bool cached;
+			bool cached = false;
 			ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y);
 			ServerInstance->AddResolver(snr, cached);
 		}
@@ -360,12 +361,13 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& para
 	TreeServer* found = Utils->FindServerMask(parameters[0]);
 	if (found)
 	{
-		std::string Version = found->GetVersion();
-		user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
 		if (found == Utils->TreeRoot)
 		{
-			ServerInstance->Config->Send005(user);
+			// Pass to default VERSION handler.
+			return MOD_RES_PASSTHRU;
 		}
+		std::string Version = found->GetVersion();
+		user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
 	}
 	else
 	{
@@ -466,108 +468,45 @@ void ModuleSpanningTree::OnWallops(User* user, const std::string &text)
 	}
 }
 
-void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+void ModuleSpanningTree::LocalMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list, const char* message_type)
 {
-	/* Server origin */
-	if (user == NULL)
+	/* Server or remote origin, dest should always be non-null */
+	if ((!user) || (!IS_LOCAL(user)) || (!dest))
 		return;
 
 	if (target_type == TYPE_USER)
 	{
-		User* d = (User*)dest;
-		if (!IS_LOCAL(d) && IS_LOCAL(user))
+		User* d = (User*) dest;
+		if (!IS_LOCAL(d))
 		{
 			parameterlist params;
 			params.push_back(d->uuid);
 			params.push_back(":"+text);
-			Utils->DoOneToOne(user->uuid,"NOTICE",params,d->server);
+			Utils->DoOneToOne(user->uuid, message_type, params, d->server);
 		}
 	}
 	else if (target_type == TYPE_CHANNEL)
 	{
-		if (IS_LOCAL(user))
-		{
-			Channel *c = (Channel*)dest;
-			if (c)
-			{
-				std::string cname = c->name;
-				if (status)
-					cname = status + cname;
-				TreeServerList list;
-				Utils->GetListOfServersForChannel(c,list,status,exempt_list);
-				for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-				{
-					TreeSocket* Sock = i->second->GetSocket();
-					if (Sock)
-						Sock->WriteLine(":"+std::string(user->uuid)+" NOTICE "+cname+" :"+text);
-				}
-			}
-		}
+		Utils->SendChannelMessage(user->uuid, (Channel*)dest, text, status, exempt_list, message_type);
 	}
 	else if (target_type == TYPE_SERVER)
 	{
-		if (IS_LOCAL(user))
-		{
-			char* target = (char*)dest;
-			parameterlist par;
-			par.push_back(target);
-			par.push_back(":"+text);
-			Utils->DoOneToMany(user->uuid,"NOTICE",par);
-		}
+		char* target = (char*) dest;
+		parameterlist par;
+		par.push_back(target);
+		par.push_back(":"+text);
+		Utils->DoOneToMany(user->uuid, message_type, par);
 	}
 }
 
-void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
 {
-	/* Server origin */
-	if (user == NULL)
-		return;
+	LocalMessage(user, dest, target_type, text, status, exempt_list, "NOTICE");
+}
 
-	if (target_type == TYPE_USER)
-	{
-		// route private messages which are targetted at clients only to the server
-		// which needs to receive them
-		User* d = (User*)dest;
-		if (!IS_LOCAL(d) && (IS_LOCAL(user)))
-		{
-			parameterlist params;
-			params.push_back(d->uuid);
-			params.push_back(":"+text);
-			Utils->DoOneToOne(user->uuid,"PRIVMSG",params,d->server);
-		}
-	}
-	else if (target_type == TYPE_CHANNEL)
-	{
-		if (IS_LOCAL(user))
-		{
-			Channel *c = (Channel*)dest;
-			if (c)
-			{
-				std::string cname = c->name;
-				if (status)
-					cname = status + cname;
-				TreeServerList list;
-				Utils->GetListOfServersForChannel(c,list,status,exempt_list);
-				for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-				{
-					TreeSocket* Sock = i->second->GetSocket();
-					if (Sock)
-						Sock->WriteLine(":"+std::string(user->uuid)+" PRIVMSG "+cname+" :"+text);
-				}
-			}
-		}
-	}
-	else if (target_type == TYPE_SERVER)
-	{
-		if (IS_LOCAL(user))
-		{
-			char* target = (char*)dest;
-			parameterlist par;
-			par.push_back(target);
-			par.push_back(":"+text);
-			Utils->DoOneToMany(user->uuid,"PRIVMSG",par);
-		}
-	}
+void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+{
+	LocalMessage(user, dest, target_type, text, status, exempt_list, "PRIVMSG");
 }
 
 void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
@@ -592,10 +531,10 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 	params.push_back(user->GetIPString());
 	params.push_back(ConvToStr(user->signon));
 	params.push_back("+"+std::string(user->FormatModes(true)));
-	params.push_back(":"+std::string(user->fullname));
+	params.push_back(":"+user->fullname);
 	Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
 
-	if (IS_OPER(user))
+	if (user->IsOper())
 	{
 		params.clear();
 		params.push_back(user->oper->name);
@@ -610,23 +549,32 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 			ServerInstance->PI->SendMetaData(user, item->name, value);
 	}
 
-	Utils->TreeRoot->SetUserCount(1); // increment by 1
+	Utils->TreeRoot->UserCount++;
 }
 
-void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by_local, CUList& excepts)
 {
 	// Only do this for local users
 	if (IS_LOCAL(memb->user))
 	{
 		parameterlist params;
-		// set up their permissions and the channel TS with FJOIN.
-		// All users are FJOINed now, because a module may specify
-		// new joining permissions for the user.
 		params.push_back(memb->chan->name);
-		params.push_back(ConvToStr(memb->chan->age));
-		params.push_back(std::string("+") + memb->chan->ChanModes(true));
-		params.push_back(memb->modes+","+std::string(memb->user->uuid));
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
+		if (created_by_local)
+		{
+			params.push_back(ConvToStr(memb->chan->age));
+			params.push_back(std::string("+") + memb->chan->ChanModes(true));
+			params.push_back(memb->modes+","+memb->user->uuid);
+			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
+		}
+		else
+		{
+			if (!memb->modes.empty())
+			{
+				params.push_back(ConvToStr(memb->chan->age));
+				params.push_back(memb->modes);
+			}
+			Utils->DoOneToMany(memb->user->uuid, "IJOIN", params);
+		}
 	}
 }
 
@@ -693,7 +641,7 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const
 	TreeServer* SourceServer = Utils->FindServer(user->server);
 	if (SourceServer)
 	{
-		SourceServer->SetUserCount(-1); // decrement by 1
+		SourceServer->UserCount--;
 	}
 }
 
@@ -754,7 +702,10 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
-	ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str());
+	if (loopCall)
+		return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one
+
+	ServerInstance->Logs->Log("remoterehash", LOG_DEBUG, "called with param %s", parameter.c_str());
 
 	// Send out to other servers
 	if (!parameter.empty() && parameter[0] != '-')
@@ -833,11 +784,13 @@ void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
 	if (!x->IsBurstable() || loopCall)
 		return;
 
-	char data[MAXBUF];
-	snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
-	ServerInstance->Config->ServerName.c_str(), (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str());
 	parameterlist params;
-	params.push_back(data);
+	params.push_back(x->type);
+	params.push_back(x->Displayable());
+	params.push_back(ServerInstance->Config->ServerName);
+	params.push_back(ConvToStr(x->set_time));
+	params.push_back(ConvToStr(x->duration));
+	params.push_back(":" + x->reason);
 
 	if (!user)
 	{
@@ -856,10 +809,9 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
 	if (!x->IsBurstable() || loopCall)
 		return;
 
-	char data[MAXBUF];
-	snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
 	parameterlist params;
-	params.push_back(data);
+	params.push_back(x->type);
+	params.push_back(x->Displayable());
 
 	if (!user)
 	{
@@ -878,7 +830,6 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p
 	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
 	{
 		parameterlist params;
-		std::string command;
 		std::string output_text;
 
 		ServerInstance->Parser->TranslateUIDs(translate, text, output_text);
@@ -888,7 +839,7 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p
 			User* u = (User*)dest;
 			params.push_back(u->uuid);
 			params.push_back(output_text);
-			command = "MODE";
+			Utils->DoOneToMany(user->uuid, "MODE", params);
 		}
 		else
 		{
@@ -896,10 +847,8 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const p
 			params.push_back(c->name);
 			params.push_back(ConvToStr(c->age));
 			params.push_back(output_text);
-			command = "FMODE";
+			Utils->DoOneToMany(user->uuid, "FMODE", params);
 		}
-
-		Utils->DoOneToMany(user->uuid, command, params);
 	}
 }
 
@@ -907,18 +856,13 @@ ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
 	if (IS_LOCAL(user))
 	{
-		if (awaymsg.empty())
-		{
-			parameterlist params;
-			Utils->DoOneToMany(user->uuid,"AWAY",params);
-		}
-		else
+		parameterlist params;
+		if (!awaymsg.empty())
 		{
-			parameterlist params;
 			params.push_back(ConvToStr(user->awaytime));
 			params.push_back(":" + awaymsg);
-			Utils->DoOneToMany(user->uuid,"AWAY",params);
 		}
+		Utils->DoOneToMany(user->uuid, "AWAY", params);
 	}
 
 	return MOD_RES_PASSTHRU;
@@ -936,12 +880,12 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type
 		if (target_type == TYPE_USER)
 		{
 			User* u = (User*)target;
-			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
+			s->WriteLine(":"+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
 			Channel* c = (Channel*)target;
-			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
+			s->WriteLine(":"+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
 		}
 	}
 }
@@ -952,17 +896,18 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
 	User* u = dynamic_cast<User*>(target);
 	Channel* c = dynamic_cast<Channel*>(target);
 	if (u)
-		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
+		s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
 	else if (c)
-		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
+		s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+ConvToStr(c->age)+" "+extname+" :"+extdata);
 	else if (!target)
-		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
+		s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
 }
 
 CullResult ModuleSpanningTree::cull()
 {
 	Utils->cull();
 	ServerInstance->Timers->DelTimer(RefreshTimer);
+	delete RefreshTimer;
 	return this->Module::cull();
 }