*/
TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
{
- if (ServerInstance->IsSID(ServerName))
+ if (InspIRCd::IsSID(ServerName))
return this->FindServerID(ServerName);
server_hash::iterator iter = serverlist.find(ServerName.c_str());
return NULL;
}
-/* A convenient wrapper that returns true if a server exists */
-bool SpanningTreeUtilities::IsServer(const std::string &ServerName)
-{
- return (FindServer(ServerName) != NULL);
-}
-
SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C)
{
- ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
this->ReadConfiguration();
return;
}
-bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, const parameterlist ¶ms)
-{
- TreeServer* omitroute = this->BestRouteTo(omit);
- unsigned int items =this->TreeRoot->ChildCount();
- for (unsigned int x = 0; x < items; x++)
- {
- TreeServer* Route = this->TreeRoot->GetChild(x);
- if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route))
- {
- TreeSocket* Sock = Route->GetSocket();
- if (Sock)
- Sock->WriteLine(data);
- }
- }
- return true;
-}
-
bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist ¶ms, std::string omit)
{
TreeServer* omitroute = this->BestRouteTo(omit);
for (std::vector<reference<Link> >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i)
{
Link* L = *i;
- if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || !L->Port)
+ if (!L->Port)
{
- if (L->Name.empty())
- {
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a malformed link block (all link blocks require a name!)");
- }
- else
- {
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a link block missing recvpass, sendpass, port or ipaddr.");
- }
-
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"m_spanningtree: Ignoring a link block without a port.");
/* Invalid link block */
continue;
}
irc::sockets::sockaddrs dummy;
bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy);
- if (ipvalid)
+ if ((L->IPAddr == "*") || (ipvalid))
ValidIPs.push_back(L->IPAddr);
else
{
try
{
- bool cached;
+ bool cached = false;
SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, L, cached, DNS_QUERY_AAAA);
ServerInstance->AddResolver(sr, cached);
}
void SpanningTreeUtilities::ReadConfiguration()
{
- ConfigReader Conf;
-
- FlatLinks = Conf.ReadFlag("security","flatlinks",0);
- HideULines = Conf.ReadFlag("security","hideulines",0);
- AnnounceTSChange = Conf.ReadFlag("options","announcets",0);
- AllowOptCommon = Conf.ReadFlag("options", "allowmismatch", 0);
- ChallengeResponse = !Conf.ReadFlag("security", "disablehmac", 0);
- quiet_bursts = Conf.ReadFlag("performance", "quietbursts", 0);
- PingWarnTime = Conf.ReadInteger("options", "pingwarning", 0, true);
- PingFreq = Conf.ReadInteger("options", "serverpingfreq", 0, true);
+ ConfigTag* security = ServerInstance->Config->ConfValue("security");
+ ConfigTag* options = ServerInstance->Config->ConfValue("options");
+ FlatLinks = security->getBool("flatlinks");
+ HideULines = security->getBool("hideulines");
+ AnnounceTSChange = options->getBool("announcets");
+ AllowOptCommon = options->getBool("allowmismatch");
+ ChallengeResponse = !security->getBool("disablehmac");
+ quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
+ PingWarnTime = options->getInt("pingwarning");
+ PingFreq = options->getInt("serverpingfreq");
if (PingFreq == 0)
PingFreq = 60;
AutoconnectBlocks.clear();
LinkBlocks.clear();
- ValidIPs.clear();
ConfigTagList tags = ServerInstance->Config->ConfTags("link");
for(ConfigIter i = tags.first; i != tags.second; ++i)
{
ConfigTag* tag = i->second;
reference<Link> L = new Link(tag);
- L->Name = tag->getString("name").c_str();
+ std::string linkname = tag->getString("name");
+ L->Name = linkname.c_str();
L->AllowMask = tag->getString("allowmask");
L->IPAddr = tag->getString("ipaddr");
L->Port = tag->getInt("port");
L->Bind = tag->getString("bind");
L->Hidden = tag->getBool("hidden");
+ if (L->Name.empty())
+ throw ModuleException("Invalid configuration, found a link tag without a name!" + (!L->IPAddr.empty() ? " IP address: "+L->IPAddr : ""));
+
if (L->Name.find('.') == std::string::npos)
- throw CoreException("The link name '"+assign(L->Name)+"' is invalid and must contain at least one '.' character");
+ throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it must contain at least one '.' character");
if (L->Name.length() > 64)
- throw CoreException("The link name '"+assign(L->Name)+"' is longer than 64 characters!");
-
- if (L->Fingerprint.find(':') != std::string::npos)
- {
- std::string tmp = L->Fingerprint;
- L->Fingerprint.clear();
- for(unsigned int j=0; j < tmp.length(); j++)
- if (tmp[j] != ':')
- L->Fingerprint.push_back(tmp[j]);
- }
+ throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it is longer than 64 characters");
- if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
- {
- ValidIPs.push_back(L->IPAddr);
- }
- else
- {
- if (L->IPAddr.empty())
- {
- L->IPAddr = "*";
- ValidIPs.push_back("*");
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L->Name) + " has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
- }
+ if (L->RecvPass.empty())
+ throw ModuleException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined");
- if (L->RecvPass.empty())
- {
- throw CoreException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined!");
- }
+ if (L->SendPass.empty())
+ throw ModuleException("Invalid configuration for server '"+assign(L->Name)+"', sendpass not defined");
- if (L->SendPass.empty())
- {
- throw CoreException("Invalid configuration for server '"+assign(L->Name)+"', sendpass not defined!");
- }
+ if ((L->SendPass.find(' ') != std::string::npos) || (L->RecvPass.find(' ') != std::string::npos))
+ throw ModuleException("Link block '" + assign(L->Name) + "' has a password set that contains a space character which is invalid");
- if (L->Name.empty())
- {
- throw CoreException("Invalid configuration, link tag without a name! IP address: "+L->IPAddr);
- }
+ if ((L->SendPass[0] == ':') || (L->RecvPass[0] == ':'))
+ throw ModuleException("Link block '" + assign(L->Name) + "' has a password set that begins with a colon (:) which is invalid");
- if (!L->Port)
- {
- ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block " + assign(L->Name) + " has no port defined, you will not be able to /connect it.");
- }
+ if (L->IPAddr.empty())
+ {
+ L->IPAddr = "*";
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
}
+ if (!L->Port)
+ ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no port defined, you will not be able to /connect it.");
+
+ L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
LinkBlocks.push_back(L);
}
if (A->Period <= 0)
{
- throw CoreException("Invalid configuration for autoconnect, period not a positive integer!");
+ throw ModuleException("Invalid configuration for autoconnect, period not a positive integer!");
}
if (A->servers.empty())
{
- throw CoreException("Invalid configuration for autoconnect, server cannot be empty!");
+ throw ModuleException("Invalid configuration for autoconnect, server cannot be empty!");
}
AutoconnectBlocks.push_back(A);
projects / user / henk / code / inspircd.git / blobdiff