]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/treesocket2.cpp
Fix m_chanlog crashing.
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket2.cpp
index 7fbf9b4ad3dfc002caa750381f477a668d057b53..2fc847b0c05ace54f656966ce4a53e7d0609199e 100644 (file)
@@ -50,229 +50,6 @@ bool TreeSocket::Error(std::deque<std::string> &params)
        return false;
 }
 
-/** TODO: This creates a total mess of output and needs to really use irc::modestacker.
- */
-bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string> &params)
-{
-       if (params.size() < 1)
-               return true;
-       Channel* c = Instance->FindChan(params[0]);
-       if (c)
-       {
-               for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
-               {
-                       ModeHandler* mh = Instance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
-                       if (mh)
-                               mh->RemoveMode(c);
-               }
-       }
-       return true;
-}
-
-bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string> &params)
-{
-       if (params.size() < 5)
-       {
-               SendError("Protocol error - Missing SID");
-               return false;
-       }
-
-       std::string servername = params[0];
-       std::string password = params[1];
-       // hopcount is not used for a remote server, we calculate this ourselves
-       std::string sid = params[3];
-       std::string description = params[4];
-       TreeServer* ParentOfThis = Utils->FindServer(prefix);
-       if (!ParentOfThis)
-       {
-               this->SendError("Protocol error - Introduced remote server from unknown server "+prefix);
-               return false;
-       }
-       if (!this->Instance->IsSID(sid))
-       {
-               this->SendError("Invalid format server ID: "+sid+"!");
-               return false;
-       }
-       TreeServer* CheckDupe = Utils->FindServer(servername);
-       if (CheckDupe)
-       {
-               this->SendError("Server "+servername+" already exists!");
-               this->Instance->SNO->WriteToSnoMask('l',"Server \2"+servername+"\2 being introduced from \2" + prefix + "\2 denied, already exists. Closing link with " + prefix);
-               return false;
-       }
-
-       Link* lnk = Utils->FindLink(servername);
-
-       TreeServer *Node = new TreeServer(this->Utils, this->Instance, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
-
-       if (Node->DuplicateID())
-       {
-               this->SendError("Server ID "+sid+" already exists on the network!");
-               this->Instance->SNO->WriteToSnoMask('l',"Server \2"+servername+"\2 being introduced from \2" + prefix + "\2 denied, server ID already exists on the network. Closing link with " + prefix);
-               return false;
-       }
-
-       ParentOfThis->AddChild(Node);
-       params[4] = ":" + params[4];
-       Utils->DoOneToAllButSender(prefix,"SERVER",params,prefix);
-       this->Instance->SNO->WriteToSnoMask('l',"Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
-       return true;
-}
-
-bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
-{
-       if (params.size() < 5)
-       {
-               SendError("Protocol error - Missing SID");
-               return false;
-       }
-
-       irc::string servername = params[0].c_str();
-       std::string sname = params[0];
-       std::string password = params[1];
-       std::string sid = params[3];
-       std::string description = params[4];
-       int hops = atoi(params[2].c_str());
-
-       this->InboundServerName = sname;
-       this->InboundDescription = description;
-       this->InboundSID = sid;
-
-       if (!sentcapab)
-               this->SendCapabilities();
-
-       if (hops)
-       {
-               this->SendError("Server too far away for authentication");
-               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
-               return false;
-       }
-
-       if (!this->Instance->IsSID(sid))
-       {
-               this->SendError("Invalid format server ID: "+sid+"!");
-               return false;
-       }
-
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
-       {
-               if ((x->Name == servername) && ((ComparePass(this->MakePass(x->RecvPass,this->GetOurChallenge()),password)) || (x->RecvPass == password && (this->GetTheirChallenge().empty()))))
-               {
-                       TreeServer* CheckDupe = Utils->FindServer(sname);
-                       if (CheckDupe)
-                       {
-                               this->SendError("Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-                               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
-                               return false;
-                       }
-                       // Begin the sync here. this kickstarts the
-                       // other side, waiting in WAIT_AUTH_2 state,
-                       // into starting their burst, as it shows
-                       // that we're happy.
-                       this->LinkState = CONNECTED;
-                       // we should add the details of this server now
-                       // to the servers tree, as a child of the root
-                       // node.
-
-                       TreeServer *Node = new TreeServer(this->Utils, this->Instance, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
-
-                       if (Node->DuplicateID())
-                       {
-                               this->SendError("Server ID "+sid+" already exists on the network!");
-                               this->Instance->SNO->WriteToSnoMask('l',"Server \2"+assign(servername)+"\2 being introduced denied, server ID already exists on the network. Closing link.");
-                               return false;
-                       }
-
-                       Utils->TreeRoot->AddChild(Node);
-                       params[4] = ":" + params[4];
-                       Utils->DoOneToAllButSender(Instance->Config->GetSID(),"SERVER",params,sname);
-                       Node->bursting = true;
-                       this->DoBurst(Node);
-                       return true;
-               }
-       }
-       this->SendError("Invalid credentials");
-       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
-       return false;
-}
-
-bool TreeSocket::Inbound_Server(std::deque<std::string> &params)
-{
-       if (params.size() < 5)
-       {
-               SendError("Protocol error - Missing SID");
-               return false;
-       }
-
-       irc::string servername = params[0].c_str();
-       std::string sname = params[0];
-       std::string password = params[1];
-       std::string sid = params[3];
-       std::string description = params[4];
-       int hops = atoi(params[2].c_str());
-
-       this->InboundServerName = sname;
-       this->InboundDescription = description;
-       this->InboundSID = sid;
-
-       if (!sentcapab)
-               this->SendCapabilities();
-
-       if (hops)
-       {
-               this->SendError("Server too far away for authentication");
-               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
-               return false;
-       }
-
-       if (!this->Instance->IsSID(sid))
-       {
-               this->SendError("Invalid format server ID: "+sid+"!");
-               return false;
-       }
-
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
-       {
-               if ((x->Name == servername) && ((ComparePass(this->MakePass(x->RecvPass,this->GetOurChallenge()),password) || x->RecvPass == password && (this->GetTheirChallenge().empty()))))
-               {
-                       /* Check for fully initialized instances of the server by id */
-                       Instance->Log(DEBUG,"Looking for dupe SID %s", sid.c_str());
-                       TreeServer* CheckDupeSID = Utils->FindServerID(sid);
-                       if (CheckDupeSID)
-                       {
-                               this->SendError("Server ID "+CheckDupeSID->GetID()+" already exists on server "+CheckDupeSID->GetName()+"!");
-                               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupeSID->GetID()+
-                                               "' already exists on server "+CheckDupeSID->GetName());
-                               return false;
-                       }
-                       /* Now check for fully initialized instances of the server by name */
-                       TreeServer* CheckDupe = Utils->FindServer(sname);
-                       if (CheckDupe)
-                       {
-                               this->SendError("Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-                               this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
-                               return false;
-                       }
-                       this->Instance->SNO->WriteToSnoMask('l',"Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")");
-                       if (this->Hook)
-                       {
-                               std::string name = BufferedSocketNameRequest((Module*)Utils->Creator, this->Hook).Send();
-                               this->Instance->SNO->WriteToSnoMask('l',"Connection from \2"+sname+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] using transport \2"+name+"\2");
-                       }
-
-                       // this is good. Send our details: Our server name and description and hopcount of 0,
-                       // along with the sendpass from this block.
-                       this->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+this->MakePass(x->SendPass, this->GetTheirChallenge())+" 0 "+Instance->Config->GetSID()+" :"+this->Instance->Config->ServerDesc);
-                       // move to the next state, we are now waiting for THEM.
-                       this->LinkState = WAIT_AUTH_2;
-                       return true;
-               }
-       }
-       this->SendError("Invalid credentials");
-       this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
-       return false;
-}
-
 void TreeSocket::Split(const std::string &line, std::deque<std::string> &n)
 {
        n.clear();
@@ -627,10 +404,6 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                return this->MetaData(prefix,params);
                        }
-                       else if (command == "REMSTATUS")
-                       {
-                               return this->RemoveStatus(prefix,params);
-                       }
                        else if (command == "PING")
                        {
                                return this->LocalPing(prefix,params);