Core/NetworkIO: updated SMSG_ADDON_INFO, SMSG_CLIENTCACHE_VERSION, SMSG_MOTD

(cherry picked from commit f8e935a)

Author: joschiwald

src/server/game/Handlers/AuthHandler.cpp

@@ -15,9 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Opcodes.h"
 #include "WorldSession.h"
-#include "WorldPacket.h"
+#include "ClientConfigPackets.h"
 
 void WorldSession::SendAuthResponse(uint8 code, bool shortForm, uint32 queuePos)
 {
@@ -39,7 +38,8 @@ void WorldSession::SendAuthResponse(uint8 code, bool shortForm, uint32 queuePos)
 
 void WorldSession::SendClientCacheVersion(uint32 version)
 {
-    WorldPacket data(SMSG_CLIENTCACHE_VERSION, 4);
-    data << uint32(version);
-    SendPacket(&data);
+    WorldPackets::ClientConfig::ClientCacheVersion cache;
+    cache.CacheVersion = version;
+
+    SendPacket(cache.Write());
 }

src/server/game/Handlers/CharacterHandler.cpp

@@ -47,7 +47,6 @@
 #include "Realm.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
-#include "ServerMotd.h"
 #include "SocialMgr.h"
 #include "StringConvert.h"
 #include "SystemPackets.h"
@@ -765,9 +764,13 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder const& holder)
 
     // Send MOTD
     {
-        SendPacket(Motd::GetMotdPacket());
+        WorldPackets::System::MOTD motd;
+        motd.Text = &sWorld->GetMotd();
+        SendPacket(motd.Write());
+    }
 
-        // send server info
+    // send server info
+    {
         if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1)
             chH.PSendSysMessage(GitRevision::GetFullVersion());
     }

src/server/game/Motd/ServerMotd.cpp

@@ -23,6 +23,7 @@
 #include "CalendarPackets.h"
 #include "CharacterPackets.h"
 #include "ChatPackets.h"
+#include "ClientConfigPackets.h"
 #include "CombatLogPackets.h"
 #include "CombatPackets.h"
 #include "GuildPackets.h"

src/server/game/Motd/ServerMotd.h

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ClientConfigPackets.h"
+#include "AddonMgr.h"
+#include "WorldSession.h"
+
+namespace WorldPackets::ClientConfig
+{
+std::array<uint8, 256> const AddonInfo::PublicKey =
+{
+    0xC3, 0x5B, 0x50, 0x84, 0xB9, 0x3E, 0x32, 0x42, 0x8C, 0xD0, 0xC7, 0x48, 0xFA, 0x0E, 0x5D, 0x54,
+    0x5A, 0xA3, 0x0E, 0x14, 0xBA, 0x9E, 0x0D, 0xB9, 0x5D, 0x8B, 0xEE, 0xB6, 0x84, 0x93, 0x45, 0x75,
+    0xFF, 0x31, 0xFE, 0x2F, 0x64, 0x3F, 0x3D, 0x6D, 0x07, 0xD9, 0x44, 0x9B, 0x40, 0x85, 0x59, 0x34,
+    0x4E, 0x10, 0xE1, 0xE7, 0x43, 0x69, 0xEF, 0x7C, 0x16, 0xFC, 0xB4, 0xED, 0x1B, 0x95, 0x28, 0xA8,
+    0x23, 0x76, 0x51, 0x31, 0x57, 0x30, 0x2B, 0x79, 0x08, 0x50, 0x10, 0x1C, 0x4A, 0x1A, 0x2C, 0xC8,
+    0x8B, 0x8F, 0x05, 0x2D, 0x22, 0x3D, 0xDB, 0x5A, 0x24, 0x7A, 0x0F, 0x13, 0x50, 0x37, 0x8F, 0x5A,
+    0xCC, 0x9E, 0x04, 0x44, 0x0E, 0x87, 0x01, 0xD4, 0xA3, 0x15, 0x94, 0x16, 0x34, 0xC6, 0xC2, 0xC3,
+    0xFB, 0x49, 0xFE, 0xE1, 0xF9, 0xDA, 0x8C, 0x50, 0x3C, 0xBE, 0x2C, 0xBB, 0x57, 0xED, 0x46, 0xB9,
+    0xAD, 0x8B, 0xC6, 0xDF, 0x0E, 0xD6, 0x0F, 0xBE, 0x80, 0xB3, 0x8B, 0x1E, 0x77, 0xCF, 0xAD, 0x22,
+    0xCF, 0xB7, 0x4B, 0xCF, 0xFB, 0xF0, 0x6B, 0x11, 0x45, 0x2D, 0x7A, 0x81, 0x18, 0xF2, 0x92, 0x7E,
+    0x98, 0x56, 0x5D, 0x5E, 0x69, 0x72, 0x0A, 0x0D, 0x03, 0x0A, 0x85, 0xA2, 0x85, 0x9C, 0xCB, 0xFB,
+    0x56, 0x6E, 0x8F, 0x44, 0xBB, 0x8F, 0x02, 0x22, 0x68, 0x63, 0x97, 0xBC, 0x85, 0xBA, 0xA8, 0xF7,
+    0xB5, 0x40, 0x68, 0x3C, 0x77, 0x86, 0x6F, 0x4B, 0xD7, 0x88, 0xCA, 0x8A, 0xD7, 0xCE, 0x36, 0xF0,
+    0x45, 0x6E, 0xD5, 0x64, 0x79, 0x0F, 0x17, 0xFC, 0x64, 0xDD, 0x10, 0x6F, 0xF3, 0xF5, 0xE0, 0xA6,
+    0xC3, 0xFB, 0x1B, 0x8C, 0x29, 0xEF, 0x8E, 0xE5, 0x34, 0xCB, 0xD1, 0x2A, 0xCE, 0x79, 0xC3, 0x9A,
+    0x0D, 0x36, 0xEA, 0x01, 0xE0, 0xAA, 0x91, 0x20, 0x54, 0xF0, 0x72, 0xD8, 0x1E, 0xC7, 0x89, 0xD2
+};
+
+WorldPacket const* AddonInfo::Write()
+{
+    for (SecureAddonInfo const& addon : Addons)
+    {
+        // fresh install, not yet created Interface\Addons\addon_name\addon_name.pub files
+        uint8 infoProvided = addon.Status != SecureAddonInfo::BANNED || addon.HasKey;
+
+        _worldPacket << uint8(addon.Status);
+        _worldPacket << uint8(infoProvided);                        // InfoProvided
+        if (infoProvided)
+        {
+            _worldPacket << uint8(!addon.HasKey);                   // KeyProvided
+            if (!addon.HasKey)
+                _worldPacket.append(PublicKey);                     // KeyData
+
+            _worldPacket << uint32(0);                              // Revision (from .toc), can be used by SECURE_VISIBLE to display "update available" in client addon controls
+        }
+
+        _worldPacket << uint8(0);                                   // UrlProvided
+        //if (UrlProvided)
+        //    data << uint8(0);                                     // URL, client will create internet shortcut with this destination in Interface\Addons\addon_name\addon_name.url
+    }
+
+    _worldPacket << uint32(BannedAddons.size());
+
+    for (BannedAddon const& addon : BannedAddons)
+    {
+        _worldPacket << uint32(addon.Id);                           // Id
+        _worldPacket.append(addon.NameMD5);                         // NameMD5 - MD5 of addon .toc filename without extension
+        _worldPacket.append(addon.VersionMD5);                      // VersionMD5 - MD5 of version string declared in addon .toc file
+        _worldPacket << uint32(addon.Timestamp);                    // LastModified
+        _worldPacket << uint32(1);                                  // Flags
+    }
+
+    return &_worldPacket;
+}
+
+WorldPacket const* ClientCacheVersion::Write()
+{
+    _worldPacket << uint32(CacheVersion);
+
+    return &_worldPacket;
+}
+}

