ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 12:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use server names for introduction of servers, not SIDs

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9401 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2008-04-07 16:50:20 +00:00
parent 18310fc8b7
commit cf1aa8c36d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/m_spanningtree/server.cpp
View File

@ -48,9 +48,10 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
std::string sid = params[3]; std::string sid = params[3];
std::string description = params[4]; std::string description = params[4];
TreeServer* ParentOfThis = Utils->FindServer(prefix); TreeServer* ParentOfThis = Utils->FindServer(prefix);
if (!ParentOfThis) if (!ParentOfThis)
{ {
this->SendError("Protocol error - Introduced remote server from unknown server "+prefix); this->SendError("Protocol error - Introduced remote server from unknown server "+ParentOfThis->GetName());
return false; return false;
} }
if (!this->Instance->IsSID(sid)) if (!this->Instance->IsSID(sid))
@ -61,8 +62,8 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
TreeServer* CheckDupe = Utils->FindServer(servername); TreeServer* CheckDupe = Utils->FindServer(servername);
if (CheckDupe) if (CheckDupe)
{ {
this->SendError("Server "+servername+" already exists!"); this->SendError("Server "+CheckDupe->GetName()+" already exists!");
this->Instance->SNO->WriteToSnoMask('l',"Server \2"+servername+"\2 being introduced from \2" + prefix + "\2 denied, already exists. Closing link with " + prefix); this->Instance->SNO->WriteToSnoMask('l',"Server \2"+CheckDupe->GetName()+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, already exists. Closing link with " + ParentOfThis->GetName());
return false; return false;
} }
@ -72,15 +73,15 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
if (Node->DuplicateID()) if (Node->DuplicateID())
{ {
this->SendError("Server ID "+sid+" already exists on the network!"); this->SendError("Server ID "+servername+" 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); this->Instance->SNO->WriteToSnoMask('l',"Server \2"+servername+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName());
return false; return false;
} }
ParentOfThis->AddChild(Node); ParentOfThis->AddChild(Node);
params[4] = ":" + params[4]; params[4] = ":" + params[4];
Utils->DoOneToAllButSender(prefix,"SERVER",params,prefix); Utils->DoOneToAllButSender(prefix,"SERVER",params,prefix);
this->Instance->SNO->WriteToSnoMask('l',"Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); this->Instance->SNO->WriteToSnoMask('l',"Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")");
return true; return true;
} }