Clean up treesocket naming confusion by adding a link block reference during negotiation

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12452 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 36 insertions, 43 deletions

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 79da951b6..596f31041 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -30,27 +30,30 @@
  * most of the action, and append a few of our own values
  * to it.
  */
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, int iport, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Autoconnect* myac, const std::string& hook)
-	: Utils(Util), IP(shost), myautoconnect(myac)
+TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr)
+	: Utils(Util)
 {
 	age = ServerInstance->Time();
-	myhost = ServerName;
+	linkID = assign(link->Name);
 	capab = new CapabData;
+	capab->link = link;
+	capab->ac = myac;
 	capab->capab_phase = 0;
+	MyRoot = NULL;
 	proto_version = 0;
 	LinkState = CONNECTING;
-	if (!hook.empty())
+	if (!link->Hook.empty())
 	{
-		ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, hook);
+		ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook);
 		if (!prov)
 		{
-			SetError("Could not find hook '" + hook + "' for connection to " + ServerName);
+			SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID);
 			return;
 		}
 		AddIOHook(prov->creator);
 	}
-	DoConnect(shost, iport, maxtime, bindto);
-	Utils->timeoutlist[this] = std::pair<std::string, int>(ServerName, maxtime);
+	DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
+	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
 	SendCapabilities(1);
 }
 
@@ -62,19 +65,19 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via
 	: BufferedSocket(newfd), Utils(Util)
 {
 	capab = new CapabData;
-	IP = client->addr();
+	capab->capab_phase = 0;
+	MyRoot = NULL;
 	age = ServerInstance->Time();
 	LinkState = WAIT_AUTH_1;
-	capab->capab_phase = 0;
 	proto_version = 0;
-	myhost = "inbound from " + IP;
+	linkID = "inbound from " + client->addr();
 
 	FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
 	if (GetIOHook())
 		GetIOHook()->OnStreamSocketAccept(this, client, server);
 	SendCapabilities(1);
 
-	Utils->timeoutlist[this] = std::pair<std::string, int>(myhost, 30);
+	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, 30);
 }
 
 ServerState TreeSocket::GetLinkState()
@@ -84,6 +87,9 @@ ServerState TreeSocket::GetLinkState()
 
 void TreeSocket::CleanNegotiationInfo()
 {
+	// connect is good, reset the autoconnect block (if used)
+	if (capab->ac)
+		capab->ac->position = -1;
 	delete capab;
 	capab = NULL;
 }
@@ -91,8 +97,8 @@ void TreeSocket::CleanNegotiationInfo()
 CullResult TreeSocket::cull()
 {
 	Utils->timeoutlist.erase(this);
-	if (myautoconnect)
-		Utils->Creator->ConnectServer(myautoconnect, false);
+	if (capab && capab->ac)
+		Utils->Creator->ConnectServer(capab->ac, false);
 	return this->BufferedSocket::cull();
 }
 
@@ -112,31 +118,16 @@ void TreeSocket::OnConnected()
 {
 	if (this->LinkState == CONNECTING)
 	{
-		/* we do not need to change state here. */
-		for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); ++i)
-		{
-			Link* x = *i;
-			if (x->Name == this->myhost)
-			{
-				ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", myhost.c_str(), (x->HiddenFromStats ? "<hidden>" : this->IP.c_str()));
-				capab->OutboundPass = x->SendPass;
-				this->SendCapabilities(1);
-				return;
-			}
-		}
+		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(),
+			(capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str()));
+		this->SendCapabilities(1);
 	}
-	/* There is a (remote) chance that between the /CONNECT and the connection
-	 * being accepted, some muppet has removed the <link> block and rehashed.
-	 * If that happens the connection hangs here until it's closed. Unlikely
-	 * and rather harmless.
-	 */
-	ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2 lost link tag(!)", myhost.c_str());
 }
 
 void TreeSocket::OnError(BufferedSocketError e)
 {
 	ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002 failed with error: %s",
-		myhost.c_str(), getError().c_str());
+		linkID.c_str(), getError().c_str());
 	LinkState = DYING;
 }
 
@@ -154,7 +145,7 @@ void TreeSocket::SendError(const std::string &errormessage)
  * is having a REAL bad hair day, this function shouldnt be called
  * too many times a month ;-)
  */
-void TreeSocket::SquitServer(std::string &from, TreeServer* Current)
+void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users)
 {
 	ServerInstance->Logs->Log("m_spanningtree",DEBUG,"SquitServer for %s from %s",
 		Current->GetName().c_str(), from.c_str());
@@ -165,7 +156,7 @@ void TreeSocket::SquitServer(std::string &from, TreeServer* Current)
 	for (unsigned int q = 0; q < Current->ChildCount(); q++)
 	{
 		TreeServer* recursive_server = Current->GetChild(q);
-		this->SquitServer(from,recursive_server);
+		this->SquitServer(from,recursive_server, num_lost_servers, num_lost_users);
 	}
 	/* Now we've whacked the kids, whack self */
 	num_lost_servers++;
@@ -197,19 +188,21 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		{
 			ServerInstance->SNO->WriteGlobalSno('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
 		}
-		num_lost_servers = 0;
-		num_lost_users = 0;
+		int num_lost_servers = 0;
+		int num_lost_users = 0;
 		std::string from = Current->GetParent()->GetName()+" "+Current->GetName();
-		SquitServer(from, Current);
+		SquitServer(from, Current, num_lost_servers, num_lost_users);
+		ServerInstance->SNO->WriteToSnoMask(LocalSquit ? 'l' : 'L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.",
+			num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
 		Current->Tidy();
 		Current->GetParent()->DelChild(Current);
 		Current->cull();
 		delete Current;
-		Current = NULL;
-		if (LocalSquit)
-			ServerInstance->SNO->WriteToSnoMask('l', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.", num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
-		else
-			ServerInstance->SNO->WriteToSnoMask('L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.", num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
+		if (Current == MyRoot)
+		{
+			MyRoot = NULL;
+			Close();
+		}
 	}
 	else
 		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");