* | 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
/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
-bool SpanningTreeUtilities::IsSID(const std::string &str)
-{
- /* Returns true if the string given is exactly 3 characters long,
- * starts with a digit, and the other two characters are A-Z or digits
- */
- return ((str.length() == 3) && isdigit(str[0]) &&
- ((str[1] >= 'A' && str[1] <= 'Z') || isdigit(str[1])) &&
- ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
-}
-
/** Yay for fast searches!
* This is hundreds of times faster than recursion
* or even scanning a linked list, especially when
*/
TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
{
- if (IsSID(ServerName))
+ if (this->ServerInstance->IsSID(ServerName))
return this->FindServerID(ServerName);
server_hash::iterator iter = serverlist.find(ServerName.c_str());
}
}
-TreeServer* SpanningTreeUtilities::FindRemoteBurstServer(TreeServer* Server)
-{
- server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str());
- if (iter != RemoteServersBursting.end())
- return iter->second;
- else
- return NULL;
-}
-
-TreeSocket* SpanningTreeUtilities::FindBurstingServer(const std::string &ServerName)
-{
- std::map<irc::string,TreeSocket*>::iterator iter;
- iter = burstingserverlist.find(ServerName.c_str());
- if (iter != burstingserverlist.end())
- {
- return iter->second;
- }
- else
- {
- return NULL;
- }
-}
-
-void SpanningTreeUtilities::SetRemoteBursting(TreeServer* Server, bool bursting)
-{
- server_hash::iterator iter = RemoteServersBursting.find(Server->GetName().c_str());
- if (bursting)
- {
- if (iter == RemoteServersBursting.end())
- RemoteServersBursting.insert(make_pair(Server->GetName(), Server));
- else return;
- }
- else
- {
- if (iter != RemoteServersBursting.end())
- RemoteServersBursting.erase(iter);
- else return;
- }
- ServerInstance->Log(DEBUG,"Server %s is %sbursting nicknames", Server->GetName().c_str(), bursting ? "" : "no longer ");
-}
-
-void SpanningTreeUtilities::AddBurstingServer(const std::string &ServerName, TreeSocket* s)
-{
- std::map<irc::string,TreeSocket*>::iterator iter = burstingserverlist.find(ServerName.c_str());
- if (iter == burstingserverlist.end())
- burstingserverlist[ServerName.c_str()] = s;
-}
-
-void SpanningTreeUtilities::DelBurstingServer(TreeSocket* s)
-{
- for (std::map<irc::string,TreeSocket*>::iterator iter = burstingserverlist.begin(); iter != burstingserverlist.end(); iter++)
- {
- if (iter->second == s)
- {
- burstingserverlist.erase(iter);
- return;
- }
- }
-}
-
/** Returns the locally connected server we must route a
* message through to reach server 'ServerName'. This
* only applies to one-to-one and not one-to-many routing.
{
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");
{
Channel* c = ServerInstance->FindChan(params[0]);
User* u = ServerInstance->FindNick(prefix);
- if (c && u)
+ if (c)
{
CUList elist;
TreeServerList list;
ConfigReader* Conf = new ConfigReader(ServerInstance);
if (rebind)
{
+ for (unsigned int i = 0; i < Bindings.size(); i++)
+ {
+ ServerInstance->SE->DelFd(Bindings[i]);
+ Bindings[i]->Close();
+ }
+ ServerInstance->BufferedSocketCull();
+ Bindings.clear();
+
for (int j = 0; j < Conf->Enumerate("bind"); j++)
{
std::string Type = Conf->ReadValue("bind","type",j);
{
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);
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);
PingWarnTime = Conf->ReadInteger("options", "pingwarning", 0, true);
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