src/server/game/Server/Packets/AllPackets.h

@@ -0,0 +1,56 @@
+/*
+* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+*
+* This program is free software; you can redistribute it and/or modify it
+* under the terms of the GNU General Public License as published by the
+* Free Software Foundation; either version 2 of the License, or (at your
+* option) any later version.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+* more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef TRINITYCORE_CLIENT_CONFIG_PACKETS_H
+#define TRINITYCORE_CLIENT_CONFIG_PACKETS_H
+
+#include "Packet.h"
+#include <span>
+
+struct BannedAddon;
+struct SecureAddonInfo;
+
+namespace WorldPackets
+{
+    namespace ClientConfig
+    {
+        class AddonInfo final : public ServerPacket
+        {
+            static std::array<uint8, 256> const PublicKey;
+
+        public:
+            explicit AddonInfo() : ServerPacket(SMSG_ADDON_INFO) { }
+
+            WorldPacket const* Write() override;
+
+            std::span<SecureAddonInfo const> Addons;
+            std::span<BannedAddon const> BannedAddons;
+        };
+
+        class ClientCacheVersion final : public ServerPacket
+        {
+        public:
+            explicit ClientCacheVersion() : ServerPacket(SMSG_CLIENTCACHE_VERSION, 4) { }
+
+            WorldPacket const* Write() override;
+
+            uint32 CacheVersion = 0;
+        };
+    }
+}
+
+#endif // TRINITYCORE_CLIENT_CONFIG_PACKETS_H

src/server/game/Server/Packets/ClientConfigPackets.cpp

@@ -17,10 +17,23 @@
 
 #include "SystemPackets.h"
 
-WorldPacket const* WorldPackets::System::FeatureSystemStatus::Write()
+namespace WorldPackets::System
+{
+WorldPacket const* FeatureSystemStatus::Write()
 {
     _worldPacket << uint8(ComplaintStatus);
     _worldPacket << uint8(VoiceEnabled);
 
     return &_worldPacket;
 }
+
+WorldPacket const* MOTD::Write()
+{
+    _worldPacket << uint32(Text->size());
+
+    for (std::string const& line : *Text)
+        _worldPacket << line;
+
+    return &_worldPacket;
+}
+}

src/server/game/Server/Packets/ClientConfigPackets.h

@@ -35,6 +35,16 @@ namespace WorldPackets
             uint8 ComplaintStatus = COMPLAINT_ENABLED_WITH_AUTO_IGNORE;
             bool VoiceEnabled = false;
         };
+
+        class MOTD final : public ServerPacket
+        {
+        public:
+            MOTD() : ServerPacket(SMSG_MOTD) { }
+
+            WorldPacket const* Write() override;
+
+            std::vector<std::string> const* Text = nullptr;
+        };
     }
 }