* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
par.push_back(prefix);
par.push_back("");
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (!source)
return true;
- for (unsigned int i = 0; i < Instance->Config->module_names.size(); i++)
+ std::vector<std::string> module_names = Instance->Modules->GetAllModuleNames(0);
+
+ for (unsigned int i = 0; i < module_names.size(); i++)
{
- Version V = Instance->modules[i]->GetVersion();
+ Module* m = Instance->Modules->Find(module_names[i]);
+ Version V = m->GetVersion();
char modulename[MAXBUF];
char flagstate[MAXBUF];
*flagstate = 0;
strlcat(flagstate,", service provider",MAXBUF);
if (!flagstate[0])
strcpy(flagstate," <no flags>");
- strlcpy(modulename,Instance->Config->module_names[i].c_str(),256);
+ strlcpy(modulename,module_names[i].c_str(),256);
if (*source->oper)
{
- snprintf(strbuf, MAXBUF, "::%s 900 %s :0x%08lx %d.%d.%d.%d %s (%s)",Instance->Config->ServerName,source->nick,(long unsigned int)Instance->modules[i],V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
+ snprintf(strbuf, MAXBUF, "::%s 900 %s :0x%08lx %d.%d.%d.%d %s (%s)",Instance->Config->ServerName,source->nick,(unsigned long)m,
+ V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
}
else
{
snprintf(strbuf, MAXBUF, "::%s 900 %s :%s",Instance->Config->ServerName,source->nick,ServerConfig::CleanFilename(modulename));
}
par[1] = strbuf;
- Utils->DoOneToOne(Instance->Config->ServerName, "PUSH", par, source->server);
+ Utils->DoOneToOne(Instance->Config->GetSID(), "PUSH", par, source->server);
}
snprintf(strbuf, MAXBUF, "::%s 901 %s :End of MODULES list", Instance->Config->ServerName, source->nick);
par[1] = strbuf;
- Utils->DoOneToOne(Instance->Config->ServerName, "PUSH", par, source->server);
+ Utils->DoOneToOne(Instance->Config->GetSID(), "PUSH", par, source->server);
return true;
}
{
/* It's for our server */
string_list results;
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (source)
{
if (!Instance->Config->MOTD.size())
{
par[1] = std::string("::")+Instance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing.";
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
return true;
}
par[1] = std::string("::")+Instance->Config->ServerName+" 375 "+source->nick+" :"+Instance->Config->ServerName+" message of the day";
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
for (unsigned int i = 0; i < Instance->Config->MOTD.size(); i++)
{
par[1] = std::string("::")+Instance->Config->ServerName+" 372 "+source->nick+" :- "+Instance->Config->MOTD[i];
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
}
par[1] = std::string("::")+Instance->Config->ServerName+" 376 "+source->nick+" :End of message of the day.";
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
}
}
else
{
/* Pass it on */
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (source)
Utils->DoOneToOne(prefix, "MOTD", params, params[0]);
}
{
/* It's for our server */
string_list results;
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (source)
{
std::deque<std::string> par;
par.push_back(prefix);
par.push_back("");
par[1] = std::string("::")+Instance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+Instance->Config->ServerName;
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
par[1] = std::string("::")+Instance->Config->ServerName+" 257 "+source->nick+" :Name - "+Instance->Config->AdminName;
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
par[1] = std::string("::")+Instance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+Instance->Config->AdminNick;
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
par[1] = std::string("::")+Instance->Config->ServerName+" 258 "+source->nick+" :E-Mail - "+Instance->Config->AdminEmail;
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
}
}
else
{
/* Pass it on */
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (source)
Utils->DoOneToOne(prefix, "ADMIN", params, params[0]);
}
{
/* It's for our server */
string_list results;
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (source)
{
std::deque<std::string> par;
for (size_t i = 0; i < results.size(); i++)
{
par[1] = "::" + results[i];
- Utils->DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
}
}
}
else
{
/* Pass it on */
- userrec* source = this->Instance->FindNick(prefix);
+ User* source = this->Instance->FindNick(prefix);
if (source)
- Utils->DoOneToOne(prefix, "STATS", params, params[1]);
+ Utils->DoOneToOne(source->uuid, "STATS", params, params[1]);
}
}
return true;
if (params.size() != 1)
return true;
std::string opertype = params[0];
- userrec* u = this->Instance->FindNick(prefix);
+ User* u = this->Instance->FindNick(prefix);
if (u)
{
+ if (!u->IsModeSet('o'))
+ this->Instance->Users->all_opers.push_back(u);
u->modes[UM_OPERATOR] = 1;
- this->Instance->all_opers.push_back(u);
strlcpy(u->oper,opertype.c_str(),NICKMAX-1);
Utils->DoOneToAllButSender(u->nick,"OPERTYPE",params,u->server);
- TreeServer* remoteserver=Utils->FindServer(u->server);
+ TreeServer* remoteserver = Utils->FindServer(u->server);
bool dosend = true;
if (this->Utils->quiet_bursts)
* then do nothing. -- w00t
*/
if (
- this->bursting ||
- Utils->FindRemoteBurstServer(remoteserver) ||
+ remoteserver->bursting ||
this->Instance->SilentULine(this->Instance->FindServerNamePtr(u->server))
)
{
if (params.size() < 3)
return true;
- userrec* u = this->Instance->FindNick(params[0]);
+ User* u = this->Instance->FindNick(params[0]);
if (u)
{
/* buh. UID them */
if (!u->ForceNickChange(u->uuid))
{
- userrec::QuitUser(this->Instance, u, "Nickname collision");
+ User::QuitUser(this->Instance, u, "Nickname collision");
return true;
}
}
if (params.size() < 1)
return true;
- userrec* u = this->Instance->FindNick(prefix);
+ User* u = this->Instance->FindNick(prefix);
if (u)
{
if (!this->Instance->IsChannel(params[1].c_str()))
return true;
- userrec* u = this->Instance->FindNick(params[0]);
+ User* u = this->Instance->FindNick(params[0]);
if (u)
{
/* only join if it's local, otherwise just pass it on! */
if (IS_LOCAL(u))
- chanrec::JoinUser(this->Instance, u, params[1].c_str(), false, "", Instance->Time());
+ Channel::JoinUser(this->Instance, u, params[1].c_str(), false, "", false, Instance->Time());
Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
}
return true;
}
+bool TreeSocket::ServicePart(const std::string &prefix, std::deque<std::string> ¶ms)
+{
+ if (params.size() < 2)
+ return true;
+
+ if (!this->Instance->IsChannel(params[1].c_str()))
+ return true;
+
+ User* u = this->Instance->FindNick(params[0]);
+ Channel* c = this->Instance->FindChan(params[1]);
+
+ if (u)
+ {
+ /* only part if it's local, otherwise just pass it on! */
+ if (IS_LOCAL(u))
+ if (!c->PartUser(u, "Services forced part"))
+ delete c;
+ Utils->DoOneToAllButSender(prefix,"SVSPART",params,prefix);
+ }
+
+ return true;
+}
+
bool TreeSocket::RemoteRehash(const std::string &prefix, std::deque<std::string> ¶ms)
{
if (params.size() < 1)
{
this->Instance->SNO->WriteToSnoMask('l',"Remote rehash initiated by \002"+prefix+"\002.");
this->Instance->RehashServer();
- Utils->ReadConfiguration(false);
+ Utils->ReadConfiguration(true);
InitializeDisabledCommands(Instance->Config->DisabledCommands, Instance);
}
Utils->DoOneToAllButSender(prefix,"REHASH",params,prefix);
if (params.size() != 2)
return true;
- userrec* who = this->Instance->FindNick(params[0]);
+ User* who = this->Instance->FindNick(params[0]);
if (who)
{
// NOTE: This is safe with kill hiding on, as RemoteKill is only reached if we have a server prefix.
// in short this is not executed for USERS.
who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick, prefix.c_str(), reason.c_str());
- userrec::QuitUser(this->Instance,who,reason);
+ User::QuitUser(this->Instance,who,reason);
}
return true;
}
else
{
std::string forwardto = params[1];
- if (forwardto == this->Instance->Config->ServerName)
+ if (forwardto == Instance->Config->GetSID() || forwardto == Instance->Config->ServerName)
{
/*
* this is a PONG for us
* dump the PONG reply back to their fd. If its a server, do nowt.
* Services might want to send these s->s, but we dont need to yet.
*/
- userrec* u = this->Instance->FindNick(prefix);
+ User* u = this->Instance->FindNick(prefix);
if (u)
{
u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());
TreeServer* ServerSource = Utils->FindServer(prefix);
if (ServerSource)
{
- Utils->SetRemoteBursting(ServerSource, false);
-
if (params[0] == "*")
{
FOREACH_MOD_I(this->Instance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_OTHER,NULL,params[1],params[2]));
}
else if (*(params[0].c_str()) == '#')
{
- chanrec* c = this->Instance->FindChan(params[0]);
+ Channel* c = this->Instance->FindChan(params[0]);
if (c)
{
FOREACH_MOD_I(this->Instance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2]));
}
else if (*(params[0].c_str()) != '#')
{
- userrec* u = this->Instance->FindNick(params[0]);
+ User* u = this->Instance->FindNick(params[0]);
if (u)
{
FOREACH_MOD_I(this->Instance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2]));
{
if (params.size() < 1)
return true;
- userrec* u = this->Instance->FindNick(prefix);
+ User* u = this->Instance->FindNick(prefix);
if (u)
{
bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> ¶ms)
{
if (params.size() < 6)
+ {
+ this->Instance->SNO->WriteToSnoMask('x',"%s sent me a malformed ADDLINE of type %s.",prefix.c_str(),params[0].c_str());
return true;
- bool propogate = false;
- if (!this->bursting)
- Utils->lines_to_apply = 0;
- switch (*(params[0].c_str()))
+ }
+
+ XLineFactory* xlf = Instance->XLines->GetFactory(params[0]);
+
+ if (!xlf)
{
- case 'Z':
- propogate = Instance->XLines->add_zline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- Instance->XLines->zline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
- if (propogate)
- Utils->lines_to_apply |= APPLY_ZLINES;
- break;
- case 'Q':
- propogate = Instance->XLines->add_qline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- Instance->XLines->qline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
- if (propogate)
- Utils->lines_to_apply |= APPLY_QLINES;
- break;
- case 'E':
- propogate = Instance->XLines->add_eline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- Instance->XLines->eline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
- break;
- case 'G':
- propogate = Instance->XLines->add_gline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- Instance->XLines->gline_set_creation_time(params[1].c_str(), atoi(params[3].c_str()));
- if (propogate)
- Utils->lines_to_apply |= APPLY_GLINES;
- break;
- case 'K':
- propogate = Instance->XLines->add_kline(atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
- if (propogate)
- Utils->lines_to_apply |= APPLY_KLINES;
- break;
- default:
- /* Just in case... */
- this->Instance->SNO->WriteToSnoMask('x',"\2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!");
- propogate = false;
- break;
+ this->Instance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",prefix.c_str(),params[0].c_str());
+ return true;
}
- /* Send it on its way */
- if (propogate)
+
+ XLine* xl = xlf->Generate(Instance->Time(), atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+ xl->SetCreateTime(atoi(params[3].c_str()));
+ if (Instance->XLines->AddLine(xl,NULL))
{
- if (atoi(params[4].c_str()))
+ if (xl->duration)
{
- time_t c_requires_crap = ConvToInt(params[4]) + Instance->Time();
- this->Instance->SNO->WriteToSnoMask('x',"%s Added %cLINE on %s to expire on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),Instance->TimeString(c_requires_crap).c_str(),params[5].c_str());
+ this->Instance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",prefix.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+ params[1].c_str(),Instance->TimeString(xl->expiry).c_str(),params[5].c_str());
}
else
{
- this->Instance->SNO->WriteToSnoMask('x',"%s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str());
+ this->Instance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",prefix.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+ params[1].c_str(),params[5].c_str());
}
params[5] = ":" + params[5];
- Utils->DoOneToAllButSender(prefix,"ADDLINE",params,prefix);
+
+ User* u = Instance->FindNick(prefix);
+ Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
+ TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
+
+ if (!remoteserver->bursting)
+ {
+ Instance->XLines->ApplyLines();
+ }
}
- if (!this->bursting)
+ else
+ delete xl;
+
+ return true;
+}
+
+bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> ¶ms)
+{
+ if (params.size() < 2)
+ return true;
+
+ User* user = Instance->FindNick(prefix);
+
+ /* NOTE: No check needed on 'user', this function safely handles NULL */
+ if (Instance->XLines->DelLine(params[0].c_str(), params[1], user))
{
- Instance->XLines->apply_lines(Utils->lines_to_apply);
- Utils->lines_to_apply = 0;
+ this->Instance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", prefix.c_str(),
+ params[0].c_str(), params[0].length() == 1 ? "LINE" : "", params[1].c_str());
+ Utils->DoOneToAllButSender(prefix,"DELLINE", params, prefix);
}
return true;
}
{
if (params.size() < 1)
return true;
- userrec* u = this->Instance->FindNick(prefix);
+ User* u = this->Instance->FindNick(prefix);
if (u)
{
u->ChangeName(params[0].c_str());
{
if (params.size() < 1)
return true;
- userrec* u = this->Instance->FindNick(prefix);
+ User* u = this->Instance->FindNick(prefix);
if (u)
{
// an incoming request
if (params.size() == 1)
{
- userrec* x = this->Instance->FindNick(params[0]);
+ User* x = this->Instance->FindNick(params[0]);
if ((x) && (IS_LOCAL(x)))
{
- userrec* x = this->Instance->FindNick(params[0]);
+ User* x = this->Instance->FindNick(params[0]);
char signon[MAXBUF];
char idle[MAXBUF];
snprintf(signon, MAXBUF, "%lu", (unsigned long)x->signon);
else if (params.size() == 3)
{
std::string who_did_the_whois = params[0];
- userrec* who_to_send_to = this->Instance->FindNick(who_did_the_whois);
+ User* who_to_send_to = this->Instance->FindNick(who_did_the_whois);
if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
{
// an incoming reply to a whois we sent out
{
if (params.size() < 2)
return true;
- userrec* u = this->Instance->FindNick(params[0]);
+ User* u = this->Instance->FindNick(params[0]);
if (!u)
return true;
if (IS_LOCAL(u))
if (params.size() == 2)
{
// someone querying our time?
- if (this->Instance->Config->ServerName == params[0])
+ if (this->Instance->Config->ServerName == params[0] || this->Instance->Config->GetSID() == params[0])
{
- userrec* u = this->Instance->FindNick(params[1]);
+ User* u = this->Instance->FindNick(params[1]);
if (u)
{
params.push_back(ConvToStr(Instance->Time(false)));
params[0] = prefix;
- Utils->DoOneToOne(this->Instance->Config->ServerName,"TIME",params,params[0]);
+ Utils->DoOneToOne(this->Instance->Config->GetSID(),"TIME",params,params[0]);
}
}
else
{
// not us, pass it on
- userrec* u = this->Instance->FindNick(params[1]);
+ User* u = this->Instance->FindNick(params[1]);
if (u)
Utils->DoOneToOne(prefix,"TIME",params,params[0]);
}
else if (params.size() == 3)
{
// a response to a previous TIME
- userrec* u = this->Instance->FindNick(params[1]);
+ User* u = this->Instance->FindNick(params[1]);
if ((u) && (IS_LOCAL(u)))
{
time_t rawtime = atol(params[2].c_str());
if (params.size() == 1)
{
std::string stufftobounce = params[0];
- this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" PONG "+stufftobounce);
+ this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" PONG "+stufftobounce);
return true;
}
else
{
std::string forwardto = params[1];
- if (forwardto == this->Instance->Config->ServerName)
+ if (forwardto == this->Instance->Config->ServerName || forwardto == this->Instance->Config->GetSID())
{
// this is a ping for us, send back PONG to the requesting server
params[1] = params[0];
{
if (params.size() < 1)
return true;
- chanrec* c = Instance->FindChan(params[0]);
+ Channel* c = Instance->FindChan(params[0]);
if (c)
{
for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string> ¶ms)
{
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
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)
{
ParentOfThis->AddChild(Node);
params[4] = ":" + params[4];
- Utils->SetRemoteBursting(Node, true);
Utils->DoOneToAllButSender(prefix,"SERVER",params,prefix);
this->Instance->SNO->WriteToSnoMask('l',"Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
return true;
/* One or both of us specified hmac sha256, but we don't have sha256 module loaded!
* We can't allow this password as valid.
*/
- if (!Instance->FindModule("m_sha256.so") || !Utils->ChallengeResponse)
+ if (!Instance->Modules->Find("m_sha256.so") || !Utils->ChallengeResponse)
return false;
else
/* Straight string compare of hashes */
bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> ¶ms)
{
if (params.size() < 5)
+ {
+ SendError("Protocol error - Missing SID");
return false;
+ }
irc::string servername = params[0].c_str();
std::string sname = params[0];
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()))))
Utils->TreeRoot->AddChild(Node);
params[4] = ":" + params[4];
- Utils->DoOneToAllButSender(Utils->TreeRoot->GetName(),"SERVER",params,sname);
- this->bursting = true;
+ Utils->DoOneToAllButSender(Instance->Config->GetSID(),"SERVER",params,sname);
+ Node->bursting = true;
this->DoBurst(Node);
return true;
}
bool TreeSocket::Inbound_Server(std::deque<std::string> ¶ms)
{
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];
- std::string OurSID;
int hops = atoi(params[2].c_str());
this->InboundServerName = sname;
this->InboundDescription = description;
this->InboundSID = sid;
- OurSID += (char)((Instance->Config->sid / 100) + 48);
- OurSID += (char)((Instance->Config->sid / 10) % 10 + 48);
- OurSID += (char)(Instance->Config->sid % 10 + 48);
-
if (!sentcapab)
this->SendCapabilities();
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()))))
{
- /* First check for instances of the server that are waiting between the inbound and outbound SERVER command */
- TreeSocket* CheckDupeSocket = Utils->FindBurstingServer(sname);
- if (CheckDupeSocket)
- {
- /* If we find one, we abort the link to prevent a race condition */
- this->SendError("Negotiation collision");
- this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists in a negotiating state.");
- CheckDupeSocket->SendError("Negotiation collision");
- Instance->SE->DelFd(CheckDupeSocket);
- CheckDupeSocket->Close();
- return false;
- }
/* 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);
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 = InspSocketNameRequest((Module*)Utils->Creator, this->Hook).Send();
+ 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");
}
- Utils->AddBurstingServer(sname,this);
-
// 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 "+OurSID+" :"+this->Instance->Config->ServerDesc);
+ 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;
std::string param;
while (tokens.GetToken(param))
{
- if (!param.empty())
- n.push_back(param);
+ n.push_back(param);
}
return;
}
{
prefix = params[0].substr(1);
params.pop_front();
+
+ if (prefix.empty())
+ {
+ this->SendError("BUG (?) Empty prefix recieved.");
+ return false;
+ }
}
+
command = params[0].c_str();
params.pop_front();
+
switch (this->LinkState)
{
TreeServer* Node;
case WAIT_AUTH_1:
- // Waiting for SERVER command from remote server. Server initiating
- // the connection sends the first SERVER command, listening server
- // replies with theirs if its happy, then if the initiator is happy,
- // it starts to send its net sync, which starts the merge, otherwise
- // it sends an ERROR.
+ /*
+ * State WAIT_AUTH_1:
+ * Waiting for SERVER command from remote server. Server initiating
+ * the connection sends the first SERVER command, listening server
+ * replies with theirs if its happy, then if the initiator is happy,
+ * it starts to send its net sync, which starts the merge, otherwise
+ * it sends an ERROR.
+ */
if (command == "PASS")
{
- /* Silently ignored */
+ /*
+ * Ignore this silently. Some services packages insist on sending PASS, even
+ * when it is not required (i.e. by us). We have to ignore this here, otherwise
+ * as it's an unknown command (effectively), it will cause the connection to be
+ * closed, which probably isn't what people want. -- w00t
+ */
}
else if (command == "SERVER")
{
}
else
{
+ // XXX ...wtf.
irc::string error = "Invalid command in negotiation phase: " + command;
this->SendError(assign(error));
return false;
}
break;
case WAIT_AUTH_2:
- // Waiting for start of other side's netmerge to say they liked our
- // password.
+ /*
+ * State WAIT_AUTH_2:
+ * We have sent SERVER to the other side of the connection. Now we're waiting for them to start BURST.
+ * The other option at this stage of things, of course, is for them to close our connection thanks
+ * to invalid credentials.. -- w
+ */
if (command == "SERVER")
{
- // cant do this, they sent it to us in the WAIT_AUTH_1 state!
- // silently ignore.
+ /*
+ * Connection is either attempting to re-auth itself (stupid) or sending netburst without sending BURST.
+ * Both of these aren't allowable, so block them here. -- w
+ */
+ this->SendError("You may not re-authenticate or commence netburst without sending BURST.");
return true;
}
else if (command == "BURST")
{
this->Instance->SetTimeDelta(delta);
// Send this new timestamp to any other servers
- Utils->DoOneToMany(Utils->TreeRoot->GetName(), "TIMESET", params);
+ Utils->DoOneToMany(Instance->Config->GetSID(), "TIMESET", params);
}
}
this->LinkState = CONNECTED;
Link* lnk = Utils->FindLink(InboundServerName);
- Node = new TreeServer(this->Utils,this->Instance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false);
+ Node = new TreeServer(this->Utils, this->Instance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false);
if (Node->DuplicateID())
{
this->Instance->SNO->WriteToSnoMask('l',"Server \2"+InboundServerName+"\2 being introduced from \2" + prefix + "\2 denied, server ID already exists on the network. Closing link.");
return false;
}
- Utils->DelBurstingServer(this);
+
Utils->TreeRoot->AddChild(Node);
params.clear();
params.push_back(InboundServerName);
params.push_back("1");
params.push_back(InboundSID);
params.push_back(":"+InboundDescription);
- Utils->DoOneToAllButSender(Utils->TreeRoot->GetName(),"SERVER",params,InboundServerName);
- this->bursting = true;
+ Utils->DoOneToAllButSender(Instance->Config->GetSID(),"SERVER",params,InboundServerName);
+ Node->bursting = true;
this->DoBurst(Node);
}
else if (command == "ERROR")
break;
case LISTENER:
+ /*
+ * This really shouldn't happen.
+ */
this->SendError("Internal error -- listening socket accepted its own descriptor!!!");
return false;
break;
case CONNECTING:
+ /*
+ * State CONNECTING:
+ * We're connecting (OUTGOING) to another server. They are in state WAIT_AUTH_1 until they verify
+ * our credentials, when they proceed into WAIT_AUTH_2 and send SERVER to us. We then send BURST
+ * + our netburst, which will put them into CONNECTED state. -- w
+ */
if (command == "SERVER")
{
- // another server we connected to, which was in WAIT_AUTH_1 state,
- // has just sent us their credentials. If we get this far, theyre
- // happy with OUR credentials, and they are now in WAIT_AUTH_2 state.
- // if we're happy with this, we should send our netburst which
- // kickstarts the merge.
+ // Our credentials have been accepted, send netburst. (this puts US into the CONNECTED state)
return this->Outbound_Reply_Server(params);
}
else if (command == "ERROR")
}
break;
case CONNECTED:
- // This is the 'authenticated' state, when all passwords
- // have been exchanged and anything past this point is taken
- // as gospel.
-
+ /*
+ * State CONNECTED:
+ * Credentials have been exchanged, we've gotten their 'BURST' (or sent ours).
+ * Anything from here on should be accepted a little more reasonably.
+ */
if (!prefix.empty())
{
+ /*
+ * Check for fake direction here, and drop any instances that are found.
+ * What is fake direction? Imagine the following server setup:
+ * 0AA <-> 0AB <-> 0AC
+ * Fake direction would be 0AC sending a message to 0AB claiming to be from
+ * 0AA, or something similar. Basically, a message taking a path that *cannot*
+ * be correct.
+ *
+ * When would this be seen?
+ * Well, hopefully never. It could be caused by race conditions, bugs, or
+ * "miscreant" servers, though, so let's check anyway. -- w
+ */
std::string direction = prefix;
- userrec *t = this->Instance->FindUUID(prefix);
+ User *t = this->Instance->FindUUID(prefix);
if (t)
{
direction = t->server;
}
else
{
- prefix = this->GetName();
+ /*
+ * Empty prefix from a server to server link:
+ * This is somewhat bad/naughty, so let's set the prefix
+ * to be the link that we got it from, so we don't break anything. -- w
+ */
+ TreeServer* n = Utils->FindServer(GetName());
+ if (n)
+ prefix = n->GetID();
+ else
+ prefix = GetName();
}
- if ((command == "MODE") && (params.size() >= 2))
+ /*
+ * First up, check for any malformed commands (e.g. MODE without a timestamp)
+ * and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
+ */
+ if (command == "MODE")
{
- chanrec* channel = Instance->FindChan(params[0]);
- if (channel)
+ if (params.size() >= 2)
{
- userrec* x = Instance->FindNick(prefix);
- if (x)
+ Channel* channel = Instance->FindChan(params[0]);
+ if (channel)
{
- if (warned.find(x->server) == warned.end())
+ User* x = Instance->FindNick(prefix);
+ if (x)
{
- Instance->Log(DEFAULT,"WARNING: I revceived modes '%s' from another server '%s'. This is not compliant with InspIRCd. Please check that server for bugs.", params[1].c_str(), x->server);
- Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending nonstandard modes: '%s MODE %s' where FMODE should be used, and may cause desyncs.", x->server, x->nick, params[1].c_str());
- warned[x->server] = x->nick;
+ if (warned.find(x->server) == warned.end())
+ {
+ Instance->Log(DEFAULT,"WARNING: I revceived modes '%s' from another server '%s'. This is not compliant with InspIRCd. Please check that server for bugs.", params[1].c_str(), x->server);
+ Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending nonstandard modes: '%s MODE %s' where FMODE should be used, and may cause desyncs.", x->server, x->nick, params[1].c_str());
+ warned[x->server] = x->nick;
+ }
}
}
}
}
-
- if (command == "SVSMODE")
+ else if (command == "SVSMODE")
{
- /* Services expects us to implement
- * SVSMODE. In inspircd its the same as
- * MODE anyway.
- */
command = "MODE";
}
- std::string target;
- /* Yes, know, this is a mess. Its reasonably fast though as we're
- * working with std::string here.
+
+
+ /*
+ * Now, check for (and parse) commands as appropriate. -- w
+ */
+
+ /* Find the server that this command originated from, used in the handlers below */
+ TreeServer *ServerSource = Utils->FindServer(prefix);
+
+ /* Find the link we just got this from so we don't bounce it back incorrectly */
+ std::string sourceserv = this->myhost;
+ if (!this->InboundServerName.empty())
+ {
+ sourceserv = this->InboundServerName;
+ }
+
+ /*
+ * XXX one of these days, this needs to be moved into class Commands.
*/
if (command == "UID")
{
}
else if (command == "FJOIN")
{
- TreeServer* ServerSource = Utils->FindServer(prefix);
- if (ServerSource)
- Utils->SetRemoteBursting(ServerSource, false);
return this->ForceJoin(prefix,params);
}
else if (command == "STATS")
{
return this->Motd(prefix, params);
}
- else if (command == "KILL" && Utils->IsServer(prefix))
+ else if (command == "KILL" && ServerSource)
{
+ // Kill from a server
return this->RemoteKill(prefix,params);
}
else if (command == "MODULES")
}
else if (command == "FMODE")
{
- TreeServer* ServerSource = Utils->FindServer(prefix);
- if (ServerSource)
- Utils->SetRemoteBursting(ServerSource, false);
return this->ForceMode(prefix,params);
}
else if (command == "FTOPIC")
}
else if (command == "PING")
{
- if (prefix.empty())
- prefix = this->GetName();
- /*
- * We just got a ping from a server that's bursting.
- * This can't be right, so set them to not bursting, and
- * apply their lines.
- */
- TreeServer* ServerSource = Utils->FindServer(prefix);
- if (ServerSource)
- Utils->SetRemoteBursting(ServerSource, false);
-
- if (this->bursting)
- {
- this->bursting = false;
- Instance->XLines->apply_lines(Utils->lines_to_apply);
- Utils->lines_to_apply = 0;
- }
-
return this->LocalPing(prefix,params);
}
else if (command == "PONG")
{
- if (prefix.empty())
- prefix = this->GetName();
- /*
- * We just got a pong from a server that's bursting.
- * This can't be right, so set them to not bursting, and
- * apply their lines.
- */
- TreeServer* ServerSource = Utils->FindServer(prefix);
- if (ServerSource)
- Utils->SetRemoteBursting(ServerSource, false);
-
- if (this->bursting)
- {
- this->bursting = false;
- Instance->XLines->apply_lines(Utils->lines_to_apply);
- Utils->lines_to_apply = 0;
- }
-
return this->LocalPong(prefix,params);
}
else if (command == "VERSION")
}
else if (command == "ADDLINE")
{
- TreeServer* ServerSource = Utils->FindServer(prefix);
- if (ServerSource)
- Utils->SetRemoteBursting(ServerSource, false);
return this->AddLine(prefix,params);
}
+ else if (command == "DELLINE")
+ {
+ return this->DelLine(prefix,params);
+ }
else if (command == "SVSNICK")
{
- if (prefix.empty())
- {
- prefix = this->GetName();
- }
return this->ForceNick(prefix,params);
}
else if (command == "OPERQUIT")
}
else if ((command == "KICK") && (Utils->IsServer(prefix)))
{
- std::string sourceserv = this->myhost;
if (params.size() == 3)
{
- userrec* user = this->Instance->FindNick(params[1]);
- chanrec* chan = this->Instance->FindChan(params[0]);
+ User* user = this->Instance->FindNick(params[1]);
+ Channel* chan = this->Instance->FindChan(params[0]);
if (user && chan)
{
if (!chan->ServerKickUser(user, params[2].c_str(), false))
delete chan;
}
}
- if (!this->InboundServerName.empty())
- {
- sourceserv = this->InboundServerName;
- }
+
return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
else if (command == "SVSJOIN")
{
- if (prefix.empty())
- {
- prefix = this->GetName();
- }
return this->ServiceJoin(prefix,params);
}
+ else if (command == "SVSPART")
+ {
+ return this->ServicePart(prefix,params);
+ }
else if (command == "SQUIT")
{
if (params.size() == 2)
}
else if (command == "OPERNOTICE")
{
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
- sourceserv = this->InboundServerName;
if (params.size() >= 1)
- Instance->WriteOpers("*** From " + sourceserv + ": " + params[0]);
+ Instance->SNO->WriteToSnoMask('A', "From " + prefix + ": " + params[0]);
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
else if (command == "MODENOTICE")
{
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
- sourceserv = this->InboundServerName;
if (params.size() >= 2)
{
- Instance->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", sourceserv.c_str(), params[1].c_str());
+ Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", prefix.c_str(), params[1].c_str());
}
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
else if (command == "SNONOTICE")
{
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
- sourceserv = this->InboundServerName;
if (params.size() >= 2)
{
- Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + sourceserv + ": "+ params[1]);
+ Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + prefix + ": "+ params[1]);
}
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
+ else if (command == "BURST")
+ {
+ // Set prefix server as bursting
+ if (!ServerSource)
+ {
+ this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", prefix.c_str());
+ return false;
+ }
+
+ ServerSource->bursting = true;
+ return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
+ }
else if (command == "ENDBURST")
{
- this->bursting = false;
- Instance->XLines->apply_lines(Utils->lines_to_apply);
- Utils->lines_to_apply = 0;
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
- sourceserv = this->InboundServerName;
- this->Instance->SNO->WriteToSnoMask('l',"Received end of netburst from \2%s\2",sourceserv.c_str());
-
- Event rmode((char*)sourceserv.c_str(), (Module*)Utils->Creator, "new_server");
- rmode.Send(Instance);
-
- return true;
+ if (!ServerSource)
+ {
+ this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", prefix.c_str());
+ return false;
+ }
+
+ ServerSource->FinishBurst();
+ return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
+ }
+ else if (command == "MODE")
+ {
+ // Server-prefix MODE.
+ const char* modelist[MAXPARAMETERS];
+ for (size_t i = 0; i < params.size(); i++)
+ modelist[i] = params[i].c_str();
+
+ // Insert into the parser
+ this->Instance->SendMode(modelist, params.size(), this->Instance->FakeClient);
+
+ // Pass out to the network
+ return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
else
{
* Not a special s2s command. Emulate the user doing it.
* This saves us having a huge ugly command parser again.
*/
- userrec *who = this->Instance->FindUUID(prefix);
+ User *who = this->Instance->FindUUID(prefix);
- std::string sourceserv = this->myhost;
- if (!this->InboundServerName.empty())
+ if (!who)
{
- sourceserv = this->InboundServerName;
+ // this looks ugly because command is an irc::string
+ this->SendError("Command (" + std::string(command.c_str()) + ") from unknown prefix (" + prefix + ")! Dropping link.");
+ return false;
}
- if ((!who) && (command == "MODE"))
+
+ if (command == "NICK")
{
- if (Utils->IsServer(prefix))
+ if (params.size() != 2)
{
- const char* modelist[MAXPARAMETERS];
- for (size_t i = 0; i < params.size(); i++)
- modelist[i] = params[i].c_str();
- this->Instance->SendMode(modelist, params.size(), this->Instance->FakeClient);
- /* Hot potato! pass it on! */
- return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
+ SendError("Protocol violation: NICK message without TS - :"+std::string(who->uuid)+" NICK "+params[0]);
+ return false;
}
- }
- if (who)
- {
- if ((command == "NICK") && (params.size() > 0))
+ /* Update timestamp on user when they change nicks */
+ who->age = atoi(params[1].c_str());
+
+ /*
+ * On nick messages, check that the nick doesnt already exist here.
+ * If it does, perform collision logic.
+ */
+ User* x = this->Instance->FindNickOnly(params[0]);
+ if ((x) && (x != who))
{
- /* On nick messages, check that the nick doesnt
- * already exist here. If it does, kill their copy,
- * and our copy.
- */
- userrec* x = this->Instance->FindNick(params[0]);
- if ((x) && (x != who))
+ int collideret = 0;
+ /* x is local, who is remote */
+ collideret = this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
+ if (collideret != 1)
{
- /* x is local, who is remote */
- this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
+ /*
+ * Remote client lost, or both lost, parsing this nickchange would be
+ * pointless, as the incoming client's server will soon recieve SVSNICK to
+ * change its nick to its UID. :) -- w00t
+ */
return true;
-/*
-Old nickname collision logic..
- std::deque<std::string> p;
- p.push_back(params[0]);
- p.push_back(":Nickname collision ("+prefix+" -> "+params[0]+")");
- Utils->DoOneToMany(this->Instance->Config->ServerName,"KILL",p);
- p.clear();
- p.push_back(prefix);
- p.push_back(":Nickname collision");
- Utils->DoOneToMany(this->Instance->Config->ServerName,"KILL",p);
- userrec::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")");
- userrec* y = this->Instance->FindNick(prefix);
- if (y)
- {
- userrec::QuitUser(this->Instance,y,"Nickname collision");
- }
- return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
-*/
}
}
- // its a user
- target = who->server;
- const char* strparams[127];
- for (unsigned int q = 0; q < params.size(); q++)
- {
- strparams[q] = params[q].c_str();
- }
- switch (this->Instance->CallCommandHandler(command.c_str(), strparams, params.size(), who))
- {
- case CMD_INVALID:
- this->SendError("Unrecognised command '"+std::string(command.c_str())+"' -- possibly loaded mismatched modules");
- return false;
- break;
- case CMD_FAILURE:
- return true;
- break;
- default:
- /* CMD_SUCCESS and CMD_USER_DELETED fall through here */
- break;
- }
}
- else
+
+ // its a user
+ const char* strparams[127];
+ for (unsigned int q = 0; q < params.size(); q++)
{
- // its not a user. Its either a server, or somethings screwed up.
- if (Utils->IsServer(prefix))
- target = this->Instance->Config->ServerName;
- else
+ strparams[q] = params[q].c_str();
+ }
+
+ switch (this->Instance->CallCommandHandler(command.c_str(), strparams, params.size(), who))
+ {
+ case CMD_INVALID:
+ // command is irc::string, hence ugliness
+ this->SendError("Unrecognised or malformed command '" + std::string(command.c_str()) + "' -- possibly loaded mismatched modules");
+ return false;
+ break;
+ /*
+ * CMD_LOCALONLY is aliased to CMD_FAILURE, so this won't go out onto the network.
+ */
+ case CMD_FAILURE:
return true;
+ break;
+ default:
+ /* CMD_SUCCESS and CMD_USER_DELETED fall through here */
+ break;
}
+
return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
return true;
- break;
+ break; // end of state CONNECTED (phew).
}
return true;
}
void TreeSocket::OnClose()
{
- if (this->LinkState == LISTENER)
+ // Test fix for big fuckup
+ if (this->LinkState != CONNECTED)
return;
// Connection closed.
if (!found)
{
Utils->Creator->RemoteMessage(NULL,"Server connection from %s denied (no link blocks with that IP address)", ip);
- close(newsock);
+ Instance->SE->Close(newsock);
return false;
}
}
projects / user / henk / code / inspircd.git / blobdiff