1. src/game/WorldSession.cpp | 51 ++++++++++++++++++++++++++++++-----------------
  2. src/game/WorldSession.h | 12 ++++++-----
  3. 2 files changed, 40 insertions(+), 23 deletions(-)
  5. diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
  6. index 12ea9fe..f6ec7a7 100644
  7. --- a/src/game/WorldSession.cpp
  8. +++ b/src/game/WorldSession.cpp
  9. @@ -38,6 +38,7 @@
  10. #include "SocialMgr.h"
  11. #include "Auth/AuthCrypt.h"
  12. #include "Auth/HMACSHA1.h"
  13. +#include <openssl/md5.h>
  14. #include "zlib/zlib.h"
  16. // select opcodes appropriate for processing in Map::Update context for current session state
  17. @@ -833,13 +834,13 @@ void WorldSession::ReadAddonsInfo(WorldPacket& data)
  18. if (uncompress(const_cast<uint8*>(addonInfo.contents()), &uSize, const_cast<uint8*>(data.contents() + pos), data.size() - pos) == Z_OK)
  19. {
  20. uint32 addonsCount;
  21. - addonInfo >> addonsCount; // addons count
  22. + addonInfo >> addonsCount; // addons count
  24. for (uint32 i = 0; i < addonsCount; ++i)
  25. {
  26. std::string addonName;
  27. - uint8 enabled;
  28. - uint32 crc, unk1;
  29. + uint8 has_pub_key;
  30. + uint32 pub_key_crc, url_crc;
  32. // check next addon data format correctness
  33. if (addonInfo.rpos() + 1 > addonInfo.size())
  34. @@ -847,15 +848,15 @@ void WorldSession::ReadAddonsInfo(WorldPacket& data)
  36. addonInfo >> addonName;
  38. - addonInfo >> enabled >> crc >> unk1;
  39. + addonInfo >> has_pub_key >> pub_key_crc >> url_crc;
  41. - DEBUG_LOG("ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk1);
  42. + DEBUG_LOG("ADDON: Name: %s, has_pub_key: 0x%x, pub_key_crc: 0x%x, url_crc: 0x%x", addonName.c_str(), has_pub_key, pub_key_crc, url_crc);
  44. - m_addonsList.push_back(AddonInfo(addonName, enabled, crc));
  45. + m_addonsList.push_back(AddonInfo(addonName, has_pub_key, pub_key_crc, url_crc));
  46. }
  48. - uint32 unk2;
  49. - addonInfo >> unk2;
  50. + uint32 bannedTimeStamp;
  51. + addonInfo >> bannedTimeStamp; // LatestBannedAddOnTimestamp
  53. if (addonInfo.rpos() != addonInfo.size())
  54. DEBUG_LOG("packet under read!");
  55. @@ -897,7 +898,7 @@ void WorldSession::SendAddonsInfo()
  56. data << uint8(unk1);
  57. if (unk1)
  58. {
  59. - uint8 unk2 = (itr->CRC != 0x4c1c776d); // If addon is Standard addon CRC
  60. + uint8 unk2 = (itr->pub_key_crc != 0x4c1c776d); // If addon is Standard addon CRC
  61. data << uint8(unk2); // if 1, than add addon public signature
  62. if (unk2) // if CRC is wrong, add public key (client need it)
  63. data.append(tdata, sizeof(tdata));
  64. @@ -916,17 +917,31 @@ void WorldSession::SendAddonsInfo()
  66. m_addonsList.clear();
  68. - uint32 count = 0;
  69. + uint32 count = 1;
  70. data << uint32(count); // BannedAddons count
  71. - /*for(uint32 i = 0; i < count; ++i)
  72. + for (uint32 i = 0; i < count; ++i)
  73. {
  74. - uint32
  75. - string (16 bytes)
  76. - string (16 bytes)
  77. - uint32
  78. - uint32
  79. - uint32
  80. - }*/
  81. + data << uint32(1); // index?
  82. +
  83. + MD5_CTX ctx;
  84. +
  85. + MD5_Init(&ctx);
  86. + const char *addon = "LFRAdvanced";
  87. + MD5_Update(&ctx, addon, strlen(addon));
  88. + uint8 name_hash[16];
  89. + MD5_Final(name_hash, &ctx);
  90. + data.append(name_hash, 16); // Name MD5
  91. +
  92. + MD5_Init(&ctx);
  93. + const char *version = "";
  94. + MD5_Update(&ctx, version, strlen(version));
  95. + uint8 version_hash[16];
  96. + MD5_Final(version_hash, &ctx);
  97. + data.append(version_hash, 16); // Version MD5
  98. +
  99. + data << uint32(time(NULL)); // timestamp?
  100. + data << uint32(1); // state - should have low bit set! (client checks state & 1)
  101. + }
  103. SendPacket(&data);
  104. }
  105. diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h
  106. index 19f40cd..ac1d6d3 100644
  107. --- a/src/game/WorldSession.h
  108. +++ b/src/game/WorldSession.h
  109. @@ -77,16 +77,18 @@ struct AccountData
  111. struct AddonInfo
  112. {
  113. - AddonInfo(const std::string& name, uint8 enabled, uint32 crc) :
  114. + AddonInfo(const std::string& name, uint8 has_pub_key, uint32 pub_key_crc, uint32 url_crc) :
  115. Name(name),
  116. - Enabled(enabled),
  117. - CRC(crc)
  118. + has_pub_key(has_pub_key),
  119. + pub_key_crc(pub_key_crc),
  120. + url_crc(url_crc)
  121. {
  122. }
  124. std::string Name;
  125. - uint8 Enabled;
  126. - uint32 CRC;
  127. + uint8 has_pub_key;
  128. + uint32 pub_key_crc;
  129. + uint32 url_crc;
  130. };
  132. typedef std::list<AddonInfo> AddonsList;