From 126f36c2e6c153f2791db743a8ceca44b6b36b10 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 13 Mar 2015 13:40:48 +0100 Subject: [PATCH] Rename some packet and handlers to _Legacy name for compat layer between new network changes and old network clients --- src/client.cpp | 4 ++-- src/client.h | 4 ++-- src/network/clientopcodes.cpp | 8 ++++---- src/network/networkprotocol.h | 12 ++++++------ src/network/packethandlers/client.cpp | 4 ++-- src/network/packethandlers/server.cpp | 4 ++-- src/network/serveropcodes.cpp | 8 ++++---- src/server.cpp | 4 ++-- src/server.h | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index e36c04edc..8e0f657e2 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -407,7 +407,7 @@ void Client::step(float dtime) snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName()); snprintf(pPassword, PASSWORD_SIZE, "%s", m_password.c_str()); - NetworkPacket* pkt = new NetworkPacket(TOSERVER_INIT, + NetworkPacket* pkt = new NetworkPacket(TOSERVER_INIT_LEGACY, 1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2); *pkt << (u8) SER_FMT_VER_HIGHEST_READ; @@ -1065,7 +1065,7 @@ void Client::sendChangePassword(const std::wstring &oldpassword, std::string oldpwd = translatePassword(playername, oldpassword); std::string newpwd = translatePassword(playername, newpassword); - NetworkPacket* pkt = new NetworkPacket(TOSERVER_PASSWORD, 2 * PASSWORD_SIZE); + NetworkPacket* pkt = new NetworkPacket(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE); for(u8 i = 0; i < PASSWORD_SIZE; i++) { *pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0); diff --git a/src/client.h b/src/client.h index a0add689a..fd20c627a 100644 --- a/src/client.h +++ b/src/client.h @@ -350,7 +350,7 @@ public: void handleCommand_Null(NetworkPacket* pkt) {}; void handleCommand_Deprecated(NetworkPacket* pkt); void handleCommand_Init(NetworkPacket* pkt); - void handleCommand_AccessDenied(NetworkPacket* pkt); + void handleCommand_AccessDenied_Legacy(NetworkPacket* pkt); void handleCommand_RemoveNode(NetworkPacket* pkt); void handleCommand_AddNode(NetworkPacket* pkt); void handleCommand_BlockData(NetworkPacket* pkt); @@ -379,7 +379,7 @@ public: void handleCommand_ShowFormSpec(NetworkPacket* pkt); void handleCommand_SpawnParticle(NetworkPacket* pkt); void handleCommand_AddParticleSpawner(NetworkPacket* pkt); - void handleCommand_DeleteParticleSpawner(NetworkPacket* pkt); + void handleCommand_DeleteParticleSpawner_Legacy(NetworkPacket* pkt); void handleCommand_HudAdd(NetworkPacket* pkt); void handleCommand_HudRemove(NetworkPacket* pkt); void handleCommand_HudChange(NetworkPacket* pkt); diff --git a/src/network/clientopcodes.cpp b/src/network/clientopcodes.cpp index 88eef0ad6..2ae00b730 100644 --- a/src/network/clientopcodes.cpp +++ b/src/network/clientopcodes.cpp @@ -40,7 +40,7 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] = null_command_handler, null_command_handler, null_command_handler, - { "TOCLIENT_INIT", TOCLIENT_STATE_NOT_CONNECTED, &Client::handleCommand_Init }, // 0x10 + { "TOCLIENT_INIT", TOCLIENT_STATE_NOT_CONNECTED, &Client::handleCommand_Init }, // 0x10 null_command_handler, null_command_handler, null_command_handler, @@ -77,7 +77,7 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] = { "TOCLIENT_ACTIVE_OBJECT_MESSAGES", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ActiveObjectMessages }, // 0x32 { "TOCLIENT_HP", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HP }, // 0x33 { "TOCLIENT_MOVE_PLAYER", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_MovePlayer }, // 0x34 - { "TOCLIENT_ACCESS_DENIED", TOCLIENT_STATE_NOT_CONNECTED, &Client::handleCommand_AccessDenied }, // 0x35 + { "TOCLIENT_ACCESS_DENIED_LEGACY", TOCLIENT_STATE_NOT_CONNECTED, &Client::handleCommand_AccessDenied_Legacy }, // 0x35 { "TOCLIENT_PLAYERITEM", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_PlayerItem }, // 0x36 { "TOCLIENT_DEATHSCREEN", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_DeathScreen }, // 0x37 { "TOCLIENT_MEDIA", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_Media }, // 0x38 @@ -96,7 +96,7 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] = { "TOCLIENT_MOVEMENT", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_Movement }, // 0x45 { "TOCLIENT_SPAWN_PARTICLE", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_SpawnParticle }, // 0x46 { "TOCLIENT_ADD_PARTICLESPAWNER", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_AddParticleSpawner }, // 0x47 - { "TOCLIENT_DELETE_PARTICLESPAWNER", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_DeleteParticleSpawner }, // 0x48 + { "TOCLIENT_DELETE_PARTICLESPAWNER", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_DeleteParticleSpawner_Legacy }, // 0x48 { "TOCLIENT_HUDADD", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HudAdd }, // 0x49 { "TOCLIENT_HUDRM", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HudRemove }, // 0x4a { "TOCLIENT_HUDCHANGE", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HudChange }, // 0x4b @@ -167,7 +167,7 @@ const ServerCommandFactory serverCommandFactoryTable[TOSERVER_NUM_MSG_TYPES] = { "TOSERVER_SIGNNODETEXT", 0, false }, // 0x33 { "TOSERVER_CLICK_ACTIVEOBJECT", 0, false }, // 0x34 { "TOSERVER_DAMAGE", 0, true }, // 0x35 - { "TOSERVER_PASSWORD", 0, true }, // 0x36 + { "TOSERVER_PASSWORD_LEGACY", 0, true }, // 0x36 { "TOSERVER_PLAYERITEM", 0, true }, // 0x37 { "TOSERVER_RESPAWN", 0, true }, // 0x38 { "TOSERVER_INTERACT", 0, true }, // 0x39 diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index 425f61fda..18905a22b 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -270,7 +270,7 @@ enum ToClientCommand f1000 player yaw */ - TOCLIENT_ACCESS_DENIED = 0x35, + TOCLIENT_ACCESS_DENIED_LEGACY = 0x35, /* u16 command u16 reason_length @@ -457,7 +457,7 @@ enum ToClientCommand u32 id */ - TOCLIENT_DELETE_PARTICLESPAWNER = 0x48, + TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY = 0x48, /* u16 command u32 id @@ -562,7 +562,7 @@ enum ToClientCommand enum ToServerCommand { - TOSERVER_INIT=0x10, + TOSERVER_INIT_LEGACY = 0x10, /* Sent first after connected. @@ -694,7 +694,7 @@ enum ToServerCommand u8 amount */ - TOSERVER_PASSWORD=0x36, + TOSERVER_PASSWORD_LEGACY = 0x36, /* Sent to change password. @@ -703,7 +703,7 @@ enum ToServerCommand [30] u8[28] new password */ - TOSERVER_PLAYERITEM=0x37, + TOSERVER_PLAYERITEM = 0x37, /* Sent to change selected item. @@ -711,7 +711,7 @@ enum ToServerCommand [2] u16 item */ - TOSERVER_RESPAWN=0x38, + TOSERVER_RESPAWN = 0x38, /* u16 TOSERVER_RESPAWN */ diff --git a/src/network/packethandlers/client.cpp b/src/network/packethandlers/client.cpp index 69f39d1f3..7b3adeda4 100644 --- a/src/network/packethandlers/client.cpp +++ b/src/network/packethandlers/client.cpp @@ -89,7 +89,7 @@ void Client::handleCommand_Init(NetworkPacket* pkt) m_state = LC_Init; } -void Client::handleCommand_AccessDenied(NetworkPacket* pkt) +void Client::handleCommand_AccessDenied_Legacy(NetworkPacket* pkt) { // The server didn't like our password. Note, this needs // to be processed even if the serialisation format has @@ -822,7 +822,7 @@ void Client::handleCommand_AddParticleSpawner(NetworkPacket* pkt) } -void Client::handleCommand_DeleteParticleSpawner(NetworkPacket* pkt) +void Client::handleCommand_DeleteParticleSpawner_Legacy(NetworkPacket* pkt) { u16 id; diff --git a/src/network/packethandlers/server.cpp b/src/network/packethandlers/server.cpp index 537858e52..113ca6c8f 100644 --- a/src/network/packethandlers/server.cpp +++ b/src/network/packethandlers/server.cpp @@ -43,7 +43,7 @@ void Server::handleCommand_Deprecated(NetworkPacket* pkt) << " not supported anymore" << std::endl; } -void Server::handleCommand_Init(NetworkPacket* pkt) +void Server::handleCommand_Init_Legacy(NetworkPacket* pkt) { // [0] u8 SER_FMT_VER_HIGHEST_READ // [1] u8[20] player_name @@ -942,7 +942,7 @@ void Server::handleCommand_Breath(NetworkPacket* pkt) SendPlayerBreath(pkt->getPeerId()); } -void Server::handleCommand_Password(NetworkPacket* pkt) +void Server::handleCommand_Password_Legacy(NetworkPacket* pkt) { /* [0] u16 TOSERVER_PASSWORD diff --git a/src/network/serveropcodes.cpp b/src/network/serveropcodes.cpp index bd36b427f..d3cf5c1b6 100644 --- a/src/network/serveropcodes.cpp +++ b/src/network/serveropcodes.cpp @@ -40,7 +40,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] = null_command_handler, // 0x0d null_command_handler, // 0x0e null_command_handler, // 0x0f - { "TOSERVER_INIT", TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init }, // 0x10 + { "TOSERVER_INIT_LEGACY", TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init_Legacy }, // 0x10 { "TOSERVER_INIT2", TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init2 }, // 0x11 null_command_handler, // 0x12 null_command_handler, // 0x13 @@ -78,7 +78,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] = { "TOSERVER_SIGNNODETEXT", TOSERVER_STATE_INGAME, &Server::handleCommand_Deprecated }, // 0x33 { "TOSERVER_CLICK_ACTIVEOBJECT", TOSERVER_STATE_INGAME, &Server::handleCommand_Deprecated }, // 0x34 { "TOSERVER_DAMAGE", TOSERVER_STATE_INGAME, &Server::handleCommand_Damage }, // 0x35 - { "TOSERVER_PASSWORD", TOSERVER_STATE_INGAME, &Server::handleCommand_Password }, // 0x36 + { "TOSERVER_PASSWORD_LEGACY", TOSERVER_STATE_INGAME, &Server::handleCommand_Password_Legacy }, // 0x36 { "TOSERVER_PLAYERITEM", TOSERVER_STATE_INGAME, &Server::handleCommand_PlayerItem }, // 0x37 { "TOSERVER_RESPAWN", TOSERVER_STATE_INGAME, &Server::handleCommand_Respawn }, // 0x38 { "TOSERVER_INTERACT", TOSERVER_STATE_INGAME, &Server::handleCommand_Interact }, // 0x39 @@ -151,7 +151,7 @@ const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] = { "TOCLIENT_ACTIVE_OBJECT_MESSAGES", 0, true }, // 0x32 Special packet, sent by 0 (rel) and 1 (unrel) channel { "TOCLIENT_HP", 0, true }, // 0x33 { "TOCLIENT_MOVE_PLAYER", 0, true }, // 0x34 - { "TOCLIENT_ACCESS_DENIED", 0, true }, // 0x35 + { "TOCLIENT_ACCESS_DENIED_LEGACY", 0, true }, // 0x35 { "TOCLIENT_PLAYERITEM", 0, false }, // 0x36 obsolete { "TOCLIENT_DEATHSCREEN", 0, true }, // 0x37 { "TOCLIENT_MEDIA", 2, true }, // 0x38 @@ -170,7 +170,7 @@ const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] = { "TOCLIENT_MOVEMENT", 0, true }, // 0x45 { "TOCLIENT_SPAWN_PARTICLE", 0, true }, // 0x46 { "TOCLIENT_ADD_PARTICLESPAWNER", 0, true }, // 0x47 - { "TOCLIENT_DELETE_PARTICLESPAWNER", 0, true }, // 0x48 + { "TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY", 0, true }, // 0x48 { "TOCLIENT_HUDADD", 1, true }, // 0x49 { "TOCLIENT_HUDRM", 1, true }, // 0x4a { "TOCLIENT_HUDCHANGE", 0, true }, // 0x4b diff --git a/src/server.cpp b/src/server.cpp index a21d12e6a..b230ffd18 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1506,7 +1506,7 @@ void Server::SendAccessDenied(u16 peer_id,const std::wstring &reason) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ACCESS_DENIED, 0, peer_id); + NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ACCESS_DENIED_LEGACY, 0, peer_id); *pkt << reason; Send(pkt); } @@ -1677,7 +1677,7 @@ void Server::SendDeleteParticleSpawner(u16 peer_id, u32 id) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_DELETE_PARTICLESPAWNER, 2, peer_id); + NetworkPacket* pkt = new NetworkPacket(TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY, 2, peer_id); // Ugly error in this packet *pkt << (u16) id; diff --git a/src/server.h b/src/server.h index ba6c37faa..897841406 100644 --- a/src/server.h +++ b/src/server.h @@ -197,7 +197,7 @@ public: void handleCommand_Null(NetworkPacket* pkt) {}; void handleCommand_Deprecated(NetworkPacket* pkt); - void handleCommand_Init(NetworkPacket* pkt); + void handleCommand_Init_Legacy(NetworkPacket* pkt); void handleCommand_Init2(NetworkPacket* pkt); void handleCommand_RequestMedia(NetworkPacket* pkt); void handleCommand_ReceivedMedia(NetworkPacket* pkt); @@ -209,7 +209,7 @@ public: void handleCommand_ChatMessage(NetworkPacket* pkt); void handleCommand_Damage(NetworkPacket* pkt); void handleCommand_Breath(NetworkPacket* pkt); - void handleCommand_Password(NetworkPacket* pkt); + void handleCommand_Password_Legacy(NetworkPacket* pkt); void handleCommand_PlayerItem(NetworkPacket* pkt); void handleCommand_Respawn(NetworkPacket* pkt); void handleCommand_Interact(NetworkPacket* pkt); -- 2.25.1