]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/netburst.cpp
m_spanningtree Fix routing of unicast messages
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / netburst.cpp
index d4669442a1a567e833415a48640352102a2c4096..a33cf8a134004f22a690ea5344f7d07dfc43acfb 100644 (file)
 #include "treeserver.h"
 #include "main.h"
 #include "commands.h"
+#include "protocolinterface.h"
+
+/**
+ * Creates FMODE messages, used only when syncing channels
+ */
+class FModeBuilder : public CmdBuilder
+{
+       static const size_t maxline = 480;
+       std::string params;
+       unsigned int modes;
+       std::string::size_type startpos;
+
+ public:
+       FModeBuilder(Channel* chan)
+               : CmdBuilder("FMODE"), modes(0)
+       {
+               push(chan->name).push_int(chan->age).push_raw(" +");
+               startpos = str().size();
+       }
+
+       /** Add a mode to the message
+        */
+       void push_mode(const char modeletter, const std::string& mask)
+       {
+               push_raw(modeletter);
+               params.push_back(' ');
+               params.append(mask);
+               modes++;
+       }
+
+       /** Remove all modes from the message
+        */
+       void clear()
+       {
+               content.erase(startpos);
+               params.clear();
+               modes = 0;
+       }
+
+       /** Prepare the message for sending, next mode can only be added after clear()
+        */
+       const std::string& finalize()
+       {
+               return push_raw(params);
+       }
+
+       /** Returns true if the given mask can be added to the message, false if the message
+        * has no room for the mask
+        */
+       bool has_room(const std::string& mask) const
+       {
+               return ((str().size() + params.size() + mask.size() + 2 <= maxline) &&
+                               (modes < ServerInstance->Config->Limits.MaxModes));
+       }
+
+       /** Returns true if this message is empty (has no modes)
+        */
+       bool empty() const
+       {
+               return (modes == 0);
+       }
+};
+
+struct TreeSocket::BurstState
+{
+       SpanningTreeProtocolInterface::Server server;
+       BurstState(TreeSocket* sock) : server(sock) { }
+};
 
 /** This function is called when we want to send a netburst to a local
  * server. There is a set order we must do this, because for example
@@ -45,14 +113,17 @@ void TreeSocket::DoBurst(TreeServer* s)
        this->WriteLine(":" + ServerInstance->Config->GetSID() + " VERSION :"+ServerInstance->GetVersionString());
        /* Send server tree */
        this->SendServers(Utils->TreeRoot, s);
+
+       BurstState bs(this);
        /* Send users and their oper status */
-       this->SendUsers();
+       this->SendUsers(bs);
 
-       for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
-               SyncChannel(i->second);
+       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, (Utils->Creator,(void*)this));
+       FOREACH_MOD(OnSyncNetwork, (bs.server));
        this->WriteLine(":" + ServerInstance->Config->GetSID() + " ENDBURST");
        ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
 }
@@ -107,9 +178,6 @@ void TreeSocket::SendFJoins(Channel* c)
                line.append(modestr).append(1, ',').append(i->first->uuid).push_back(' ');
        }
        this->WriteLine(line);
-
-       ChanModeReference ban(NULL, "ban");
-       static_cast<ListModeBase*>(*ban)->DoSyncChannel(c, Utils->Creator, this);
 }
 
 /** Send all XLines we know about */
@@ -139,8 +207,39 @@ void TreeSocket::SendXLines()
        }
 }
 
+void TreeSocket::SendListModes(Channel* chan)
+{
+       FModeBuilder fmode(chan);
+       const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
+       for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i)
+       {
+               ListModeBase* mh = *i;
+               ListModeBase::ModeList* list = mh->GetList(chan);
+               if (!list)
+                       continue;
+
+               // Add all items on the list to the FMODE, send it whenever it becomes too long
+               const char modeletter = mh->GetModeChar();
+               for (ListModeBase::ModeList::const_iterator j = list->begin(); j != list->end(); ++j)
+               {
+                       const std::string& mask = j->mask;
+                       if (!fmode.has_room(mask))
+                       {
+                               // No room for this mask, send the current line as-is then add the mask to a
+                               // new, empty FMODE message
+                               this->WriteLine(fmode.finalize());
+                               fmode.clear();
+                       }
+                       fmode.push_mode(modeletter, mask);
+               }
+       }
+
+       if (!fmode.empty())
+               this->WriteLine(fmode.finalize());
+}
+
 /** Send channel topic, modes and metadata */
-void TreeSocket::SyncChannel(Channel* chan)
+void TreeSocket::SyncChannel(Channel* chan, BurstState& bs)
 {
        SendFJoins(chan);
 
@@ -149,21 +248,32 @@ void TreeSocket::SyncChannel(Channel* chan)
        if (chan->topicset != 0)
                this->WriteLine(CommandFTopic::Builder(chan));
 
+       SendListModes(chan);
+
        for (Extensible::ExtensibleStore::const_iterator i = chan->GetExtList().begin(); i != chan->GetExtList().end(); i++)
        {
                ExtensionItem* item = i->first;
                std::string value = item->serialize(FORMAT_NETWORK, chan, i->second);
                if (!value.empty())
-                       Utils->Creator->ProtoSendMetaData(this, chan, item->name, value);
+                       this->WriteLine(CommandMetadata::Builder(chan, item->name, value));
        }
 
-       FOREACH_MOD(OnSyncChannel, (chan, Utils->Creator, this));
+       FOREACH_MOD(OnSyncChannel, (chan, bs.server));
+}
+
+void TreeSocket::SyncChannel(Channel* chan)
+{
+       BurstState bs(this);
+       SyncChannel(chan, bs);
 }
 
 /** send all users and their oper state/modes */
-void TreeSocket::SendUsers()
+void TreeSocket::SendUsers(BurstState& bs)
 {
-       for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
+       ProtocolInterface::Server& piserver = bs.server;
+
+       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)
@@ -183,10 +293,9 @@ void TreeSocket::SendUsers()
                        ExtensionItem* item = i->first;
                        std::string value = item->serialize(FORMAT_NETWORK, u->second, i->second);
                        if (!value.empty())
-                               Utils->Creator->ProtoSendMetaData(this, u->second, item->name, value);
+                               this->WriteLine(CommandMetadata::Builder(user, item->name, value));
                }
 
-               FOREACH_MOD(OnSyncUser, (user, Utils->Creator, this));
+               FOREACH_MOD(OnSyncUser, (user, piserver));
        }
 }
-