From ed04e8e9e407f0dd57fa83a9732b3a3968cb80e0 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 16 Jan 2015 11:37:49 +0100 Subject: [Patch 2/4] Network rework: packet writing, sending and cleanups NetworkPacket.cpp: * Remove some deprecated functions, we must use streaming interface * m_data converted from u8* to std::vector * Add an exporter to forge packet to Connection object * implement operator << std::wstring. n * implement operator << std::string * dynamic resize when write packet content. * fix string writing and performances. * create ServerCommandFactory, used by client to get useful informations about packet processing (sending). * Reliability * Transmit channel * Implement putRawString for some ugly char (_INIT packet), and use it. * Many packet read and write migrated * Implement oldForgePacket to interface writing with current connection * fix U8/char/bool writing * fix string writing and performances. * add some missing functions * Use v3s16 read instead of reading x,y,z separately * Add irr::video::SColor support into packets * Add some missing handlers * Add a template function to increase offset * Throw a serialization error on packet reading (must be improved) PacketFactories: * Create ServerCommandFactory, used by client to get useful informations about packet processing (sending). * Create ClientCommandFactory, used by server to get useful informations about packet processing (sending). Client.cpp: * implement NetworkPacket ::Send interface. * Move packet handlers to a dedicated file * Remove Client::Send(SharedBuffer) Server.cpp: * implement NetworkPacket ::Send interface. * Rewrite all packets using NetworkPacket * Move packet handlers to a dedicated file * Remove Server::Send(SharedBuffer) ClientIface.cpp: * Remove sendToAll(SharedBuffer) Connection.hpp rework: * Remove duplicate include * Remove duplicate negation * Remove a useless variable * Improve code performance by using a m_peers_list instead of scanning m_peers map * Remove Connection::Send(SharedBuffer) * Fix useafterfree into NetworkPacket Sending * Remove unused Connection::sendToAll Test.cpp: * Remove dead code * Update tests to use NetworkPackets Misc: * add new wrappers to Send packets in client, using NetworkPacket * Add NetworkPacket methods for Connection * coding style fix * dead code since changes cleanup * Use v3s16 read instead of reading x,y,z separately in some packets * Use different files to handle packets received by client and server * Cleanup: Remove useless includes ok @Zeno- Tested by @Zeno- @VanessaE and @nerzhul on running servers --- src/network/clientopcodes.cpp | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'src/network/clientopcodes.cpp') diff --git a/src/network/clientopcodes.cpp b/src/network/clientopcodes.cpp index 247c67157..88eef0ad6 100644 --- a/src/network/clientopcodes.cpp +++ b/src/network/clientopcodes.cpp @@ -108,3 +108,77 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] = { "TOCLIENT_LOCAL_PLAYER_ANIMATIONS", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_LocalPlayerAnimations }, // 0x51 { "TOCLIENT_EYE_OFFSET", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_EyeOffset }, // 0x52 }; + +const static ServerCommandFactory null_command_factory = { "TOSERVER_NULL", 0, false }; + +const ServerCommandFactory serverCommandFactoryTable[TOSERVER_NUM_MSG_TYPES] = +{ + null_command_factory, // 0x00 + null_command_factory, // 0x01 + null_command_factory, // 0x02 + null_command_factory, // 0x03 + null_command_factory, // 0x04 + null_command_factory, // 0x05 + null_command_factory, // 0x06 + null_command_factory, // 0x07 + null_command_factory, // 0x08 + null_command_factory, // 0x09 + null_command_factory, // 0x0a + null_command_factory, // 0x0b + null_command_factory, // 0x0c + null_command_factory, // 0x0d + null_command_factory, // 0x0e + null_command_factory, // 0x0f + { "TOSERVER_INIT", 1, false }, // 0x10 + { "TOSERVER_INIT2", 1, true }, // 0x11 + null_command_factory, // 0x12 + null_command_factory, // 0x13 + null_command_factory, // 0x14 + null_command_factory, // 0x15 + null_command_factory, // 0x16 + null_command_factory, // 0x17 + null_command_factory, // 0x18 + null_command_factory, // 0x19 + null_command_factory, // 0x1a + null_command_factory, // 0x1b + null_command_factory, // 0x1c + null_command_factory, // 0x1d + null_command_factory, // 0x1e + null_command_factory, // 0x1f + null_command_factory, // 0x20 + null_command_factory, // 0x21 + null_command_factory, // 0x22 + { "TOSERVER_PLAYERPOS", 0, false }, // 0x23 + { "TOSERVER_GOTBLOCKS", 2, true }, // 0x24 + { "TOSERVER_DELETEDBLOCKS", 2, true }, // 0x25 + null_command_factory, // 0x26 + { "TOSERVER_CLICK_OBJECT", 0, false }, // 0x27 + { "TOSERVER_GROUND_ACTION", 0, false }, // 0x28 + { "TOSERVER_RELEASE", 0, false }, // 0x29 + null_command_factory, // 0x2a + null_command_factory, // 0x2b + null_command_factory, // 0x2c + null_command_factory, // 0x2d + null_command_factory, // 0x2e + null_command_factory, // 0x2f + { "TOSERVER_SIGNTEXT", 0, false }, // 0x30 + { "TOSERVER_INVENTORY_ACTION", 0, true }, // 0x31 + { "TOSERVER_CHAT_MESSAGE", 0, true }, // 0x32 + { "TOSERVER_SIGNNODETEXT", 0, false }, // 0x33 + { "TOSERVER_CLICK_ACTIVEOBJECT", 0, false }, // 0x34 + { "TOSERVER_DAMAGE", 0, true }, // 0x35 + { "TOSERVER_PASSWORD", 0, true }, // 0x36 + { "TOSERVER_PLAYERITEM", 0, true }, // 0x37 + { "TOSERVER_RESPAWN", 0, true }, // 0x38 + { "TOSERVER_INTERACT", 0, true }, // 0x39 + { "TOSERVER_REMOVED_SOUNDS", 1, true }, // 0x3a + { "TOSERVER_NODEMETA_FIELDS", 0, true }, // 0x3b + { "TOSERVER_INVENTORY_FIELDS", 0, true }, // 0x3c + null_command_factory, // 0x3d + null_command_factory, // 0x3e + null_command_factory, // 0x3f + { "TOSERVER_REQUEST_MEDIA", 1, true }, // 0x40 + { "TOSERVER_RECEIVED_MEDIA", 1, true }, // 0x41 + { "TOSERVER_BREATH", 0, true }, // 0x42 + { "TOSERVER_CLIENT_READY", 0, true }, // 0x43 +}; -- cgit v1.2.3