{
for (server_hash::iterator i = serverlist.begin(); i != serverlist.end(); i++)
{
- if (match(i->first.c_str(),ServerName.c_str()))
+ if (match(i->first,ServerName))
return i->second;
}
return NULL;
{
Bindings.clear();
+ ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
+
this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook");
/* returns a list of DIRECT servernames for a specific channel */
void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list)
{
- CUList *ulist;
- switch (status)
- {
- case '@':
- ulist = c->GetOppedUsers();
- break;
- case '%':
- ulist = c->GetHalfoppedUsers();
- break;
- case '+':
- ulist = c->GetVoicedUsers();
- break;
- default:
- ulist = c->GetUsers();
- break;
- }
+ CUList *ulist = c->GetUsers();
+
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((i->first->GetFd() < 0) && (exempt_list.find(i->first) == exempt_list.end()))
+ if (IS_LOCAL(i->first))
+ continue;
+
+ if (status && !strchr(c->GetAllPrefixChars(i->first), status))
+ continue;
+
+ if (exempt_list.find(i->first) == exempt_list.end())
{
TreeServer* best = this->BestRouteTo(i->first->server);
if (best)
if (params.size() >= 2)
{
/* Prefixes */
- if ((*(params[0].c_str()) == '@') || (*(params[0].c_str()) == '%') || (*(params[0].c_str()) == '+'))
+ if (ServerInstance->Modes->FindPrefix(params[0][0]))
{
pfx = params[0][0];
params[0] = params[0].substr(1, params[0].length()-1);
{
Channel* c = ServerInstance->FindChan(params[0]);
User* u = ServerInstance->FindNick(prefix);
- if (c && u)
+ if (c)
{
CUList elist;
TreeServerList list;
ValidIPs.clear();
for (std::vector<Link>::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++)
{
- if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
+ if (L->IPAddr.empty() || L->RecvPass.empty() || L->SendPass.empty() || L->Name.empty() || L->Port)
{
- ValidIPs.push_back(L->IPAddr);
-
- if (L->AllowMask.length())
- ValidIPs.push_back(L->AllowMask);
-
- /* Needs resolving */
- bool ipvalid = true;
- QueryType start_type = DNS_QUERY_A;
-#ifdef IPV6
- start_type = DNS_QUERY_AAAA;
- if (strchr(L->IPAddr.c_str(),':'))
+ if (L->Name.empty())
{
- in6_addr n;
- if (inet_pton(AF_INET6, L->IPAddr.c_str(), &n) < 1)
- ipvalid = false;
+ 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.");
+ }
+
+ /* Invalid link block */
+ continue;
+ }
+
+ ValidIPs.push_back(L->IPAddr);
+
+ if (L->AllowMask.length())
+ ValidIPs.push_back(L->AllowMask);
+
+ /* Needs resolving */
+ bool ipvalid = true;
+ QueryType start_type = DNS_QUERY_A;
+#ifdef IPV6
+ start_type = DNS_QUERY_AAAA;
+ if (strchr(L->IPAddr.c_str(),':'))
+ {
+ in6_addr n;
+ if (inet_pton(AF_INET6, L->IPAddr.c_str(), &n) < 1)
+ ipvalid = false;
+ }
+ else
#endif
+ {
+ in_addr n;
+ if (inet_aton(L->IPAddr.c_str(),&n) < 1)
+ ipvalid = false;
+ }
+
+ if (!ipvalid)
+ {
+ try
{
- in_addr n;
- if (inet_aton(L->IPAddr.c_str(),&n) < 1)
- ipvalid = false;
+ bool cached;
+ SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type);
+ ServerInstance->AddResolver(sr, cached);
}
- if (!ipvalid)
+ catch (...)
{
- try
- {
- bool cached;
- SecurityIPResolver* sr = new SecurityIPResolver((Module*)this->Creator, this, ServerInstance, L->IPAddr, *L, cached, start_type);
- ServerInstance->AddResolver(sr, cached);
- }
- catch (...)
- {
- }
}
}
}
{
irc::portparser portrange(Port, false);
int portno = -1;
+
+ if (IP == "*")
+ IP.clear();
+
while ((portno = portrange.GetToken()))
{
- if (IP == "*")
- IP.clear();
-
if ((!transport.empty()) && (hooks.find(transport.c_str()) == hooks.end()))
{
throw CoreException("Can't find transport type '"+transport+"' for port "+IP+":"+Port+" - maybe you forgot to load it BEFORE m_spanningtree in your config file?");
TreeSocket* listener = new TreeSocket(this, ServerInstance, IP.c_str(), portno, true, 10, transport.empty() ? NULL : hooks[transport.c_str()]);
if (listener->GetState() == I_LISTENING)
{
- ServerInstance->Log(DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno);
+ ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Binding server port %s:%d successful!", IP.c_str(), portno);
Bindings.push_back(listener);
}
else
{
- ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno));
+ ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno));
listener->Close();
}
}
}
}
}
- FlatLinks = Conf->ReadFlag("options","flatlinks",0);
- HideULines = Conf->ReadFlag("options","hideulines",0);
+ FlatLinks = Conf->ReadFlag("security","flatlinks",0);
+ HideULines = Conf->ReadFlag("security","hideulines",0);
AnnounceTSChange = Conf->ReadFlag("options","announcets",0);
- EnableTimeSync = Conf->ReadFlag("timesync","enable",0);
- MasterTime = Conf->ReadFlag("timesync", "master", 0);
- ChallengeResponse = !Conf->ReadFlag("options", "disablehmac", 0);
- quiet_bursts = Conf->ReadFlag("options", "quietbursts", 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);
/* Bugfix by brain, do not allow people to enter bad configurations */
if (L.Name != ServerInstance->Config->ServerName)
{
- if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port))
- {
- if (L.Name.find('.') == std::string::npos)
- throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character");
+ if (L.Name.find('.') == std::string::npos)
+ throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character");
- if (L.Name.length() > 64)
- throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!");
-
- ValidIPs.push_back(L.IPAddr);
+ if (L.Name.length() > 64)
+ throw CoreException("The link name '"+assign(L.Name)+"' is longer than 64 characters!");
+ if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port))
+ {
if (Allow.length())
ValidIPs.push_back(Allow);
+ ValidIPs.push_back(L.IPAddr);
+
/* Needs resolving */
bool ipvalid = true;
QueryType start_type = DNS_QUERY_A;
{
}
}
-
- LinkBlocks.push_back(L);
}
else
{
if (L.IPAddr.empty())
{
- throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', IP address not defined!");
+ 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.");
}
- else if (L.RecvPass.empty())
+
+ if (L.RecvPass.empty())
{
throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', recvpass not defined!");
}
- else if (L.SendPass.empty())
+
+ if (L.SendPass.empty())
{
throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', sendpass not defined!");
}
- else if (L.Name.empty())
+
+ if (L.Name.empty())
{
throw CoreException("Invalid configuration, link tag without a name! IP address: "+L.IPAddr);
}
- else if (!L.Port)
+
+ if (!L.Port)
{
- throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', no port specified!");
+ 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.");
}
}
+
+
+ LinkBlocks.push_back(L);
}
else
{
TreeServer* CheckDupe = this->FindServer(x->FailOver.c_str());
if (CheckDupe)
{
- ServerInstance->Log(DEBUG,"Skipping existing failover: %s", x->FailOver.c_str());
+ ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Skipping existing failover: %s", x->FailOver.c_str());
}
else
{
projects / user / henk / code / inspircd.git / blobdiff