From 33318dd6fbc2fa38ccf16ca90a95666f28d860b3 Mon Sep 17 00:00:00 2001
From: danieldg
Date: Fri, 15 Jan 2010 19:46:01 +0000
Subject: Add CAPAB CHANMODES, CAPAB USERMODES to verify matching of modes by
 name, not just by letter

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12262 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_spanningtree/treesocket1.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/modules/m_spanningtree/treesocket1.cpp')

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index c96bf3bc9..71cca66c4 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -35,7 +35,8 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, in
 {
 	age = ServerInstance->Time();
 	myhost = ServerName;
-	capab_phase = 0;
+	capab = new CapabData;
+	capab->capab_phase = 0;
 	proto_version = 0;
 	LinkState = CONNECTING;
 	if (!hook.empty())
@@ -60,10 +61,11 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, in
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 	: BufferedSocket(newfd), Utils(Util)
 {
+	capab = new CapabData;
 	IP = client->addr();
 	age = ServerInstance->Time();
 	LinkState = WAIT_AUTH_1;
-	capab_phase = 0;
+	capab->capab_phase = 0;
 	proto_version = 0;
 	myhost = "inbound from " + IP;
 
@@ -82,12 +84,8 @@ ServerState TreeSocket::GetLinkState()
 
 void TreeSocket::CleanNegotiationInfo()
 {
-	ModuleList.clear();
-	OptModuleList.clear();
-	CapKeys.clear();
-	ourchallenge.clear();
-	theirchallenge.clear();
-	OutboundPass.clear();
+	delete capab;
+	capab = NULL;
 }
 
 CullResult TreeSocket::cull()
@@ -100,6 +98,8 @@ CullResult TreeSocket::cull()
 
 TreeSocket::~TreeSocket()
 {
+	if (capab)
+		delete capab;
 }
 
 /** When an outbound connection finishes connecting, we receive
@@ -119,7 +119,7 @@ void TreeSocket::OnConnected()
 			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()));
-				this->OutboundPass = x->SendPass;
+				capab->OutboundPass = x->SendPass;
 				this->SendCapabilities(1);
 				return;
 			}
-- 
cgit v1.3.1-10-gc9f91