edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6291

Browse source 
6291: `CMsgPacker` doesn't know about message ID encoding r=Robyt3 a=heinrich5991

CC #6289

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
This commit is contained in:
bors[bot] 2023-01-20 22:49:47 +00:00 committed by GitHub
parent 4a4d6c5483 e06052292e
commit ccf863f554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/message.h
View file

@ -17,11 +17,6 @@ public:
{ {
Reset(); Reset();
} }
void PackMessageSystem()
{
AddInt((m_MsgID << 1) | (m_System ? 1 : 0));
}
}; };
#endif #endif

4
src/engine/shared/network.h
View file

@ -10,8 +10,8 @@
#include <base/system.h> #include <base/system.h>
class CHuffman; class CHuffman;
class CMsgPacker;
class CNetBan; class CNetBan;
class CPacker;
/* /*
@ -396,7 +396,7 @@ class CNetServer
int TryAcceptClient(NETADDR &Addr, SECURITY_TOKEN SecurityToken, bool VanillaAuth = false, bool Sixup = false, SECURITY_TOKEN Token = 0); int TryAcceptClient(NETADDR &Addr, SECURITY_TOKEN SecurityToken, bool VanillaAuth = false, bool Sixup = false, SECURITY_TOKEN Token = 0);
int NumClientsWithAddr(NETADDR Addr); int NumClientsWithAddr(NETADDR Addr);
bool Connlimit(NETADDR Addr); bool Connlimit(NETADDR Addr);
void SendMsgs(NETADDR &Addr, const CMsgPacker *apMsgs[], int Num); void SendMsgs(NETADDR &Addr, const CPacker **ppMsgs, int Num);
public: public:
int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser); int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser);

31
src/engine/shared/network_server.cpp
View file

@ -6,7 +6,8 @@
#include "config.h" #include "config.h"
#include "netban.h" #include "netban.h"
#include "network.h" #include "network.h"
#include <engine/message.h> #include <engine/shared/compression.h>
#include <engine/shared/packer.h>
#include <engine/shared/protocol.h> #include <engine/shared/protocol.h>
const int g_DummyMapCrc = 0xD6909B17; const int g_DummyMapCrc = 0xD6909B17;
@ -270,7 +271,7 @@ int CNetServer::TryAcceptClient(NETADDR &Addr, SECURITY_TOKEN SecurityToken, boo
return Slot; // done return Slot; // done
} }
void CNetServer::SendMsgs(NETADDR &Addr, const CMsgPacker *apMsgs[], int Num) void CNetServer::SendMsgs(NETADDR &Addr, const CPacker **ppMsgs, int Num)
{ {
CNetPacketConstruct Construct; CNetPacketConstruct Construct;
mem_zero(&Construct, sizeof(Construct)); mem_zero(&Construct, sizeof(Construct));
@ -278,7 +279,7 @@ void CNetServer::SendMsgs(NETADDR &Addr, const CMsgPacker *apMsgs[], int Num)
for(int i = 0; i < Num; i++) for(int i = 0; i < Num; i++)
{ {
const CMsgPacker *pMsg = apMsgs[i]; const CPacker *pMsg = ppMsgs[i];
CNetChunkHeader Header; CNetChunkHeader Header;
Header.m_Flags = NET_CHUNKFLAG_VITAL; Header.m_Flags = NET_CHUNKFLAG_VITAL;
Header.m_Size = pMsg->Size(); Header.m_Size = pMsg->Size();
@ -366,9 +367,9 @@ void CNetServer::OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet)
// map if there are too many connection attempts at once. // map if there are too many connection attempts at once.
// send mapchange + map data + con_ready + 3 x empty snap (with token) // send mapchange + map data + con_ready + 3 x empty snap (with token)
CMsgPacker MapChangeMsg(NETMSG_MAP_CHANGE, true); CPacker MapChangeMsg;
MapChangeMsg.PackMessageSystem(); MapChangeMsg.Reset();
MapChangeMsg.AddInt((NETMSG_MAP_CHANGE << 1) | 1);
if(Flooding) if(Flooding)
{ {
// Fallback to dm1 // Fallback to dm1
@ -384,9 +385,9 @@ void CNetServer::OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet)
MapChangeMsg.AddInt(sizeof(g_aDummyMapData)); MapChangeMsg.AddInt(sizeof(g_aDummyMapData));
} }
CMsgPacker MapDataMsg(NETMSG_MAP_DATA, true); CPacker MapDataMsg;
MapDataMsg.PackMessageSystem(); MapDataMsg.Reset();
MapDataMsg.AddInt((NETMSG_MAP_DATA << 1) | 1);
if(Flooding) if(Flooding)
{ {
// send empty map data to keep 0.6.4 support // send empty map data to keep 0.6.4 support
@ -406,17 +407,19 @@ void CNetServer::OnPreConnMsg(NETADDR &Addr, CNetPacketConstruct &Packet)
MapDataMsg.AddRaw(g_aDummyMapData, sizeof(g_aDummyMapData)); // map data MapDataMsg.AddRaw(g_aDummyMapData, sizeof(g_aDummyMapData)); // map data
} }
CMsgPacker ConReadyMsg(NETMSG_CON_READY, true); CPacker ConReadyMsg;
ConReadyMsg.PackMessageSystem(); ConReadyMsg.Reset();
ConReadyMsg.AddInt((NETMSG_CON_READY << 1) | 1);
CMsgPacker SnapEmptyMsg(NETMSG_SNAPEMPTY, true); CPacker SnapEmptyMsg;
SnapEmptyMsg.PackMessageSystem(); SnapEmptyMsg.Reset();
SnapEmptyMsg.AddInt((NETMSG_SNAPEMPTY << 1) | 1);
SECURITY_TOKEN SecurityToken = GetVanillaToken(Addr); SECURITY_TOKEN SecurityToken = GetVanillaToken(Addr);
SnapEmptyMsg.AddInt(SecurityToken); SnapEmptyMsg.AddInt(SecurityToken);
SnapEmptyMsg.AddInt(SecurityToken + 1); SnapEmptyMsg.AddInt(SecurityToken + 1);
// send all chunks/msgs in one packet // send all chunks/msgs in one packet
const CMsgPacker *apMsgs[] = {&MapChangeMsg, &MapDataMsg, &ConReadyMsg, const CPacker *apMsgs[] = {&MapChangeMsg, &MapDataMsg, &ConReadyMsg,
&SnapEmptyMsg, &SnapEmptyMsg, &SnapEmptyMsg}; &SnapEmptyMsg, &SnapEmptyMsg, &SnapEmptyMsg};
SendMsgs(Addr, apMsgs, std::size(apMsgs)); SendMsgs(Addr, apMsgs, std::size(apMsgs));
} }