X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=b37edf583c776c483494c725bb22120828037b7f;hb=58385dd458e927994957b6d603f7f9da3fc52e14;hp=56b208d2c50422a0e262d56284bb48df204cc336;hpb=1c63bc4c57bb27b305b1624a4c8e415ac914662b;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 56b208d2c..b37edf583 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -37,19 +37,11 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
: Module(Me), max_local(0), max_global(0)
{
ServerInstance->Modules->UseInterface("BufferedSocketHook");
- Utils = new SpanningTreeUtilities(Me, this);
+ Utils = new SpanningTreeUtilities(ServerInstance, this);
command_rconnect = new cmd_rconnect(ServerInstance, this, Utils);
ServerInstance->AddCommand(command_rconnect);
command_rsquit = new cmd_rsquit(ServerInstance, this, Utils);
ServerInstance->AddCommand(command_rsquit);
- if (Utils->EnableTimeSync)
- {
- SyncTimer = new TimeSyncTimer(ServerInstance, this);
- ServerInstance->Timers->AddTimer(SyncTimer);
- }
- else
- SyncTimer = NULL;
-
RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
ServerInstance->Timers->AddTimer(RefreshTimer);
@@ -98,7 +90,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
else if ((Current->Hidden) && (!IS_OPER(user)))
return;
- user->WriteServ("364 %s %s %s :%d %s", user->nick,Current->GetName().c_str(),
+ user->WriteNumeric(364, "%s %s %s :%d %s", user->nick,Current->GetName().c_str(),
(Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName : Parent.c_str(),
(Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
Current->GetDesc().c_str());
@@ -114,14 +106,14 @@ int ModuleSpanningTree::CountServs()
return Utils->serverlist.size();
}
-void ModuleSpanningTree::HandleLinks(const char** parameters, int pcnt, User* user)
+void ModuleSpanningTree::HandleLinks(const char* const* parameters, int pcnt, User* user)
{
ShowLinks(Utils->TreeRoot,user,0);
- user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
+ user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick);
return;
}
-void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* user)
+void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, User* user)
{
unsigned int n_users = ServerInstance->Users->UserCount();
@@ -149,23 +141,23 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* u
}
}
}
- user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,
+ user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick,
n_users-ServerInstance->Users->ModeCount('i'),
ServerInstance->Users->ModeCount('i'),
ulined_count ? this->CountServs() - ulined_count : this->CountServs());
if (ServerInstance->Users->OperCount())
- user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount());
+ user->WriteNumeric(252, "%s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount());
if (ServerInstance->Users->UnregisteredUserCount())
- user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount());
+ user->WriteNumeric(253, "%s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount());
if (ServerInstance->ChannelCount())
- user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount());
+ user->WriteNumeric(254, "%s %ld :channels formed",user->nick,ServerInstance->ChannelCount());
- user->WriteServ("255 %s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
- user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local);
- user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global);
+ user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
+ user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local);
+ user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d",user->nick,n_users,max_global);
return;
}
@@ -222,11 +214,19 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
}
}
- /* Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
+ /*
+ * Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
* This prevents lost REMOTECONNECT notices
+ * XXX this should probably not do this until server has been bursting for, say, 60 seconds or something
*/
for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
- Utils->SetRemoteBursting(i->second, false);
+ {
+ if (i->second->bursting)
+ {
+ ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", i->second->GetName().c_str());
+ i->second->FinishBurst();
+ }
+ }
}
void ModuleSpanningTree::ConnectServer(Link* x)
@@ -314,14 +314,14 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
}
}
-int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* user)
+int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, User* user)
{
// we've already checked if pcnt > 0, so this is safe
TreeServer* found = Utils->FindServerMask(parameters[0]);
if (found)
{
std::string Version = found->GetVersion();
- user->WriteServ("351 %s :%s",user->nick,Version.c_str());
+ user->WriteNumeric(351, "%s :%s",user->nick,Version.c_str());
if (found == Utils->TreeRoot)
{
ServerInstance->Config->Send005(user);
@@ -329,7 +329,7 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* u
}
else
{
- user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
+ user->WriteNumeric(402, "%s %s :No such server",user->nick,parameters[0]);
}
return 1;
}
@@ -384,7 +384,7 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
SendingRemoteMessage = false;
}
-int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* user)
+int ModuleSpanningTree::HandleConnect(const char* const* parameters, int pcnt, User* user)
{
for (std::vector::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
{
@@ -408,17 +408,6 @@ int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* u
return 1;
}
-void ModuleSpanningTree::BroadcastTimeSync()
-{
- if (Utils->MasterTime)
- {
- std::deque params;
- params.push_back(ConvToStr(ServerInstance->Time(false)));
- params.push_back("FORCE");
- Utils->DoOneToMany(ServerInstance->Config->GetSID(), "TIMESET", params);
- }
-}
-
void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description)
{
TreeServer* s = Utils->FindServer(servername);
@@ -428,13 +417,14 @@ void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,st
}
}
-void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel)
+void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry)
{
if (IS_LOCAL(source))
{
std::deque params;
params.push_back(dest->uuid);
params.push_back(channel->name);
+ params.push_back(ConvToStr(expiry));
Utils->DoOneToMany(source->uuid,"INVITE",params);
}
}
@@ -682,7 +672,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
/** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
*/
if (irc::string(user->nick) != assign(oldnick))
- user->age = ServerInstance->Time(true);
+ user->age = ServerInstance->Time();
params.push_back(ConvToStr(user->age));
Utils->DoOneToMany(user->uuid,"NICK",params);
@@ -752,14 +742,14 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
}
}
-void ModuleSpanningTree::OnAddLine(XLine* line, User* user)
+void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
{
- if (line->type == "K")
+ if (!x->IsBurstable())
return;
char data[MAXBUF];
- snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", line->type.c_str(), line->Displayable(), ServerInstance->Config->ServerName, line->set_time,
- line->duration, line->reason);
+ snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
+ ServerInstance->Config->ServerName, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason);
std::deque params;
params.push_back(data);
@@ -775,13 +765,13 @@ void ModuleSpanningTree::OnAddLine(XLine* line, User* user)
}
}
-void ModuleSpanningTree::OnDelLine(XLine* line, User* user)
+void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
{
- if (line->type == "K")
+ if (x->type == "K")
return;
char data[MAXBUF];
- snprintf(data,MAXBUF,"%s %s", line->type.c_str(), line->Displayable());
+ snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
std::deque params;
params.push_back(data);
@@ -894,7 +884,14 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void*
void ModuleSpanningTree::OnEvent(Event* event)
{
std::deque* params = (std::deque*)event->GetData();
- if (event->GetEventID() == "send_metadata")
+ if (event->GetEventID() == "send_encap")
+ {
+ if (params->size() < 2)
+ return;
+
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", *params);
+ }
+ else if (event->GetEventID() == "send_metadata")
{
if (params->size() < 3)
return;
@@ -907,7 +904,7 @@ void ModuleSpanningTree::OnEvent(Event* event)
return;
(*params)[1] = ":" + (*params)[1];
params->insert(params->begin() + 1,ServerInstance->Config->ServerName);
- params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time(true)));
+ params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time()));
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC",*params);
}
else if (event->GetEventID() == "send_mode")
@@ -931,10 +928,10 @@ void ModuleSpanningTree::OnEvent(Event* event)
}
else
{
- Channel* a = ServerInstance->FindChan((*params)[0]);
- if (a)
+ Channel* c = ServerInstance->FindChan((*params)[0]);
+ if (c)
{
- ourTS = a->age;
+ ourTS = c->age;
params->insert(params->begin() + 1,ConvToStr(ourTS));
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",*params);
}
@@ -993,8 +990,6 @@ ModuleSpanningTree::~ModuleSpanningTree()
{
/* This will also free the listeners */
delete Utils;
- if (SyncTimer)
- ServerInstance->Timers->DelTimer(SyncTimer);
ServerInstance->Timers->DelTimer(RefreshTimer);
@@ -1003,7 +998,7 @@ ModuleSpanningTree::~ModuleSpanningTree()
Version ModuleSpanningTree::GetVersion()
{
- return Version(1,1,0,2,VF_VENDOR,API_VERSION);
+ return Version(1,2,0,2,VF_VENDOR,API_VERSION);
}
/* It is IMPORTANT that m_spanningtree is the last module in the chain