Fix some regressions in sending tags between servers.

[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 5115c7aa8a670b1566acebf1e91ee2e8ebeeea1d..f3f2ea7ac7ade4b8d26c0b7f5a36ca7a13ce2688 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 "modules/server.h"
 
 /**
  * Creates FMODE messages, used only when syncing channels
@@ -103,7 +102,7 @@ struct TreeSocket::BurstState
  */
 void TreeSocket::DoBurst(TreeServer* s)
 {
-       ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).",
+       ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \002%s\002 (Authentication: %s%s).",
                s->GetName().c_str(),
                capab->auth_fingerprint ? "SSL certificate fingerprint and " : "",
                capab->auth_challenge ? "challenge-response" : "plaintext password");
@@ -123,9 +122,9 @@ void TreeSocket::DoBurst(TreeServer* s)
 
        // Send all xlines
        this->SendXLines();
-       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnSyncNetwork, (bs.server));
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncNetwork, (bs.server));
        this->WriteLine(CmdBuilder("ENDBURST"));
-       ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
+       ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \002"+ s->GetName()+"\002.");
 
        this->burstsent = true;
 }
@@ -137,6 +136,9 @@ void TreeSocket::SendServerInfo(TreeServer* from)
 
        // Send full version string that contains more information and is shown to opers
        this->WriteLine(CommandSInfo::Builder(from, "fullversion", from->GetFullVersion()));
+
+       // Send the raw version string that just contains the base info
+       this->WriteLine(CommandSInfo::Builder(from, "rawversion", from->GetRawVersion()));
 }
 
 /** Recursively send the server tree.
@@ -262,7 +264,7 @@ void TreeSocket::SyncChannel(Channel* chan, BurstState& bs)
                        this->WriteLine(CommandMetadata::Builder(chan, item->name, value));
        }
 
-       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnSyncChannel, (chan, bs.server));
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncChannel, (chan, bs.server));
 }
 
 void TreeSocket::SyncChannel(Channel* chan)
@@ -298,6 +300,6 @@ void TreeSocket::SendUsers(BurstState& bs)
                                this->WriteLine(CommandMetadata::Builder(user, item->name, value));
                }
 
-               FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnSyncUser, (user, bs.server));
+               FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncUser, (user, bs.server));
        }
 }