X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnetburst.cpp;h=f3f2ea7ac7ade4b8d26c0b7f5a36ca7a13ce2688;hb=9cf381330eab69d7e5bf26684d1ec8075aee60a2;hp=f583a9d8fd7a90622daee968be3ffd57cd7a025d;hpb=173bc63cb59bbf19e73d1b823e3e9423c9f79860;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index f583a9d8f..f3f2ea7ac 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -102,27 +102,31 @@ 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 Fingerprint and " : "",
+		capab->auth_fingerprint ? "SSL certificate fingerprint and " : "",
 		capab->auth_challenge ? "challenge-response" : "plaintext password");
 	this->CleanNegotiationInfo();
 	this->WriteLine(CmdBuilder("BURST").push_int(ServerInstance->Time()));
-	/* Send server tree */
+	// Introduce all servers behind us
 	this->SendServers(Utils->TreeRoot, s);
 
 	BurstState bs(this);
-	/* Send users and their oper status */
+	// Introduce all users
 	this->SendUsers(bs);
 
+	// Sync all channels
 	const chan_hash& chans = ServerInstance->GetChans();
 	for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
 		SyncChannel(i->second, bs);
 
+	// Send all xlines
 	this->SendXLines();
-	FOREACH_MOD(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;
 }
 
 void TreeSocket::SendServerInfo(TreeServer* from)
@@ -132,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.
@@ -139,7 +146,6 @@ void TreeSocket::SendServerInfo(TreeServer* from)
  * (and any of ITS servers too) of what servers we know about.
  * If at any point any of these servers already exist on the other
  * end, our connection may be terminated.
- * The hopcount parameter (3rd) is deprecated, and is always 0.
  */
 void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 {
@@ -159,17 +165,14 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 }
 
 /** Send one or more FJOINs for a channel of users.
- * If the length of a single line is more than 480-NICKMAX
- * in length, it is split over multiple lines.
- * Send one or more FMODEs for a channel with the
- * channel bans, if there's any.
+ * If the length of a single line is too long, it is split over multiple lines.
  */
 void TreeSocket::SendFJoins(Channel* c)
 {
 	CommandFJoin::Builder fjoin(c);
 
-	const UserMembList& ulist = c->GetUsers();
-	for (UserMembCIter i = ulist.begin(); i != ulist.end(); ++i)
+	const Channel::MemberMap& ulist = c->GetUsers();
+	for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
 	{
 		Membership* memb = i->second;
 		if (!fjoin.has_room(memb))
@@ -241,7 +244,7 @@ void TreeSocket::SendListModes(Channel* chan)
 		this->WriteLine(fmode.finalize());
 }
 
-/** Send channel topic, modes and metadata */
+/** Send channel users, topic, modes and global metadata */
 void TreeSocket::SyncChannel(Channel* chan, BurstState& bs)
 {
 	SendFJoins(chan);
@@ -261,7 +264,7 @@ void TreeSocket::SyncChannel(Channel* chan, BurstState& bs)
 			this->WriteLine(CommandMetadata::Builder(chan, item->name, value));
 	}
 
-	FOREACH_MOD(OnSyncChannel, (chan, bs.server));
+	FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncChannel, (chan, bs.server));
 }
 
 void TreeSocket::SyncChannel(Channel* chan)
@@ -270,11 +273,9 @@ void TreeSocket::SyncChannel(Channel* chan)
 	SyncChannel(chan, bs);
 }
 
-/** send all users and their oper state/modes */
+/** Send all users and their state, including oper and away status and global metadata */
 void TreeSocket::SendUsers(BurstState& bs)
 {
-	ProtocolInterface::Server& piserver = bs.server;
-
 	const user_hash& users = ServerInstance->Users->GetUsers();
 	for (user_hash::const_iterator u = users.begin(); u != users.end(); ++u)
 	{
@@ -299,6 +300,6 @@ void TreeSocket::SendUsers(BurstState& bs)
 				this->WriteLine(CommandMetadata::Builder(user, item->name, value));
 		}
 
-		FOREACH_MOD(OnSyncUser, (user, piserver));
+		FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncUser, (user, bs.server));
 	}
 }