X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=31d0ec449e1bc9fde06e726c800bafe21e7c9447;hb=553b17b542831cfe8063209f46326057f50a6fbd;hp=5e30ced35b7413620262d2bc5bcc91d27a799b87;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 5e30ced35..31d0ec449 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -31,16 +31,16 @@
 
 /* $ModDep: m_spanningtree/cachetimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */
 
-ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
-	: Module(Me), max_local(0), max_global(0)
+ModuleSpanningTree::ModuleSpanningTree()
+	: max_local(0), max_global(0)
 {
 	ServerInstance->Modules->UseInterface("BufferedSocketHook");
-	Utils = new SpanningTreeUtilities(ServerInstance, this);
-	command_rconnect = new CommandRConnect(ServerInstance, this, Utils);
+	Utils = new SpanningTreeUtilities(this);
+	command_rconnect = new CommandRConnect(this, Utils);
 	ServerInstance->AddCommand(command_rconnect);
-	command_rsquit = new CommandRSQuit(ServerInstance, this, Utils);
+	command_rsquit = new CommandRSQuit(this, Utils);
 	ServerInstance->AddCommand(command_rsquit);
-	RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
+	RefreshTimer = new CacheRefreshTimer(Utils);
 	ServerInstance->Timers->AddTimer(RefreshTimer);
 
 	Implementation eventlist[] =
@@ -55,7 +55,7 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
 	ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 	delete ServerInstance->PI;
-	ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance);
+	ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils);
 	loopCall = false;
 
 	// update our local user count
@@ -244,13 +244,13 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
 	}
 }
 
-void ModuleSpanningTree::ConnectServer(Link* x)
+void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 {
 	bool ipvalid = true;
 
 	if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
 	{
-		this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
+		ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
 		return;
 	}
 
@@ -275,17 +275,16 @@ void ModuleSpanningTree::ConnectServer(Link* x)
 		/* Gave a hook, but it wasnt one we know */
 		if ((!x->Hook.empty()) && (Utils->hooks.find(x->Hook.c_str()) == Utils->hooks.end()))
 			return;
-		TreeSocket* newsocket = new TreeSocket(Utils, ServerInstance, x->IPAddr,x->Port, x->Timeout ? x->Timeout : 10,x->Name.c_str(), x->Bind, x->Hook.empty() ? NULL : Utils->hooks[x->Hook.c_str()]);
+		TreeSocket* newsocket = new TreeSocket(Utils, x->IPAddr,x->Port, x->Timeout ? x->Timeout : 10,x->Name.c_str(), x->Bind, y, x->Hook.empty() ? NULL : Utils->hooks[x->Hook.c_str()]);
 		if (newsocket->GetFd() > -1)
 		{
 			/* Handled automatically on success */
 		}
 		else
 		{
-			this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
-			if (ServerInstance->SocketCull.find(newsocket) == ServerInstance->SocketCull.end())
-				ServerInstance->SocketCull[newsocket] = newsocket;
-			Utils->DoFailOver(x);
+			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+			ServerInstance->GlobalCulls.AddItem(newsocket);
+			Utils->DoFailOver(y);
 		}
 	}
 	else
