Fix error message on OPTCOMMON mismatch

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket1.cpp

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index e05c099670b8e50e73af4c1cf6da97438225dca7..ea87c615fb9a989bd32f743269d662d06b8db6fc 100644 (file)
--- 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;
                        }
@@ -143,6 +143,8 @@ void TreeSocket::OnError(BufferedSocketError e)
 void TreeSocket::SendError(const std::string &errormessage)
 {
        WriteLine("ERROR :"+errormessage);
+       DoWrite();
+       LinkState = DYING;
        SetError(errormessage);
 }
 
@@ -218,20 +220,22 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 void TreeSocket::OnDataReady()
 {
        Utils->Creator->loopCall = true;
-       /* While there is at least one new line in the buffer,
-        * do something useful (we hope!) with it.
-        */
-       while (recvq.find("\n") != std::string::npos)
+       std::string line;
+       while (GetNextLine(line))
        {
-               std::string ret = recvq.substr(0,recvq.find("\n")-1);
-               recvq = recvq.substr(recvq.find("\n")+1,recvq.length()-recvq.find("\n"));
-               /* Use rfind here not find, as theres more
-                * chance of the \r being near the end of the
-                * string, not the start.
-                */
-               if (ret.find("\r") != std::string::npos)
-                       ret = recvq.substr(0,recvq.find("\r")-1);
-               ProcessLine(ret);
+               std::string::size_type rline = line.find('\r');
+               if (rline != std::string::npos)
+                       line = line.substr(0,rline);
+               if (line.find('\0') != std::string::npos)
+               {
+                       SendError("Read null character from socket");
+                       break;
+               }
+               ProcessLine(line);
+               if (!getError().empty())
+                       break;
        }
+       if (LinkState != CONNECTED && recvq.length() > 4096)
+               SendError("RecvQ overrun (line too long)");
        Utils->Creator->loopCall = false;
 }