diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2015-01-16 11:37:49 +0100 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-16 11:00:55 +0100 |
commit | ed04e8e9e407f0dd57fa83a9732b3a3968cb80e0 (patch) | |
tree | 488c3b155e78072c0f65a26b8e34b530d059f56c /src/clientiface.cpp | |
parent | efa977518a60c47f3c409449be202298900372e8 (diff) | |
download | minetest-ed04e8e9e407f0dd57fa83a9732b3a3968cb80e0.tar.gz minetest-ed04e8e9e407f0dd57fa83a9732b3a3968cb80e0.tar.bz2 minetest-ed04e8e9e407f0dd57fa83a9732b3a3968cb80e0.zip |
[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<u8>
* 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<u8>)
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
Diffstat (limited to 'src/clientiface.cpp')
-rw-r--r-- | src/clientiface.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 40d1ef811..9b952e36a 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "player.h" #include "settings.h" #include "mapblock.h" -#include "connection.h" +#include "network/connection.h" #include "environment.h" #include "map.h" #include "emerge.h" @@ -625,27 +625,30 @@ void ClientInterface::UpdatePlayerList() } } -void ClientInterface::send(u16 peer_id,u8 channelnum, - SharedBuffer<u8> data, bool reliable) +void ClientInterface::send(u16 peer_id, u8 channelnum, + NetworkPacket* pkt, bool reliable, bool deletepkt) { - m_con->Send(peer_id, channelnum, data, reliable); + m_con->Send(peer_id, channelnum, pkt, reliable); + + if (deletepkt) + delete pkt; } void ClientInterface::sendToAll(u16 channelnum, - SharedBuffer<u8> data, bool reliable) + NetworkPacket* pkt, bool reliable) { JMutexAutoLock clientslock(m_clients_mutex); for(std::map<u16, RemoteClient*>::iterator i = m_clients.begin(); - i != m_clients.end(); ++i) - { + i != m_clients.end(); ++i) { RemoteClient *client = i->second; - if (client->net_proto_version != 0) - { - m_con->Send(client->peer_id, channelnum, data, reliable); + if (client->net_proto_version != 0) { + m_con->Send(client->peer_id, channelnum, pkt, reliable); } } + + delete pkt; } RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min) |