Rollback complete! Everyone please go through the code and check i havent forgotten...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.cpp

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0deaeb3ba247c464615927886b09976c495e8936..8014d562d15a0db7561a5997ace5549796ac0b00 100644 (file)
--- 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);
 
@@ -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);
        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();
 
@@ -322,7 +314,7 @@ 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]);
@@ -392,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<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
        {
@@ -416,17 +408,6 @@ int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* u
        return 1;
 }
 
-void ModuleSpanningTree::BroadcastTimeSync()
-{
-       if (Utils->MasterTime)
-       {
-               std::deque<std::string> 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);
@@ -436,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<std::string> params;
                params.push_back(dest->uuid);
                params.push_back(channel->name);
+               params.push_back(ConvToStr(expiry));
                Utils->DoOneToMany(source->uuid,"INVITE",params);
        }
 }
@@ -690,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);
@@ -760,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, (unsigned long)line->set_time, (unsigned long)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<std::string> params;
        params.push_back(data);
 
@@ -783,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<std::string> params;
        params.push_back(data);
 
@@ -915,7 +897,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")
@@ -939,10 +921,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);
                        }
@@ -1001,8 +983,6 @@ ModuleSpanningTree::~ModuleSpanningTree()
 {
        /* This will also free the listeners */
        delete Utils;
-       if (SyncTimer)
-               ServerInstance->Timers->DelTimer(SyncTimer);
 
        ServerInstance->Timers->DelTimer(RefreshTimer);