Remove current time parameter of the Timer constructor

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

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 0464590e885dfa503e1eb07afc9b136b01edd013..f96e47d6053ea0722f12d56798cb2ea7467cbd8a 100644 (file)
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -27,7 +27,6 @@
 #include "treeserver.h"
 #include "main.h"
 #include "commands.h"
-#include "protocolinterface.h"
 
 /**
  * Creates FMODE messages, used only when syncing channels
@@ -108,9 +107,7 @@ void TreeSocket::DoBurst(TreeServer* s)
                capab->auth_fingerprint ? "SSL Fingerprint and " : "",
                capab->auth_challenge ? "challenge-response" : "plaintext password");
        this->CleanNegotiationInfo();
-       this->WriteLine(":" + ServerInstance->Config->GetSID() + " BURST " + ConvToStr(ServerInstance->Time()));
-       /* send our version string */
-       this->WriteLine(":" + ServerInstance->Config->GetSID() + " VERSION :"+ServerInstance->GetVersionString());
+       this->WriteLine(CmdBuilder("BURST").push_int(ServerInstance->Time()));
        /* Send server tree */
        this->SendServers(Utils->TreeRoot, s);
 
@@ -118,15 +115,25 @@ void TreeSocket::DoBurst(TreeServer* s)
        /* Send users and their oper status */
        this->SendUsers(bs);
 
-       for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
+       const chan_hash& chans = ServerInstance->GetChans();
+       for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
                SyncChannel(i->second, bs);
 
        this->SendXLines();
        FOREACH_MOD(OnSyncNetwork, (bs.server));
-       this->WriteLine(":" + ServerInstance->Config->GetSID() + " ENDBURST");
+       this->WriteLine(CmdBuilder("ENDBURST"));
        ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
 }
 
+void TreeSocket::SendServerInfo(TreeServer* from)
+{
+       // Send public version string
+       this->WriteLine(CommandSInfo::Builder(from, "version", from->GetVersion()));
+
+       // Send full version string that contains more information and is shown to opers
+       this->WriteLine(CommandSInfo::Builder(from, "fullversion", from->GetFullVersion()));
+}
+
 /** Recursively send the server tree.
  * This is used during network burst to inform the other server
  * (and any of ITS servers too) of what servers we know about.
@@ -136,6 +143,8 @@ void TreeSocket::DoBurst(TreeServer* s)
  */
 void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 {
+       SendServerInfo(Current);
+
        const TreeServer::ChildServers& children = Current->GetChildren();
        for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
        {
@@ -143,7 +152,6 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
                if (recursive_server != s)
                {
                        this->WriteLine(CommandServer::Builder(recursive_server));
-                       this->WriteLine(":" + recursive_server->GetID() + " VERSION :" + recursive_server->GetVersion());
                        /* down to next level */
                        this->SendServers(recursive_server, s);
                }
@@ -158,25 +166,21 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
  */
 void TreeSocket::SendFJoins(Channel* c)
 {
-       std::string line(":");
-       line.append(ServerInstance->Config->GetSID()).append(" FJOIN ").append(c->name).append(1, ' ').append(ConvToStr(c->age)).append(" +");
-       std::string::size_type erase_from = line.length();
-       line.append(c->ChanModes(true)).append(" :");
-
+       CommandFJoin::Builder fjoin(c);
        const UserMembList *ulist = c->GetUsers();
 
        for (UserMembCIter i = ulist->begin(); i != ulist->end(); ++i)
        {
-               const std::string& modestr = i->second->modes;
-               if ((line.length() + modestr.length() + UIDGenerator::UUID_LENGTH + 2) > 480)
+               Membership* memb = i->second;
+               if (!fjoin.has_room(memb))
                {
-                       this->WriteLine(line);
-                       line.erase(erase_from);
-                       line.append(" :");
+                       // No room for this user, send the line and prepare a new one
+                       this->WriteLine(fjoin.finalize());
+                       fjoin.clear();
                }
-               line.append(modestr).append(1, ',').append(i->first->uuid).push_back(' ');
+               fjoin.add(memb);
        }
-       this->WriteLine(line);
+       this->WriteLine(fjoin.finalize());
 }
 
 /** Send all XLines we know about */
@@ -270,7 +274,9 @@ void TreeSocket::SyncChannel(Channel* chan)
 void TreeSocket::SendUsers(BurstState& bs)
 {
        ProtocolInterface::Server& piserver = bs.server;
-       for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
+
+       const user_hash& users = ServerInstance->Users->GetUsers();
+       for (user_hash::const_iterator u = users.begin(); u != users.end(); ++u)
        {
                User* user = u->second;
                if (user->registered != REG_ALL)
@@ -296,4 +302,3 @@ void TreeSocket::SendUsers(BurstState& bs)
                FOREACH_MOD(OnSyncUser, (user, piserver));
        }
 }
-