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 e41b53583ed105a0943a96c43261de61c84d6fa0..ea87c615fb9a989bd32f743269d662d06b8db6fc 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -35,31 +35,20 @@ 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())
        {
-               modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook");
-               if (ml)
+               ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, hook);
+               if (!prov)
                {
-                       for(modulelist::iterator i = ml->begin(); i != ml->end(); ++i)
-                       {
-                               std::string name = (**i).ModuleSourceFile;
-                               int a = name.rfind('_');
-                               int b = name.rfind('.');
-                               name = name.substr(a+1, b-a-1);
-                               if (name == hook)
-                               {
-                                       AddIOHook(*i);
-                                       goto found;
-                               }
-                       }
+                       SetError("Could not find hook '" + hook + "' for connection to " + ServerName);
+                       return;
                }
-               SetError("Could not find hook '" + hook + "' for connection to " + ServerName);
-               return;
+               AddIOHook(prov->creator);
        }
-found:
        DoConnect(shost, iport, maxtime, bindto);
        Utils->timeoutlist[this] = std::pair<std::string, int>(ServerName, maxtime);
        SendCapabilities(1);
@@ -72,10 +61,11 @@ found:
 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;
 
@@ -94,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()
@@ -112,6 +98,8 @@ CullResult TreeSocket::cull()
 
 TreeSocket::~TreeSocket()
 {
+       if (capab)
+               delete capab;
 }
 
 /** When an outbound connection finishes connecting, we receive
@@ -131,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;
                        }
@@ -155,6 +143,8 @@ void TreeSocket::OnError(BufferedSocketError e)
 void TreeSocket::SendError(const std::string &errormessage)
 {
        WriteLine("ERROR :"+errormessage);
+       DoWrite();
+       LinkState = DYING;
        SetError(errormessage);
 }
 
@@ -230,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;
 }