@@ -293,25 +292,26 @@ void ModuleSpanningTree::ConnectServer(Link* x)
 		try
 		{
 			bool cached;
-			ServernameResolver* snr = new ServernameResolver((Module*)this, Utils, ServerInstance,x->IPAddr, *x, cached, start_type);
+			ServernameResolver* snr = new ServernameResolver((Module*)this, Utils, x->IPAddr, *x, cached, start_type, y);
 			ServerInstance->AddResolver(snr, cached);
 		}
 		catch (ModuleException& e)
 		{
-			this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
-			Utils->DoFailOver(x);
+			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
+			Utils->DoFailOver(y);
 		}
 	}
 }
 
 void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 {
-	for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+	for (std::vector<Autoconnect>::iterator x = Utils->AutoconnectBlocks.begin(); x < Utils->AutoconnectBlocks.end(); ++x)
 	{
-		if ((x->AutoConnect) && (curtime >= x->NextConnectTime))
+		if (curtime >= x->NextConnectTime)
 		{
-			x->NextConnectTime = curtime + x->AutoConnect;
-			TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
+			x->NextConnectTime = curtime + x->Period;
+			TreeServer* CheckDupe = Utils->FindServer(x->Server.c_str());
+			Link* y = Utils->FindLink(x->Server);
 			if (x->FailOver.length())
 			{
 				TreeServer* CheckFailOver = Utils->FindServer(x->FailOver.c_str());
@@ -327,8 +327,8 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 			if (!CheckDupe)
 			{
 				// an autoconnected server is not connected. Check if its time to connect it
-				ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
-				this->ConnectServer(&(*x));
+				ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",y->Name.c_str(),x->Period);
+				this->ConnectServer(&(*y), &(*x));
 			}
 		}
 	}
@@ -336,7 +336,7 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 
 void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
 {
-	std::vector<Link*> failovers;
+	std::vector<Autoconnect*> failovers;
 	for (std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); i++)
 	{
 		TreeSocket* s = i->first;
@@ -344,15 +344,13 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
 		if (curtime > s->age + p.second)
 		{
 			ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second);
+			failovers.push_back(s->myautoconnect);
 			ServerInstance->SE->DelFd(s);
 			s->Close();
-			Link* MyLink = Utils->FindLink(p.first);
-			if (MyLink)
-				failovers.push_back(MyLink);
 		}
 	}
 	/* Trigger failover for each timed out socket */
-	for (std::vector<Link*>::const_iterator n = failovers.begin(); n != failovers.end(); ++n)
+	for (std::vector<Autoconnect*>::const_iterator n = failovers.begin(); n != failovers.end(); ++n)
 	{
 		Utils->DoFailOver(*n);
 	}
@@ -411,7 +409,7 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
 			if (!CheckDupe)
 			{
 				RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
-				ConnectServer(&(*x));
+				ConnectServer(&(*x), NULL);
 				return MOD_RES_DENY;
 			}
 			else
@@ -600,19 +598,19 @@ void ModuleSpanningTree::OnUserConnect(User* user)
 	Utils->TreeRoot->SetUserCount(1); // increment by 1
 }
 
-void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
+void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
 {
 	// Only do this for local users
-	if (IS_LOCAL(user))
+	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(channel->name);
-		params.push_back(ConvToStr(channel->age));
-		params.push_back(std::string("+") + channel->ChanModes(true));
-		params.push_back(ServerInstance->Modes->ModeString(user, channel, false)+","+std::string(user->uuid));
+		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);
 	}
 }
@@ -650,15 +648,15 @@ void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
 	Utils->DoOneToMany(user->uuid,"FIDENT",params);
 }
 
-void ModuleSpanningTree::OnUserPart(User* user, Channel* channel,  std::string &partmessage, bool &silent)
+void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
 {
-	if (IS_LOCAL(user))
+	if (IS_LOCAL(memb->user))
 	{
 		parameterlist params;
-		params.push_back(channel->name);
+		params.push_back(memb->chan->name);
 		if (!partmessage.empty())
 			params.push_back(":"+partmessage);
-		Utils->DoOneToMany(user->uuid,"PART",params);
+		Utils->DoOneToMany(memb->user->uuid,"PART",params);
 	}
 }
 
@@ -710,11 +708,11 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 	}
 }
 
-void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
+void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
 {
 	parameterlist params;
-	params.push_back(chan->name);
-	params.push_back(user->uuid);
+	params.push_back(memb->chan->name);
+	params.push_back(memb->user->uuid);
 	params.push_back(":"+reason);
 	if (IS_LOCAL(source))
 	{
@@ -932,17 +930,6 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
 		s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
 }
 
-std::string ModuleSpanningTree::ProtoTranslate(Extensible* item)
-{
-	User* u = dynamic_cast<User*>(item);
-	Channel* c = dynamic_cast<Channel*>(item);
-	if (u)
-		return u->uuid;
-	if (c)
-		return c->name;
-	return "*";
-}
-
 void ModuleSpanningTree::OnEvent(Event* event)
 {
 	if ((event->GetEventID() == "send_encap") || (event->GetEventID() == "send_metadata") || (event->GetEventID() == "send_topic") || (event->GetEventID() == "send_mode") || (event->GetEventID() == "send_mode_explicit") || (event->GetEventID() == "send_opers")
@@ -955,7 +942,7 @@ void ModuleSpanningTree::OnEvent(Event* event)
 ModuleSpanningTree::~ModuleSpanningTree()
 {
 	delete ServerInstance->PI;
-	ServerInstance->PI = new ProtocolInterface(ServerInstance);
+	ServerInstance->PI = new ProtocolInterface;
 
 	/* This will also free the listeners */
 	delete Utils;
@@ -970,7 +957,7 @@ ModuleSpanningTree::~ModuleSpanningTree()
 
 Version ModuleSpanningTree::GetVersion()
 {
-	return Version("$Id$", VF_VENDOR, API_VERSION);
+	return Version("Allows servers to be linked", VF_VENDOR);
 }
 
 /* It is IMPORTANT that m_spanningtree is the last module in the chain