-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2009 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
/* $ModDesc: Provides a spanning tree server link protocol */
#include "inspircd.h"
}
for (unsigned int q = 0; q < Current->ChildCount(); q++)
{
- if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
+ if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName()))))
{
if (IS_OPER(user))
{
}
}
/* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
- if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName().c_str())) && (!IS_OPER(user)))
+ if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!IS_OPER(user)))
return;
/* Or if the server is hidden and they're not an oper */
else if ((Current->Hidden) && (!IS_OPER(user)))
return;
- user->WriteNumeric(364, "%s %s %s :%d %s", user->nick.c_str(),Current->GetName().c_str(),
+ std::string servername = Current->GetName();
+ user->WriteNumeric(364, "%s %s %s :%d %s", user->nick.c_str(), servername.c_str(),
(Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
(Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
Current->GetDesc().c_str());
secs = secs % 60;
mins_up = mins_up % 60;
hours_up = hours_up % 24;
- return ((days_up ? (ConvToStr(days_up) + "d") : std::string(""))
- + (hours_up ? (ConvToStr(hours_up) + "h") : std::string(""))
- + (mins_up ? (ConvToStr(mins_up) + "m") : std::string(""))
+ return ((days_up ? (ConvToStr(days_up) + "d") : "")
+ + (hours_up ? (ConvToStr(hours_up) + "h") : "")
+ + (mins_up ? (ConvToStr(mins_up) + "m") : "")
+ ConvToStr(secs) + "s");
}
for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
{
TreeServer *s = i->second;
-
+
if (s->GetSocket() && s->GetSocket()->GetLinkState() == DYING)
{
s->GetSocket()->Close();
// ... if we can find a proper route to them
if (tsock)
{
- tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " +
+ tsock->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " +
ServerInstance->Config->GetSID() + " " + s->GetID());
s->LastPingMsec = ts;
}
if ((Utils->PingWarnTime) && (!s->Warned) && (curtime >= s->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!s->AnsweredLastPing()))
{
/* The server hasnt responded, send a warning to opers */
- ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime);
+ std::string servername = s->GetName();
+ ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", servername.c_str(), Utils->PingWarnTime);
s->Warned = true;
}
}
{
try
{
- bool cached;
+ bool cached = false;
ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y);
ServerInstance->AddResolver(snr, cached);
}
Utils->timeoutlist.erase(me);
s->Close();
}
- if (curtime > s->age + p.second)
+ else if (curtime > s->age + p.second)
{
ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second);
Utils->timeoutlist.erase(me);
}
else
{
- RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
+ std::string servername = CheckDupe->GetParent()->GetName();
+ RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002", x->Name.c_str(), servername.c_str());
return MOD_RES_DENY;
}
}
params.push_back(user->GetIPString());
params.push_back(ConvToStr(user->signon));
params.push_back("+"+std::string(user->FormatModes(true)));
- params.push_back(":"+std::string(user->fullname));
+ params.push_back(":"+user->fullname);
Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
if (IS_OPER(user))
params.push_back(memb->chan->name);
params.push_back(ConvToStr(memb->chan->age));
params.push_back(std::string("+") + memb->chan->ChanModes(true));
- params.push_back(memb->modes+","+std::string(memb->user->uuid));
+ params.push_back(memb->modes+","+memb->user->uuid);
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
}
}
void ModuleSpanningTree::OnRehash(User* user)
{
// Re-read config stuff
- Utils->ReadConfiguration();
+ try
+ {
+ Utils->ReadConfiguration();
+ }
+ catch (ModuleException& e)
+ {
+ // Refresh the IP cache anyway, so servers read before the error will be allowed to connect
+ Utils->RefreshIPCache();
+ // Always warn local opers with snomask +l, also warn globally (snomask +L) if the rehash was issued by a remote user
+ std::string msg = "Error in configuration: ";
+ msg.append(e.GetReason());
+ ServerInstance->SNO->WriteToSnoMask('l', msg);
+ if (!IS_LOCAL(user))
+ ServerInstance->PI->SendSNONotice("L", msg);
+ }
}
void ModuleSpanningTree::OnLoadModule(Module* mod)
}
}
-void ModuleSpanningTree::RedoConfig(Module* mod)
-{
-}
-
// note: the protocol does not allow direct umode +o except
// via NICK with 8 params. sending OPERTYPE infers +o modechange
// locally.
if (!x->IsBurstable() || loopCall)
return;
- char data[MAXBUF];
- snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
- ServerInstance->Config->ServerName.c_str(), (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str());
parameterlist params;
- params.push_back(data);
+ params.push_back(x->type);
+ params.push_back(x->Displayable());
+ params.push_back(ServerInstance->Config->ServerName);
+ params.push_back(ConvToStr(x->set_time));
+ params.push_back(ConvToStr(x->duration));
+ params.push_back(":" + x->reason);
if (!user)
{
void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
{
- if (x->type == "K")
+ if (!x->IsBurstable() || loopCall)
return;
- char data[MAXBUF];
- snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
parameterlist params;
- params.push_back(data);
+ params.push_back(x->type);
+ params.push_back(x->Displayable());
if (!user)
{
if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
{
parameterlist params;
- std::string command;
std::string output_text;
ServerInstance->Parser->TranslateUIDs(translate, text, output_text);
User* u = (User*)dest;
params.push_back(u->uuid);
params.push_back(output_text);
- command = "MODE";
+ Utils->DoOneToMany(user->uuid, "MODE", params);
}
else
{
params.push_back(c->name);
params.push_back(ConvToStr(c->age));
params.push_back(output_text);
- command = "FMODE";
+ Utils->DoOneToMany(user->uuid, "FMODE", params);
}
-
- Utils->DoOneToMany(user->uuid, command, params);
}
}
{
if (IS_LOCAL(user))
{
- if (awaymsg.empty())
- {
- parameterlist params;
- Utils->DoOneToMany(user->uuid,"AWAY",params);
- }
- else
+ parameterlist params;
+ if (!awaymsg.empty())
{
- parameterlist params;
params.push_back(ConvToStr(user->awaytime));
params.push_back(":" + awaymsg);
- Utils->DoOneToMany(user->uuid,"AWAY",params);
}
+ Utils->DoOneToMany(user->uuid, "AWAY", params);
}
return MOD_RES_PASSTHRU;
if (target_type == TYPE_USER)
{
User* u = (User*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
+ s->WriteLine(":"+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
}
else if (target_type == TYPE_CHANNEL)
{
Channel* c = (Channel*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
+ s->WriteLine(":"+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
}
}
}
User* u = dynamic_cast<User*>(target);
Channel* c = dynamic_cast<Channel*>(target);
if (u)
- s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
+ s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
else if (c)
- s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
+ s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
else if (!target)
- s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
+ s->WriteLine(":"+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
}
CullResult ModuleSpanningTree::cull()
projects / user / henk / code / inspircd.git / blobdiff