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

Merge pull request #7026 from ChillerDragon/pr_auth_unused

Browse source 
NETMSG_AUTH_CHALLENGE is not used in 0.6 or 0.7
This commit is contained in:
Dennis Felsing 2023-08-22 09:59:58 +00:00 committed by GitHub
parent afbb95fc15 87640d7857
commit 55789819a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
datasrc/network.py
View file

@ -401,7 +401,7 @@ Messages = [
]),
NetMessage("Sv_TuneParams", []),
NetMessage("Sv_ExtraProjectile", []),
NetMessage("Unused", []),
NetMessage("Sv_ReadyToEnter", []),
NetMessage("Sv_WeaponPickup", [
@ -509,7 +509,7 @@ Messages = [
NetIntAny("m_PlayerTimeBest"),
]),
NetMessage("Unused", []),
NetMessage("Unused2", []),
NetMessage("Sv_TeamsStateLegacy", []),

2
datasrc/seven/network.py
View file

@ -294,7 +294,7 @@ Messages = [
]),
NetMessage("Sv_TuneParams", []),
NetMessage("Sv_ExtraProjectile", []),
NetMessage("Unused", []),
NetMessage("Sv_ReadyToEnter", []),
NetMessage("Sv_WeaponPickup", [

4
src/engine/server/server.cpp
View file

@ -786,9 +786,7 @@ static inline bool RepackMsg(const CMsgPacker *pMsg, CPacker &Packer, bool Sixup
MsgId += 1;
else if(MsgId == NETMSG_RCON_LINE)
MsgId = protocol7::NETMSG_RCON_LINE;
else if(MsgId >= NETMSG_AUTH_CHALLENGE && MsgId <= NETMSG_AUTH_RESULT)
MsgId += 4;
else if(MsgId >= NETMSG_PING && MsgId <= NETMSG_ERROR)
else if(MsgId >= NETMSG_PING && MsgId <= NETMSG_PING_REPLY)
MsgId += 4;
else if(MsgId >= NETMSG_RCON_CMD_ADD && MsgId <= NETMSG_RCON_CMD_REM)
MsgId -= 11;

10
src/engine/shared/protocol.h
View file

@ -47,8 +47,8 @@ enum
NETMSG_RCON_AUTH_STATUS, // result of the authentication
NETMSG_RCON_LINE, // line that should be printed to the remote console
NETMSG_AUTH_CHALLENGE, //
NETMSG_AUTH_RESULT, //
NETMSG_UNUSED1,
NETMSG_UNUSED2,
// sent by client
NETMSG_READY, //
@ -58,13 +58,13 @@ enum
NETMSG_RCON_AUTH, //
NETMSG_REQUEST_MAP_DATA, //
NETMSG_AUTH_START, //
NETMSG_AUTH_RESPONSE, //
NETMSG_UNUSED3,
NETMSG_UNUSED4,
// sent by both
NETMSG_PING,
NETMSG_PING_REPLY,
NETMSG_ERROR,
NETMSG_UNUSED5,
// sent by server (todo: move it up)
NETMSG_RCON_CMD_ADD,

10
src/engine/shared/protocol7.h
View file

@ -29,8 +29,8 @@ enum
NETMSG_RCON_CMD_ADD,
NETMSG_RCON_CMD_REM,
NETMSG_AUTH_CHALLANGE, //
NETMSG_AUTH_RESULT, //
NETMSG_UNUSED1,
NETMSG_UNUSED2,
// sent by client
NETMSG_READY, //
@ -40,13 +40,13 @@ enum
NETMSG_RCON_AUTH, //
NETMSG_REQUEST_MAP_DATA, //
NETMSG_AUTH_START, //
NETMSG_AUTH_RESPONSE, //
NETMSG_UNUSED3,
NETMSG_UNUSED4,
// sent by both
NETMSG_PING,
NETMSG_PING_REPLY,
NETMSG_ERROR,
NETMSG_UNUSED5,
NETMSG_MAPLIST_ENTRY_ADD, // todo 0.8: move up
NETMSG_MAPLIST_ENTRY_REM,