mirror of
https://github.com/ddnet/ddnet.git
synced 2024-10-20 07:48:18 +00:00
1a9357b961
This fixes issues that prevented vanilla 0.6.5 clients from joining DDNet servers with `sv_vanilla_antispoof 1` (closes #2074). The dummy map was not valid. The size of the tiles and game layers was calculated incorrectly. The last member variable included in `CMapItemLayerTilemap` version 2 should be `m_Data`. Previously only the size of the member `m_aName` was subtracted from the total size, which was resulting in an incorrect item size, as the size of the following 5 members also needs to be subtracted. The handshake messages were packed incorrectly. The message ID and the system flag were not added to the six packers that are passed to `SendMsgs`. The lines that are removed in this function seemed to assume that the message ID was already added but not packed, which was no longer the case. Presumable at some point `CMsgPacker` was changed without adapting the vanilla antispoof feature. Now, the message ID and system flag are properly packed when initially creating the message packers. The `dummy_map` tool is improved to also print the generated map file's hashes and data as a C style array, so the data can immediately be copied to `network_server.cpp`.
118 lines
3.4 KiB
C++
118 lines
3.4 KiB
C++
#include <base/hash.h>
|
|
#include <base/logger.h>
|
|
#include <base/system.h>
|
|
|
|
#include <engine/shared/datafile.h>
|
|
#include <engine/storage.h>
|
|
|
|
#include <game/mapitems.h>
|
|
|
|
void CreateEmptyMap(IStorage *pStorage)
|
|
{
|
|
const char *pMapName = "maps/dummy3.map";
|
|
|
|
CDataFileWriter Writer;
|
|
if(!Writer.Open(pStorage, pMapName))
|
|
{
|
|
dbg_msg("dummy_map", "couldn't open map file '%s' for writing", pMapName);
|
|
return;
|
|
}
|
|
CMapItemGroup_v1 Group;
|
|
Group.m_Version = 1;
|
|
Group.m_OffsetX = 0;
|
|
Group.m_OffsetY = 0;
|
|
Group.m_ParallaxX = 0;
|
|
Group.m_ParallaxY = 0;
|
|
Group.m_StartLayer = 0;
|
|
Group.m_NumLayers = 2;
|
|
Writer.AddItem(MAPITEMTYPE_GROUP, 0, sizeof(Group), &Group);
|
|
|
|
constexpr int LayerWidth = 2;
|
|
constexpr int LayerHeight = 2;
|
|
CTile aTiles[LayerWidth * LayerHeight];
|
|
for(auto &Tile : aTiles)
|
|
{
|
|
Tile.m_Index = 1;
|
|
Tile.m_Flags = 0;
|
|
Tile.m_Skip = 0;
|
|
Tile.m_Reserved = 0;
|
|
}
|
|
const int TilesData = Writer.AddData(sizeof(aTiles), &aTiles);
|
|
|
|
CMapItemLayerTilemap GameLayer;
|
|
GameLayer.m_Layer.m_Version = 0; // Not set by the official client.
|
|
GameLayer.m_Layer.m_Type = LAYERTYPE_TILES;
|
|
GameLayer.m_Layer.m_Flags = 0;
|
|
GameLayer.m_Version = 2;
|
|
GameLayer.m_Width = LayerWidth;
|
|
GameLayer.m_Height = LayerHeight;
|
|
GameLayer.m_Flags = TILESLAYERFLAG_GAME;
|
|
GameLayer.m_Color.r = 0;
|
|
GameLayer.m_Color.g = 0;
|
|
GameLayer.m_Color.b = 0;
|
|
GameLayer.m_Color.a = 0;
|
|
GameLayer.m_ColorEnv = -1;
|
|
GameLayer.m_ColorEnvOffset = 0;
|
|
GameLayer.m_Image = -1;
|
|
GameLayer.m_Data = TilesData;
|
|
Writer.AddItem(MAPITEMTYPE_LAYER, 0, sizeof(GameLayer) - sizeof(GameLayer.m_aName) - sizeof(GameLayer.m_Tele) - sizeof(GameLayer.m_Speedup) - sizeof(GameLayer.m_Front) - sizeof(GameLayer.m_Switch) - sizeof(GameLayer.m_Tune), &GameLayer);
|
|
|
|
CMapItemLayerTilemap Layer;
|
|
Layer.m_Layer.m_Version = 0;
|
|
Layer.m_Layer.m_Type = LAYERTYPE_TILES;
|
|
Layer.m_Layer.m_Flags = 0;
|
|
Layer.m_Version = 2;
|
|
Layer.m_Width = LayerWidth;
|
|
Layer.m_Height = LayerHeight;
|
|
Layer.m_Flags = 0;
|
|
Layer.m_Color.r = 0;
|
|
Layer.m_Color.g = 0;
|
|
Layer.m_Color.b = 0;
|
|
Layer.m_Color.a = 255;
|
|
Layer.m_ColorEnv = -1;
|
|
Layer.m_ColorEnvOffset = 0;
|
|
Layer.m_Image = -1;
|
|
Layer.m_Data = TilesData;
|
|
Writer.AddItem(MAPITEMTYPE_LAYER, 1, sizeof(Layer) - sizeof(Layer.m_aName) - sizeof(Layer.m_Tele) - sizeof(Layer.m_Speedup) - sizeof(Layer.m_Front) - sizeof(Layer.m_Switch) - sizeof(Layer.m_Tune), &Layer);
|
|
|
|
Writer.Finish();
|
|
|
|
dbg_msg("dummy_map", "dummy map written to '%s'", pMapName);
|
|
|
|
CDataFileReader Reader;
|
|
void *pData;
|
|
unsigned DataSize;
|
|
if(!pStorage->ReadFile(pMapName, IStorage::TYPE_ALL, &pData, &DataSize))
|
|
{
|
|
dbg_msg("dummy_map", "couldn't open map file '%s' for reading", pMapName);
|
|
return;
|
|
}
|
|
unsigned char *pDataChar = static_cast<unsigned char *>(pData);
|
|
|
|
unsigned Crc = crc32(0, pDataChar, DataSize);
|
|
SHA256_DIGEST Sha256 = sha256(&pDataChar, DataSize);
|
|
|
|
char aMapSha[SHA256_MAXSTRSIZE];
|
|
sha256_str(Sha256, aMapSha, sizeof(aMapSha));
|
|
dbg_msg("dummy_map", "crc32 %08X, sha256 %s", Crc, aMapSha);
|
|
|
|
const unsigned HexSize = 6 * DataSize + 1;
|
|
char *pHex = static_cast<char *>(malloc(HexSize));
|
|
str_hex_cstyle(pHex, HexSize, pDataChar, DataSize);
|
|
dbg_msg("dummy_map", "data %s", pHex);
|
|
free(pHex);
|
|
|
|
free(pDataChar);
|
|
}
|
|
|
|
int main(int argc, const char **argv)
|
|
{
|
|
CCmdlineFix CmdlineFix(&argc, &argv);
|
|
log_set_global_logger_default();
|
|
IStorage *pStorage = CreateStorage(IStorage::STORAGETYPE_SERVER, argc, argv);
|
|
if(!pStorage)
|
|
return -1;
|
|
CreateEmptyMap(pStorage);
|
|
return 0;
|
|
}
|