2010-11-29 19:13:04 +01:00
|
|
|
/*
|
2013-02-24 18:40:43 +01:00
|
|
|
Minetest
|
2013-02-24 19:38:45 +01:00
|
|
|
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
|
2010-11-29 19:13:04 +01:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
2012-06-05 16:56:56 +02:00
|
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
2010-11-29 19:13:04 +01:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2012-06-05 16:56:56 +02:00
|
|
|
GNU Lesser General Public License for more details.
|
2010-11-29 19:13:04 +01:00
|
|
|
|
2012-06-05 16:56:56 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
2010-11-29 19:13:04 +01:00
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
#include <iomanip>
|
2017-08-19 22:23:47 +02:00
|
|
|
#include <cerrno>
|
2010-11-27 00:02:21 +01:00
|
|
|
#include "connection.h"
|
|
|
|
#include "serialization.h"
|
2011-10-20 22:04:09 +02:00
|
|
|
#include "log.h"
|
|
|
|
#include "porting.h"
|
2015-03-31 10:35:51 +02:00
|
|
|
#include "network/networkpacket.h"
|
2012-06-17 01:40:36 +02:00
|
|
|
#include "util/serialize.h"
|
|
|
|
#include "util/numeric.h"
|
|
|
|
#include "util/string.h"
|
2012-11-27 08:38:21 +01:00
|
|
|
#include "settings.h"
|
2014-01-06 20:05:28 +01:00
|
|
|
#include "profiler.h"
|
2010-11-27 00:02:21 +01:00
|
|
|
|
|
|
|
namespace con
|
|
|
|
{
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
/******************************************************************************/
|
|
|
|
/* defines used for debugging and profiling */
|
|
|
|
/******************************************************************************/
|
|
|
|
#ifdef NDEBUG
|
|
|
|
#define LOG(a) a
|
|
|
|
#define PROFILE(a)
|
|
|
|
#undef DEBUG_CONNECTION_KBPS
|
|
|
|
#else
|
2014-01-06 20:05:28 +01:00
|
|
|
/* this mutex is used to achieve log message consistency */
|
2017-06-06 16:29:28 +02:00
|
|
|
std::mutex log_message_mutex;
|
2014-01-06 20:05:28 +01:00
|
|
|
#define LOG(a) \
|
|
|
|
{ \
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock loglock(log_message_mutex); \
|
2014-01-06 20:05:28 +01:00
|
|
|
a; \
|
|
|
|
}
|
|
|
|
#define PROFILE(a) a
|
|
|
|
//#define DEBUG_CONNECTION_KBPS
|
|
|
|
#undef DEBUG_CONNECTION_KBPS
|
2014-01-31 00:24:00 +01:00
|
|
|
#endif
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
|
2017-04-29 14:36:55 +02:00
|
|
|
static inline float CALC_DTIME(u64 lasttime, u64 curtime)
|
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
float value = ( curtime - lasttime) / 1000.0;
|
|
|
|
return MYMAX(MYMIN(value,0.1),0.0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MAX_UDP_PEERS 65535
|
|
|
|
|
|
|
|
#define PING_TIMEOUT 5.0
|
|
|
|
|
2016-06-03 09:50:21 +02:00
|
|
|
/* maximum number of retries for reliable packets */
|
|
|
|
#define MAX_RELIABLE_RETRY 5
|
|
|
|
|
2012-06-17 01:40:36 +02:00
|
|
|
static u16 readPeerId(u8 *packetdata)
|
|
|
|
{
|
|
|
|
return readU16(&packetdata[4]);
|
|
|
|
}
|
|
|
|
static u8 readChannel(u8 *packetdata)
|
|
|
|
{
|
|
|
|
return readU8(&packetdata[6]);
|
|
|
|
}
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
BufferedPacket makePacket(Address &address, u8 *data, u32 datasize,
|
|
|
|
u32 protocol_id, u16 sender_peer_id, u8 channel)
|
|
|
|
{
|
|
|
|
u32 packet_size = datasize + BASE_HEADER_SIZE;
|
|
|
|
BufferedPacket p(packet_size);
|
|
|
|
p.address = address;
|
|
|
|
|
|
|
|
writeU32(&p.data[0], protocol_id);
|
|
|
|
writeU16(&p.data[4], sender_peer_id);
|
|
|
|
writeU8(&p.data[6], channel);
|
|
|
|
|
|
|
|
memcpy(&p.data[BASE_HEADER_SIZE], data, datasize);
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
BufferedPacket makePacket(Address &address, SharedBuffer<u8> &data,
|
|
|
|
u32 protocol_id, u16 sender_peer_id, u8 channel)
|
|
|
|
{
|
|
|
|
return makePacket(address, *data, data.getSize(),
|
|
|
|
protocol_id, sender_peer_id, channel);
|
|
|
|
}
|
|
|
|
|
|
|
|
SharedBuffer<u8> makeOriginalPacket(
|
|
|
|
SharedBuffer<u8> data)
|
|
|
|
{
|
|
|
|
u32 header_size = 1;
|
|
|
|
u32 packet_size = data.getSize() + header_size;
|
|
|
|
SharedBuffer<u8> b(packet_size);
|
|
|
|
|
2014-04-06 15:12:04 +02:00
|
|
|
writeU8(&(b[0]), TYPE_ORIGINAL);
|
|
|
|
if (data.getSize() > 0) {
|
|
|
|
memcpy(&(b[header_size]), *data, data.getSize());
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<SharedBuffer<u8> > makeSplitPacket(
|
2010-11-27 00:02:21 +01:00
|
|
|
SharedBuffer<u8> data,
|
|
|
|
u32 chunksize_max,
|
|
|
|
u16 seqnum)
|
|
|
|
{
|
|
|
|
// Chunk packets, containing the TYPE_SPLIT header
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<SharedBuffer<u8> > chunks;
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
u32 chunk_header_size = 7;
|
|
|
|
u32 maximum_data_size = chunksize_max - chunk_header_size;
|
|
|
|
u32 start = 0;
|
|
|
|
u32 end = 0;
|
|
|
|
u32 chunk_num = 0;
|
2012-12-20 18:19:49 +01:00
|
|
|
u16 chunk_count = 0;
|
2010-11-27 00:02:21 +01:00
|
|
|
do{
|
|
|
|
end = start + maximum_data_size - 1;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (end > data.getSize() - 1)
|
2010-11-27 00:02:21 +01:00
|
|
|
end = data.getSize() - 1;
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
u32 payload_size = end - start + 1;
|
|
|
|
u32 packet_size = chunk_header_size + payload_size;
|
|
|
|
|
|
|
|
SharedBuffer<u8> chunk(packet_size);
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
writeU8(&chunk[0], TYPE_SPLIT);
|
|
|
|
writeU16(&chunk[1], seqnum);
|
|
|
|
// [3] u16 chunk_count is written at next stage
|
|
|
|
writeU16(&chunk[5], chunk_num);
|
|
|
|
memcpy(&chunk[chunk_header_size], &data[start], payload_size);
|
|
|
|
|
|
|
|
chunks.push_back(chunk);
|
2012-12-20 18:19:49 +01:00
|
|
|
chunk_count++;
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
start = end + 1;
|
|
|
|
chunk_num++;
|
|
|
|
}
|
|
|
|
while(end != data.getSize() - 1);
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (SharedBuffer<u8> &chunk : chunks) {
|
2010-11-27 00:02:21 +01:00
|
|
|
// Write chunk_count
|
2017-08-19 22:23:47 +02:00
|
|
|
writeU16(&(chunk[3]), chunk_count);
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return chunks;
|
|
|
|
}
|
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<SharedBuffer<u8> > makeAutoSplitPacket(
|
2010-11-27 00:02:21 +01:00
|
|
|
SharedBuffer<u8> data,
|
|
|
|
u32 chunksize_max,
|
|
|
|
u16 &split_seqnum)
|
|
|
|
{
|
|
|
|
u32 original_header_size = 1;
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<SharedBuffer<u8> > list;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (data.getSize() + original_header_size > chunksize_max)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
|
|
|
list = makeSplitPacket(data, chunksize_max, split_seqnum);
|
|
|
|
split_seqnum++;
|
|
|
|
return list;
|
|
|
|
}
|
2017-08-19 22:23:47 +02:00
|
|
|
|
|
|
|
list.push_back(makeOriginalPacket(data));
|
2010-11-27 00:02:21 +01:00
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
SharedBuffer<u8> makeReliablePacket(
|
2017-08-19 22:23:47 +02:00
|
|
|
const SharedBuffer<u8> &data,
|
2010-11-27 00:02:21 +01:00
|
|
|
u16 seqnum)
|
|
|
|
{
|
|
|
|
u32 header_size = 3;
|
|
|
|
u32 packet_size = data.getSize() + header_size;
|
|
|
|
SharedBuffer<u8> b(packet_size);
|
|
|
|
|
|
|
|
writeU8(&b[0], TYPE_RELIABLE);
|
|
|
|
writeU16(&b[1], seqnum);
|
|
|
|
|
|
|
|
memcpy(&b[header_size], *data, data.getSize());
|
|
|
|
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
ReliablePacketBuffer
|
|
|
|
*/
|
|
|
|
|
|
|
|
void ReliablePacketBuffer::print()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<"Dump of ReliablePacketBuffer:" << std::endl);
|
|
|
|
unsigned int index = 0;
|
2017-08-19 22:23:47 +02:00
|
|
|
for (BufferedPacket &bufferedPacket : m_list) {
|
|
|
|
u16 s = readU16(&(bufferedPacket.data[BASE_HEADER_SIZE+1]));
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<index<< ":" << s << std::endl);
|
|
|
|
index++;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
bool ReliablePacketBuffer::empty()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
2010-11-27 00:02:21 +01:00
|
|
|
return m_list.empty();
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
u32 ReliablePacketBuffer::size()
|
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
return m_list_size;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
bool ReliablePacketBuffer::containsPacket(u16 seqnum)
|
|
|
|
{
|
|
|
|
return !(findPacket(seqnum) == m_list.end());
|
|
|
|
}
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
RPBSearchResult ReliablePacketBuffer::findPacket(u16 seqnum)
|
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<BufferedPacket>::iterator i = m_list.begin();
|
|
|
|
for(; i != m_list.end(); ++i)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
|
|
|
u16 s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
|
|
|
|
/*dout_con<<"findPacket(): finding seqnum="<<seqnum
|
|
|
|
<<", comparing to s="<<s<<std::endl;*/
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (s == seqnum)
|
2010-11-27 00:02:21 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
RPBSearchResult ReliablePacketBuffer::notFound()
|
|
|
|
{
|
|
|
|
return m_list.end();
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
bool ReliablePacketBuffer::getFirstSeqnum(u16& result)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_list.empty())
|
2013-08-04 07:17:07 +02:00
|
|
|
return false;
|
2010-11-27 00:02:21 +01:00
|
|
|
BufferedPacket p = *m_list.begin();
|
2014-01-06 20:05:28 +01:00
|
|
|
result = readU16(&p.data[BASE_HEADER_SIZE+1]);
|
2013-08-04 07:17:07 +02:00
|
|
|
return true;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
BufferedPacket ReliablePacketBuffer::popFirst()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_list.empty())
|
2010-11-27 00:02:21 +01:00
|
|
|
throw NotFoundException("Buffer is empty");
|
|
|
|
BufferedPacket p = *m_list.begin();
|
2012-12-20 18:19:49 +01:00
|
|
|
m_list.erase(m_list.begin());
|
|
|
|
--m_list_size;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
if (m_list_size == 0) {
|
|
|
|
m_oldest_non_answered_ack = 0;
|
|
|
|
} else {
|
|
|
|
m_oldest_non_answered_ack =
|
|
|
|
readU16(&(*m_list.begin()).data[BASE_HEADER_SIZE+1]);
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
BufferedPacket ReliablePacketBuffer::popSeqnum(u16 seqnum)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
2010-11-27 00:02:21 +01:00
|
|
|
RPBSearchResult r = findPacket(seqnum);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (r == notFound()) {
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<"Sequence number: " << seqnum
|
|
|
|
<< " not found in reliable buffer"<<std::endl);
|
2010-11-27 00:02:21 +01:00
|
|
|
throw NotFoundException("seqnum not found in buffer");
|
|
|
|
}
|
|
|
|
BufferedPacket p = *r;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
|
|
|
|
RPBSearchResult next = r;
|
2015-08-25 22:23:05 +02:00
|
|
|
++next;
|
2014-01-06 20:05:28 +01:00
|
|
|
if (next != notFound()) {
|
|
|
|
u16 s = readU16(&(next->data[BASE_HEADER_SIZE+1]));
|
|
|
|
m_oldest_non_answered_ack = s;
|
|
|
|
}
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
m_list.erase(r);
|
2012-12-20 18:19:49 +01:00
|
|
|
--m_list_size;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (m_list_size == 0)
|
|
|
|
{ m_oldest_non_answered_ack = 0; }
|
|
|
|
else
|
|
|
|
{ m_oldest_non_answered_ack = readU16(&(*m_list.begin()).data[BASE_HEADER_SIZE+1]); }
|
2010-11-27 00:02:21 +01:00
|
|
|
return p;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
void ReliablePacketBuffer::insert(BufferedPacket &p,u16 next_expected)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
2015-08-05 08:56:23 +02:00
|
|
|
if (p.data.getSize() < BASE_HEADER_SIZE + 3) {
|
|
|
|
errorstream << "ReliablePacketBuffer::insert(): Invalid data size for "
|
|
|
|
"reliable packet" << std::endl;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
u8 type = readU8(&p.data[BASE_HEADER_SIZE + 0]);
|
|
|
|
if (type != TYPE_RELIABLE) {
|
|
|
|
errorstream << "ReliablePacketBuffer::insert(): type is not reliable"
|
|
|
|
<< std::endl;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE + 1]);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2015-08-05 08:56:23 +02:00
|
|
|
if (!seqnum_in_window(seqnum, next_expected, MAX_RELIABLE_WINDOW_SIZE)) {
|
|
|
|
errorstream << "ReliablePacketBuffer::insert(): seqnum is outside of "
|
|
|
|
"expected window " << std::endl;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (seqnum == next_expected) {
|
|
|
|
errorstream << "ReliablePacketBuffer::insert(): seqnum is next expected"
|
|
|
|
<< std::endl;
|
|
|
|
return;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
++m_list_size;
|
2015-03-06 11:21:51 +01:00
|
|
|
sanity_check(m_list_size <= SEQNUM_MAX+1); // FIXME: Handle the error?
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
// Find the right place for the packet and insert it there
|
2010-11-27 00:02:21 +01:00
|
|
|
// If list is empty, just add it
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_list.empty())
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
|
|
|
m_list.push_back(p);
|
2014-01-06 20:05:28 +01:00
|
|
|
m_oldest_non_answered_ack = seqnum;
|
2010-11-27 00:02:21 +01:00
|
|
|
// Done.
|
|
|
|
return;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Otherwise find the right place
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<BufferedPacket>::iterator i = m_list.begin();
|
2010-11-27 00:02:21 +01:00
|
|
|
// Find the first packet in the list which has a higher seqnum
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
|
|
|
|
|
|
|
|
/* case seqnum is smaller then next_expected seqnum */
|
|
|
|
/* this is true e.g. on wrap around */
|
|
|
|
if (seqnum < next_expected) {
|
|
|
|
while(((s < seqnum) || (s >= next_expected)) && (i != m_list.end())) {
|
2015-08-25 22:23:05 +02:00
|
|
|
++i;
|
2014-01-06 20:05:28 +01:00
|
|
|
if (i != m_list.end())
|
|
|
|
s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
/* non wrap around case (at least for incoming and next_expected */
|
|
|
|
else
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
while(((s < seqnum) && (s >= next_expected)) && (i != m_list.end())) {
|
2015-08-25 22:23:05 +02:00
|
|
|
++i;
|
2014-01-06 20:05:28 +01:00
|
|
|
if (i != m_list.end())
|
|
|
|
s = readU16(&(i->data[BASE_HEADER_SIZE+1]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s == seqnum) {
|
|
|
|
if (
|
|
|
|
(readU16(&(i->data[BASE_HEADER_SIZE+1])) != seqnum) ||
|
|
|
|
(i->data.getSize() != p.data.getSize()) ||
|
|
|
|
(i->address != p.address)
|
|
|
|
)
|
|
|
|
{
|
|
|
|
/* if this happens your maximum transfer window may be to big */
|
2014-04-26 01:15:46 +02:00
|
|
|
fprintf(stderr,
|
|
|
|
"Duplicated seqnum %d non matching packet detected:\n",
|
|
|
|
seqnum);
|
2014-01-06 20:05:28 +01:00
|
|
|
fprintf(stderr, "Old: seqnum: %05d size: %04d, address: %s\n",
|
2014-04-26 01:15:46 +02:00
|
|
|
readU16(&(i->data[BASE_HEADER_SIZE+1])),i->data.getSize(),
|
|
|
|
i->address.serializeString().c_str());
|
2015-01-10 12:05:42 +01:00
|
|
|
fprintf(stderr, "New: seqnum: %05d size: %04u, address: %s\n",
|
2014-04-26 01:15:46 +02:00
|
|
|
readU16(&(p.data[BASE_HEADER_SIZE+1])),p.data.getSize(),
|
|
|
|
p.address.serializeString().c_str());
|
2014-01-06 20:05:28 +01:00
|
|
|
throw IncomingDataCorruption("duplicated packet isn't same as original one");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* nothing to do this seems to be a resent packet */
|
|
|
|
/* for paranoia reason data should be compared */
|
|
|
|
--m_list_size;
|
|
|
|
}
|
|
|
|
/* insert or push back */
|
|
|
|
else if (i != m_list.end()) {
|
|
|
|
m_list.insert(i, p);
|
|
|
|
}
|
|
|
|
else {
|
2010-11-27 00:02:21 +01:00
|
|
|
m_list.push_back(p);
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
/* update last packet number */
|
|
|
|
m_oldest_non_answered_ack = readU16(&(*m_list.begin()).data[BASE_HEADER_SIZE+1]);
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void ReliablePacketBuffer::incrementTimeouts(float dtime)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
2017-08-19 22:23:47 +02:00
|
|
|
for (BufferedPacket &bufferedPacket : m_list) {
|
|
|
|
bufferedPacket.time += dtime;
|
|
|
|
bufferedPacket.totaltime += dtime;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
std::list<BufferedPacket> ReliablePacketBuffer::getTimedOuts(float timeout,
|
|
|
|
unsigned int max_packets)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_list_mutex);
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<BufferedPacket> timed_outs;
|
2017-08-19 22:23:47 +02:00
|
|
|
for (BufferedPacket &bufferedPacket : m_list) {
|
|
|
|
if (bufferedPacket.time >= timeout) {
|
|
|
|
timed_outs.push_back(bufferedPacket);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
//this packet will be sent right afterwards reset timeout here
|
2017-08-19 22:23:47 +02:00
|
|
|
bufferedPacket.time = 0.0f;
|
2014-01-06 20:05:28 +01:00
|
|
|
if (timed_outs.size() >= max_packets)
|
|
|
|
break;
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
return timed_outs;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
IncomingSplitBuffer
|
|
|
|
*/
|
|
|
|
|
|
|
|
IncomingSplitBuffer::~IncomingSplitBuffer()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_map_mutex);
|
2017-08-19 22:23:47 +02:00
|
|
|
for (auto &i : m_buf) {
|
|
|
|
delete i.second;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
This will throw a GotSplitPacketException when a full
|
|
|
|
split packet is constructed.
|
|
|
|
*/
|
2011-05-21 11:25:08 +02:00
|
|
|
SharedBuffer<u8> IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_map_mutex);
|
2010-11-27 00:02:21 +01:00
|
|
|
u32 headersize = BASE_HEADER_SIZE + 7;
|
2015-08-05 08:56:23 +02:00
|
|
|
if (p.data.getSize() < headersize) {
|
|
|
|
errorstream << "Invalid data size for split packet" << std::endl;
|
|
|
|
return SharedBuffer<u8>();
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
u8 type = readU8(&p.data[BASE_HEADER_SIZE+0]);
|
|
|
|
u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE+1]);
|
|
|
|
u16 chunk_count = readU16(&p.data[BASE_HEADER_SIZE+3]);
|
|
|
|
u16 chunk_num = readU16(&p.data[BASE_HEADER_SIZE+5]);
|
|
|
|
|
2015-08-05 08:56:23 +02:00
|
|
|
if (type != TYPE_SPLIT) {
|
|
|
|
errorstream << "IncomingSplitBuffer::insert(): type is not split"
|
|
|
|
<< std::endl;
|
|
|
|
return SharedBuffer<u8>();
|
|
|
|
}
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Add if doesn't exist
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_buf.find(seqnum) == m_buf.end())
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
|
|
|
IncomingSplitPacket *sp = new IncomingSplitPacket();
|
|
|
|
sp->chunk_count = chunk_count;
|
|
|
|
sp->reliable = reliable;
|
|
|
|
m_buf[seqnum] = sp;
|
|
|
|
}
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
IncomingSplitPacket *sp = m_buf[seqnum];
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// TODO: These errors should be thrown or something? Dunno.
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (chunk_count != sp->chunk_count)
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<"Connection: WARNING: chunk_count="<<chunk_count
|
2010-11-27 00:02:21 +01:00
|
|
|
<<" != sp->chunk_count="<<sp->chunk_count
|
2014-01-06 20:05:28 +01:00
|
|
|
<<std::endl);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (reliable != sp->reliable)
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<"Connection: WARNING: reliable="<<reliable
|
2010-11-27 00:02:21 +01:00
|
|
|
<<" != sp->reliable="<<sp->reliable
|
2014-01-06 20:05:28 +01:00
|
|
|
<<std::endl);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2012-06-04 21:43:33 +02:00
|
|
|
// If chunk already exists, ignore it.
|
|
|
|
// Sometimes two identical packets may arrive when there is network
|
|
|
|
// lag and the server re-sends stuff.
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (sp->chunks.find(chunk_num) != sp->chunks.end())
|
2012-06-04 21:43:33 +02:00
|
|
|
return SharedBuffer<u8>();
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Cut chunk data out of packet
|
|
|
|
u32 chunkdatasize = p.data.getSize() - headersize;
|
|
|
|
SharedBuffer<u8> chunkdata(chunkdatasize);
|
|
|
|
memcpy(*chunkdata, &(p.data[headersize]), chunkdatasize);
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Set chunk data in buffer
|
|
|
|
sp->chunks[chunk_num] = chunkdata;
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2011-05-21 11:25:08 +02:00
|
|
|
// If not all chunks are received, return empty buffer
|
2017-08-19 22:23:47 +02:00
|
|
|
if (!sp->allReceived())
|
2011-05-21 11:25:08 +02:00
|
|
|
return SharedBuffer<u8>();
|
2010-11-27 00:02:21 +01:00
|
|
|
|
|
|
|
// Calculate total size
|
|
|
|
u32 totalsize = 0;
|
2017-08-19 22:23:47 +02:00
|
|
|
for (const auto &chunk : sp->chunks) {
|
|
|
|
totalsize += chunk.second.getSize();
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
SharedBuffer<u8> fulldata(totalsize);
|
|
|
|
|
|
|
|
// Copy chunks to data buffer
|
|
|
|
u32 start = 0;
|
|
|
|
for(u32 chunk_i=0; chunk_i<sp->chunk_count;
|
|
|
|
chunk_i++)
|
|
|
|
{
|
|
|
|
SharedBuffer<u8> buf = sp->chunks[chunk_i];
|
|
|
|
u16 chunkdatasize = buf.getSize();
|
|
|
|
memcpy(&fulldata[start], *buf, chunkdatasize);
|
|
|
|
start += chunkdatasize;;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove sp from buffer
|
2012-12-20 18:19:49 +01:00
|
|
|
m_buf.erase(seqnum);
|
2010-11-27 00:02:21 +01:00
|
|
|
delete sp;
|
2011-05-21 11:25:08 +02:00
|
|
|
|
|
|
|
return fulldata;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
void IncomingSplitBuffer::removeUnreliableTimedOuts(float dtime, float timeout)
|
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<u16> remove_queue;
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_map_mutex);
|
2017-08-19 22:23:47 +02:00
|
|
|
for (auto &i : m_buf) {
|
|
|
|
IncomingSplitPacket *p = i.second;
|
2014-01-06 20:05:28 +01:00
|
|
|
// Reliable ones are not removed by timeout
|
2017-08-19 22:23:47 +02:00
|
|
|
if (p->reliable)
|
2014-01-06 20:05:28 +01:00
|
|
|
continue;
|
|
|
|
p->time += dtime;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (p->time >= timeout)
|
2017-08-19 22:23:47 +02:00
|
|
|
remove_queue.push_back(i.first);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 j : remove_queue) {
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock listlock(m_map_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<"NOTE: Removing timed out unreliable split packet"<<std::endl);
|
2017-08-19 22:23:47 +02:00
|
|
|
delete m_buf[j];
|
|
|
|
m_buf.erase(j);
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-16 22:11:45 +02:00
|
|
|
/*
|
|
|
|
ConnectionCommand
|
|
|
|
*/
|
|
|
|
|
|
|
|
void ConnectionCommand::send(u16 peer_id_, u8 channelnum_, NetworkPacket *pkt,
|
|
|
|
bool reliable_)
|
|
|
|
{
|
|
|
|
type = CONNCMD_SEND;
|
|
|
|
peer_id = peer_id_;
|
|
|
|
channelnum = channelnum_;
|
|
|
|
data = pkt->oldForgePacket();
|
|
|
|
reliable = reliable_;
|
|
|
|
}
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
/*
|
|
|
|
Channel
|
|
|
|
*/
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 Channel::readNextIncomingSeqNum()
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
return next_incoming_seqnum;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
u16 Channel::incNextIncomingSeqNum()
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 retval = next_incoming_seqnum;
|
|
|
|
next_incoming_seqnum++;
|
|
|
|
return retval;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 Channel::readNextSplitSeqNum()
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
return next_outgoing_split_seqnum;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
void Channel::setNextSplitSeqNum(u16 seqnum)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
next_outgoing_split_seqnum = seqnum;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2015-03-31 09:18:11 +02:00
|
|
|
u16 Channel::getOutgoingSequenceNumber(bool& successful)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 retval = next_outgoing_seqnum;
|
|
|
|
u16 lowest_unacked_seqnumber;
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
/* shortcut if there ain't any packet in outgoing list */
|
|
|
|
if (outgoing_reliables_sent.empty())
|
|
|
|
{
|
|
|
|
next_outgoing_seqnum++;
|
|
|
|
return retval;
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
if (outgoing_reliables_sent.getFirstSeqnum(lowest_unacked_seqnumber))
|
2012-03-20 16:55:34 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
if (lowest_unacked_seqnumber < next_outgoing_seqnum) {
|
|
|
|
// ugly cast but this one is required in order to tell compiler we
|
|
|
|
// know about difference of two unsigned may be negative in general
|
|
|
|
// but we already made sure it won't happen in this case
|
|
|
|
if (((u16)(next_outgoing_seqnum - lowest_unacked_seqnumber)) > window_size) {
|
2015-03-31 09:18:11 +02:00
|
|
|
successful = false;
|
2014-01-06 20:05:28 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// ugly cast but this one is required in order to tell compiler we
|
|
|
|
// know about difference of two unsigned may be negative in general
|
|
|
|
// but we already made sure it won't happen in this case
|
|
|
|
if ((next_outgoing_seqnum + (u16)(SEQNUM_MAX - lowest_unacked_seqnumber)) >
|
|
|
|
window_size) {
|
2015-03-31 09:18:11 +02:00
|
|
|
successful = false;
|
2014-01-06 20:05:28 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2012-03-20 16:55:34 +01:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
next_outgoing_seqnum++;
|
|
|
|
return retval;
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 Channel::readOutgoingSequenceNumber()
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
return next_outgoing_seqnum;
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
bool Channel::putBackSequenceNumber(u16 seqnum)
|
|
|
|
{
|
|
|
|
if (((seqnum + 1) % (SEQNUM_MAX+1)) == next_outgoing_seqnum) {
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
next_outgoing_seqnum = seqnum;
|
|
|
|
return true;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
return false;
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void Channel::UpdateBytesSent(unsigned int bytes, unsigned int packets)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
current_bytes_transfered += bytes;
|
|
|
|
current_packet_successfull += packets;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
void Channel::UpdateBytesReceived(unsigned int bytes) {
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-04-26 01:15:46 +02:00
|
|
|
current_bytes_received += bytes;
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void Channel::UpdateBytesLost(unsigned int bytes)
|
2010-12-24 16:08:50 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
current_bytes_lost += bytes;
|
2010-12-24 16:08:50 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
void Channel::UpdatePacketLossCounter(unsigned int count)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
current_packet_loss += count;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void Channel::UpdatePacketTooLateCounter()
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
current_packet_too_late++;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
void Channel::UpdateTimers(float dtime,bool legacy_peer)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
bpm_counter += dtime;
|
|
|
|
packet_loss_counter += dtime;
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
if (packet_loss_counter > 1.0)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
packet_loss_counter -= 1.0;
|
|
|
|
|
|
|
|
unsigned int packet_loss = 11; /* use a neutral value for initialization */
|
|
|
|
unsigned int packets_successfull = 0;
|
2015-01-19 05:29:19 +01:00
|
|
|
//unsigned int packet_too_late = 0;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
bool reasonable_amount_of_data_transmitted = false;
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
packet_loss = current_packet_loss;
|
2015-01-19 05:29:19 +01:00
|
|
|
//packet_too_late = current_packet_too_late;
|
2014-01-06 20:05:28 +01:00
|
|
|
packets_successfull = current_packet_successfull;
|
|
|
|
|
2014-05-04 02:43:01 +02:00
|
|
|
if (current_bytes_transfered > (unsigned int) (window_size*512/2))
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
reasonable_amount_of_data_transmitted = true;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
current_packet_loss = 0;
|
|
|
|
current_packet_too_late = 0;
|
|
|
|
current_packet_successfull = 0;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
/* dynamic window size is only available for non legacy peers */
|
|
|
|
if (!legacy_peer) {
|
|
|
|
float successfull_to_lost_ratio = 0.0;
|
|
|
|
bool done = false;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
if (packets_successfull > 0) {
|
|
|
|
successfull_to_lost_ratio = packet_loss/packets_successfull;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2014-04-26 01:15:46 +02:00
|
|
|
else if (packet_loss > 0)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
window_size = MYMAX(
|
2014-04-26 01:15:46 +02:00
|
|
|
(window_size - 10),
|
|
|
|
MIN_RELIABLE_WINDOW_SIZE);
|
|
|
|
done = true;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-04-26 01:15:46 +02:00
|
|
|
|
|
|
|
if (!done)
|
2010-12-24 16:08:50 +01:00
|
|
|
{
|
2014-04-26 01:15:46 +02:00
|
|
|
if ((successfull_to_lost_ratio < 0.01) &&
|
|
|
|
(window_size < MAX_RELIABLE_WINDOW_SIZE))
|
|
|
|
{
|
|
|
|
/* don't even think about increasing if we didn't even
|
|
|
|
* use major parts of our window */
|
|
|
|
if (reasonable_amount_of_data_transmitted)
|
|
|
|
window_size = MYMIN(
|
|
|
|
(window_size + 100),
|
|
|
|
MAX_RELIABLE_WINDOW_SIZE);
|
|
|
|
}
|
|
|
|
else if ((successfull_to_lost_ratio < 0.05) &&
|
|
|
|
(window_size < MAX_RELIABLE_WINDOW_SIZE))
|
|
|
|
{
|
|
|
|
/* don't even think about increasing if we didn't even
|
|
|
|
* use major parts of our window */
|
|
|
|
if (reasonable_amount_of_data_transmitted)
|
|
|
|
window_size = MYMIN(
|
|
|
|
(window_size + 50),
|
|
|
|
MAX_RELIABLE_WINDOW_SIZE);
|
|
|
|
}
|
|
|
|
else if (successfull_to_lost_ratio > 0.15)
|
|
|
|
{
|
|
|
|
window_size = MYMAX(
|
|
|
|
(window_size - 100),
|
|
|
|
MIN_RELIABLE_WINDOW_SIZE);
|
|
|
|
}
|
|
|
|
else if (successfull_to_lost_ratio > 0.1)
|
|
|
|
{
|
|
|
|
window_size = MYMAX(
|
|
|
|
(window_size - 50),
|
|
|
|
MIN_RELIABLE_WINDOW_SIZE);
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
if (bpm_counter > 10.0)
|
|
|
|
{
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock internal(m_internal_mutex);
|
2014-04-26 01:15:46 +02:00
|
|
|
cur_kbps =
|
|
|
|
(((float) current_bytes_transfered)/bpm_counter)/1024.0;
|
2014-01-06 20:05:28 +01:00
|
|
|
current_bytes_transfered = 0;
|
2014-04-26 01:15:46 +02:00
|
|
|
cur_kbps_lost =
|
|
|
|
(((float) current_bytes_lost)/bpm_counter)/1024.0;
|
|
|
|
current_bytes_lost = 0;
|
|
|
|
cur_incoming_kbps =
|
|
|
|
(((float) current_bytes_received)/bpm_counter)/1024.0;
|
|
|
|
current_bytes_received = 0;
|
|
|
|
bpm_counter = 0;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
if (cur_kbps > max_kbps)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
max_kbps = cur_kbps;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
if (cur_kbps_lost > max_kbps_lost)
|
|
|
|
{
|
|
|
|
max_kbps_lost = cur_kbps_lost;
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
if (cur_incoming_kbps > max_incoming_kbps) {
|
|
|
|
max_incoming_kbps = cur_incoming_kbps;
|
|
|
|
}
|
|
|
|
|
|
|
|
rate_samples = MYMIN(rate_samples+1,10);
|
|
|
|
float old_fraction = ((float) (rate_samples-1) )/( (float) rate_samples);
|
|
|
|
avg_kbps = avg_kbps * old_fraction +
|
|
|
|
cur_kbps * (1.0 - old_fraction);
|
|
|
|
avg_kbps_lost = avg_kbps_lost * old_fraction +
|
|
|
|
cur_kbps_lost * (1.0 - old_fraction);
|
|
|
|
avg_incoming_kbps = avg_incoming_kbps * old_fraction +
|
|
|
|
cur_incoming_kbps * (1.0 - old_fraction);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Peer
|
|
|
|
*/
|
|
|
|
|
|
|
|
PeerHelper::PeerHelper(Peer* peer) :
|
|
|
|
m_peer(peer)
|
|
|
|
{
|
2017-06-21 08:28:57 +02:00
|
|
|
if (peer && !peer->IncUseCount())
|
|
|
|
m_peer = nullptr;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
PeerHelper::~PeerHelper()
|
|
|
|
{
|
2017-06-21 08:28:57 +02:00
|
|
|
if (m_peer)
|
2014-01-06 20:05:28 +01:00
|
|
|
m_peer->DecUseCount();
|
|
|
|
|
2017-06-21 08:28:57 +02:00
|
|
|
m_peer = nullptr;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
PeerHelper& PeerHelper::operator=(Peer* peer)
|
|
|
|
{
|
|
|
|
m_peer = peer;
|
2017-06-21 08:28:57 +02:00
|
|
|
if (peer && !peer->IncUseCount())
|
|
|
|
m_peer = nullptr;
|
2014-01-06 20:05:28 +01:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
Peer* PeerHelper::operator->() const
|
|
|
|
{
|
|
|
|
return m_peer;
|
|
|
|
}
|
|
|
|
|
|
|
|
Peer* PeerHelper::operator&() const
|
|
|
|
{
|
|
|
|
return m_peer;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool PeerHelper::operator!() {
|
|
|
|
return ! m_peer;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool PeerHelper::operator!=(void* ptr)
|
|
|
|
{
|
|
|
|
return ((void*) m_peer != ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Peer::IncUseCount()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock lock(m_exclusive_access_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2017-06-21 08:28:57 +02:00
|
|
|
if (!m_pending_deletion) {
|
2014-01-06 20:05:28 +01:00
|
|
|
this->m_usage++;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Peer::DecUseCount()
|
|
|
|
{
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock lock(m_exclusive_access_mutex);
|
2015-03-06 11:21:51 +01:00
|
|
|
sanity_check(m_usage > 0);
|
2014-01-06 20:05:28 +01:00
|
|
|
m_usage--;
|
|
|
|
|
|
|
|
if (!((m_pending_deletion) && (m_usage == 0)))
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
|
2017-04-21 10:06:08 +02:00
|
|
|
void Peer::RTTStatistics(float rtt, const std::string &profiler_id,
|
2014-04-26 01:15:46 +02:00
|
|
|
unsigned int num_samples) {
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (m_last_rtt > 0) {
|
|
|
|
/* set min max values */
|
|
|
|
if (rtt < m_rtt.min_rtt)
|
|
|
|
m_rtt.min_rtt = rtt;
|
|
|
|
if (rtt >= m_rtt.max_rtt)
|
|
|
|
m_rtt.max_rtt = rtt;
|
|
|
|
|
|
|
|
/* do average calculation */
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_rtt.avg_rtt < 0.0)
|
2014-01-06 20:05:28 +01:00
|
|
|
m_rtt.avg_rtt = rtt;
|
|
|
|
else
|
|
|
|
m_rtt.avg_rtt = m_rtt.avg_rtt * (num_samples/(num_samples-1)) +
|
|
|
|
rtt * (1/num_samples);
|
|
|
|
|
|
|
|
/* do jitter calculation */
|
|
|
|
|
|
|
|
//just use some neutral value at beginning
|
|
|
|
float jitter = m_rtt.jitter_min;
|
|
|
|
|
|
|
|
if (rtt > m_last_rtt)
|
|
|
|
jitter = rtt-m_last_rtt;
|
|
|
|
|
|
|
|
if (rtt <= m_last_rtt)
|
|
|
|
jitter = m_last_rtt - rtt;
|
|
|
|
|
|
|
|
if (jitter < m_rtt.jitter_min)
|
|
|
|
m_rtt.jitter_min = jitter;
|
|
|
|
if (jitter >= m_rtt.jitter_max)
|
|
|
|
m_rtt.jitter_max = jitter;
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_rtt.jitter_avg < 0.0)
|
2014-01-06 20:05:28 +01:00
|
|
|
m_rtt.jitter_avg = jitter;
|
|
|
|
else
|
|
|
|
m_rtt.jitter_avg = m_rtt.jitter_avg * (num_samples/(num_samples-1)) +
|
|
|
|
jitter * (1/num_samples);
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
if (!profiler_id.empty()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
g_profiler->graphAdd(profiler_id + "_rtt", rtt);
|
|
|
|
g_profiler->graphAdd(profiler_id + "_jitter", jitter);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* save values required for next loop */
|
|
|
|
m_last_rtt = rtt;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Peer::isTimedOut(float timeout)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock lock(m_exclusive_access_mutex);
|
2017-04-29 14:36:55 +02:00
|
|
|
u64 current_time = porting::getTimeMs();
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
float dtime = CALC_DTIME(m_last_timeout_check,current_time);
|
|
|
|
m_last_timeout_check = current_time;
|
|
|
|
|
|
|
|
m_timeout_counter += dtime;
|
|
|
|
|
|
|
|
return m_timeout_counter > timeout;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Peer::Drop()
|
|
|
|
{
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock usage_lock(m_exclusive_access_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
m_pending_deletion = true;
|
|
|
|
if (m_usage != 0)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
PROFILE(std::stringstream peerIdentifier1);
|
2014-04-26 01:15:46 +02:00
|
|
|
PROFILE(peerIdentifier1 << "runTimeouts[" << m_connection->getDesc()
|
|
|
|
<< ";" << id << ";RELIABLE]");
|
2014-01-06 20:05:28 +01:00
|
|
|
PROFILE(g_profiler->remove(peerIdentifier1.str()));
|
|
|
|
PROFILE(std::stringstream peerIdentifier2);
|
2014-04-26 01:15:46 +02:00
|
|
|
PROFILE(peerIdentifier2 << "sendPackets[" << m_connection->getDesc()
|
|
|
|
<< ";" << id << ";RELIABLE]");
|
2014-01-06 20:05:28 +01:00
|
|
|
PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier2.str(), SPT_AVG));
|
|
|
|
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
|
|
|
|
UDPPeer::UDPPeer(u16 a_id, Address a_address, Connection* connection) :
|
2017-06-21 08:28:57 +02:00
|
|
|
Peer(a_address,a_id,connection)
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UDPPeer::getAddress(MTProtocols type,Address& toset)
|
|
|
|
{
|
2014-06-28 08:02:38 +02:00
|
|
|
if ((type == MTP_UDP) || (type == MTP_MINETEST_RELIABLE_UDP) || (type == MTP_PRIMARY))
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
toset = address;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
void UDPPeer::setNonLegacyPeer()
|
|
|
|
{
|
|
|
|
m_legacy_peer = false;
|
|
|
|
for(unsigned int i=0; i< CHANNEL_COUNT; i++)
|
|
|
|
{
|
|
|
|
channels->setWindowSize(g_settings->getU16("max_packets_per_iteration"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void UDPPeer::reportRTT(float rtt)
|
|
|
|
{
|
|
|
|
if (rtt < 0.0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
RTTStatistics(rtt,"rudp",MAX_RELIABLE_WINDOW_SIZE*10);
|
|
|
|
|
|
|
|
float timeout = getStat(AVG_RTT) * RESEND_TIMEOUT_FACTOR;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (timeout < RESEND_TIMEOUT_MIN)
|
2014-01-06 20:05:28 +01:00
|
|
|
timeout = RESEND_TIMEOUT_MIN;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (timeout > RESEND_TIMEOUT_MAX)
|
2014-01-06 20:05:28 +01:00
|
|
|
timeout = RESEND_TIMEOUT_MAX;
|
|
|
|
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock usage_lock(m_exclusive_access_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
resend_timeout = timeout;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UDPPeer::Ping(float dtime,SharedBuffer<u8>& data)
|
|
|
|
{
|
|
|
|
m_ping_timer += dtime;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_ping_timer >= PING_TIMEOUT)
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
// Create and send PING packet
|
|
|
|
writeU8(&data[0], TYPE_CONTROL);
|
|
|
|
writeU8(&data[1], CONTROLTYPE_PING);
|
|
|
|
m_ping_timer = 0.0;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UDPPeer::PutReliableSendCommand(ConnectionCommand &c,
|
|
|
|
unsigned int max_packet_size)
|
|
|
|
{
|
2014-01-31 00:24:00 +01:00
|
|
|
if (m_pending_disconnect)
|
|
|
|
return;
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
if ( channels[c.channelnum].queued_commands.empty() &&
|
|
|
|
/* don't queue more packets then window size */
|
|
|
|
(channels[c.channelnum].queued_reliables.size()
|
2015-03-04 17:48:07 +01:00
|
|
|
< (channels[c.channelnum].getWindowSize()/2))) {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" processing reliable command for peer id: " << c.peer_id
|
|
|
|
<<" data size: " << c.data.getSize() << std::endl);
|
2015-03-04 17:48:07 +01:00
|
|
|
if (!processReliableSendCommand(c,max_packet_size)) {
|
2015-03-29 10:49:43 +02:00
|
|
|
channels[c.channelnum].queued_commands.push_back(c);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
2015-03-04 17:48:07 +01:00
|
|
|
else {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" Queueing reliable command for peer id: " << c.peer_id
|
|
|
|
<<" data size: " << c.data.getSize() <<std::endl);
|
2015-03-29 10:49:43 +02:00
|
|
|
channels[c.channelnum].queued_commands.push_back(c);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UDPPeer::processReliableSendCommand(
|
|
|
|
ConnectionCommand &c,
|
|
|
|
unsigned int max_packet_size)
|
|
|
|
{
|
2014-01-31 00:24:00 +01:00
|
|
|
if (m_pending_disconnect)
|
|
|
|
return true;
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
u32 chunksize_max = max_packet_size
|
|
|
|
- BASE_HEADER_SIZE
|
|
|
|
- RELIABLE_HEADER_SIZE;
|
|
|
|
|
2015-03-06 11:21:51 +01:00
|
|
|
sanity_check(c.data.getSize() < MAX_RELIABLE_WINDOW_SIZE*512);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
std::list<SharedBuffer<u8> > originals;
|
|
|
|
u16 split_sequence_number = channels[c.channelnum].readNextSplitSeqNum();
|
|
|
|
|
|
|
|
if (c.raw)
|
|
|
|
{
|
2017-08-19 22:23:47 +02:00
|
|
|
originals.emplace_back(c.data);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
originals = makeAutoSplitPacket(c.data, chunksize_max,split_sequence_number);
|
|
|
|
channels[c.channelnum].setNextSplitSeqNum(split_sequence_number);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool have_sequence_number = true;
|
|
|
|
bool have_initial_sequence_number = false;
|
2015-03-04 17:48:07 +01:00
|
|
|
std::queue<BufferedPacket> toadd;
|
2014-01-06 20:05:28 +01:00
|
|
|
volatile u16 initial_sequence_number = 0;
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (SharedBuffer<u8> &original : originals) {
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 seqnum = channels[c.channelnum].getOutgoingSequenceNumber(have_sequence_number);
|
|
|
|
|
|
|
|
/* oops, we don't have enough sequence numbers to send this packet */
|
|
|
|
if (!have_sequence_number)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!have_initial_sequence_number)
|
|
|
|
{
|
|
|
|
initial_sequence_number = seqnum;
|
|
|
|
have_initial_sequence_number = true;
|
|
|
|
}
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
SharedBuffer<u8> reliable = makeReliablePacket(original, seqnum);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
// Add base headers and make a packet
|
|
|
|
BufferedPacket p = con::makePacket(address, reliable,
|
|
|
|
m_connection->GetProtocolID(), m_connection->GetPeerID(),
|
|
|
|
c.channelnum);
|
|
|
|
|
2015-03-04 17:48:07 +01:00
|
|
|
toadd.push(p);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (have_sequence_number) {
|
|
|
|
volatile u16 pcount = 0;
|
2017-08-19 22:23:47 +02:00
|
|
|
while (!toadd.empty()) {
|
2015-03-04 17:48:07 +01:00
|
|
|
BufferedPacket p = toadd.front();
|
|
|
|
toadd.pop();
|
2014-01-06 20:05:28 +01:00
|
|
|
// LOG(dout_con<<connection->getDesc()
|
|
|
|
// << " queuing reliable packet for peer_id: " << c.peer_id
|
|
|
|
// << " channel: " << (c.channelnum&0xFF)
|
|
|
|
// << " seqnum: " << readU16(&p.data[BASE_HEADER_SIZE+1])
|
|
|
|
// << std::endl)
|
2015-03-04 17:48:07 +01:00
|
|
|
channels[c.channelnum].queued_reliables.push(p);
|
2014-01-06 20:05:28 +01:00
|
|
|
pcount++;
|
|
|
|
}
|
2015-03-06 11:21:51 +01:00
|
|
|
sanity_check(channels[c.channelnum].queued_reliables.size() < 0xFFFF);
|
2014-01-06 20:05:28 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
volatile u16 packets_available = toadd.size();
|
|
|
|
/* we didn't get a single sequence number no need to fill queue */
|
|
|
|
if (!have_initial_sequence_number) {
|
2014-01-06 20:05:28 +01:00
|
|
|
return false;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2017-08-19 22:23:47 +02:00
|
|
|
|
|
|
|
while (!toadd.empty()) {
|
|
|
|
/* remove packet */
|
|
|
|
toadd.pop();
|
|
|
|
|
|
|
|
bool successfully_put_back_sequence_number
|
|
|
|
= channels[c.channelnum].putBackSequenceNumber(
|
|
|
|
(initial_sequence_number+toadd.size() % (SEQNUM_MAX+1)));
|
|
|
|
|
|
|
|
FATAL_ERROR_IF(!successfully_put_back_sequence_number, "error");
|
|
|
|
}
|
|
|
|
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<< " Windowsize exceeded on reliable sending "
|
|
|
|
<< c.data.getSize() << " bytes"
|
|
|
|
<< std::endl << "\t\tinitial_sequence_number: "
|
|
|
|
<< initial_sequence_number
|
|
|
|
<< std::endl << "\t\tgot at most : "
|
|
|
|
<< packets_available << " packets"
|
|
|
|
<< std::endl << "\t\tpackets queued : "
|
|
|
|
<< channels[c.channelnum].outgoing_reliables_sent.size()
|
|
|
|
<< std::endl);
|
|
|
|
|
|
|
|
return false;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void UDPPeer::RunCommandQueues(
|
|
|
|
unsigned int max_packet_size,
|
|
|
|
unsigned int maxcommands,
|
|
|
|
unsigned int maxtransfer)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2012-11-27 08:38:21 +01:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (Channel &channel : channels) {
|
2014-01-06 20:05:28 +01:00
|
|
|
unsigned int commands_processed = 0;
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
if ((!channel.queued_commands.empty()) &&
|
|
|
|
(channel.queued_reliables.size() < maxtransfer) &&
|
2015-03-29 10:49:43 +02:00
|
|
|
(commands_processed < maxcommands)) {
|
2014-01-06 20:05:28 +01:00
|
|
|
try {
|
2017-08-19 22:23:47 +02:00
|
|
|
ConnectionCommand c = channel.queued_commands.front();
|
2015-03-31 09:22:44 +02:00
|
|
|
|
|
|
|
LOG(dout_con << m_connection->getDesc()
|
|
|
|
<< " processing queued reliable command " << std::endl);
|
|
|
|
|
|
|
|
// Packet is processed, remove it from queue
|
|
|
|
if (processReliableSendCommand(c,max_packet_size)) {
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.queued_commands.pop_front();
|
2015-03-31 09:22:44 +02:00
|
|
|
} else {
|
|
|
|
LOG(dout_con << m_connection->getDesc()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< " Failed to queue packets for peer_id: " << c.peer_id
|
2014-04-26 01:15:46 +02:00
|
|
|
<< ", delaying sending of " << c.data.getSize()
|
|
|
|
<< " bytes" << std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
2014-02-27 21:12:59 +01:00
|
|
|
catch (ItemNotFoundException &e) {
|
2014-01-06 20:05:28 +01:00
|
|
|
// intentionally empty
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
u16 UDPPeer::getNextSplitSequenceNumber(u8 channel)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(channel < CHANNEL_COUNT); // Pre-condition
|
2016-12-29 13:44:47 +01:00
|
|
|
return channels[channel].readNextSplitSeqNum();
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void UDPPeer::setNextSplitSequenceNumber(u8 channel, u16 seqnum)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(channel < CHANNEL_COUNT); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
channels[channel].setNextSplitSeqNum(seqnum);
|
|
|
|
}
|
|
|
|
|
|
|
|
SharedBuffer<u8> UDPPeer::addSpiltPacket(u8 channel,
|
|
|
|
BufferedPacket toadd,
|
|
|
|
bool reliable)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(channel < CHANNEL_COUNT); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
return channels[channel].incoming_splits.insert(toadd,reliable);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* Connection Threads */
|
|
|
|
/******************************************************************************/
|
|
|
|
|
2015-04-07 12:13:12 +02:00
|
|
|
ConnectionSendThread::ConnectionSendThread(unsigned int max_packet_size,
|
|
|
|
float timeout) :
|
|
|
|
Thread("ConnectionSend"),
|
2014-01-06 20:05:28 +01:00
|
|
|
m_max_packet_size(max_packet_size),
|
|
|
|
m_timeout(timeout),
|
2017-06-21 08:28:57 +02:00
|
|
|
m_max_data_packets_per_iteration(g_settings->getU16("max_packets_per_iteration"))
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2015-04-07 12:13:12 +02:00
|
|
|
void * ConnectionSendThread::run()
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
assert(m_connection);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"ConnectionSend thread started"<<std::endl);
|
|
|
|
|
2017-04-29 14:36:55 +02:00
|
|
|
u64 curtime = porting::getTimeMs();
|
|
|
|
u64 lasttime = curtime;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
PROFILE(std::stringstream ThreadIdentifier);
|
|
|
|
PROFILE(ThreadIdentifier << "ConnectionSend: [" << m_connection->getDesc() << "]");
|
|
|
|
|
|
|
|
/* if stop is requested don't stop immediately but try to send all */
|
|
|
|
/* packets first */
|
2015-04-07 12:13:12 +02:00
|
|
|
while(!stopRequested() || packetsQueued()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
BEGIN_DEBUG_EXCEPTION_HANDLER
|
|
|
|
PROFILE(ScopeProfiler sp(g_profiler, ThreadIdentifier.str(), SPT_AVG));
|
|
|
|
|
|
|
|
m_iteration_packets_avaialble = m_max_data_packets_per_iteration;
|
|
|
|
|
|
|
|
/* wait for trigger or timeout */
|
2015-04-07 12:13:12 +02:00
|
|
|
m_send_sleep_semaphore.wait(50);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
/* remove all triggers */
|
2015-04-07 12:13:12 +02:00
|
|
|
while(m_send_sleep_semaphore.wait(0)) {}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
lasttime = curtime;
|
|
|
|
curtime = porting::getTimeMs();
|
|
|
|
float dtime = CALC_DTIME(lasttime,curtime);
|
|
|
|
|
|
|
|
/* first do all the reliable stuff */
|
|
|
|
runTimeouts(dtime);
|
|
|
|
|
|
|
|
/* translate commands to packets */
|
|
|
|
ConnectionCommand c = m_connection->m_command_queue.pop_frontNoEx(0);
|
|
|
|
while(c.type != CONNCMD_NONE)
|
|
|
|
{
|
|
|
|
if (c.reliable)
|
|
|
|
processReliableCommand(c);
|
|
|
|
else
|
|
|
|
processNonReliableCommand(c);
|
|
|
|
|
|
|
|
c = m_connection->m_command_queue.pop_frontNoEx(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* send non reliable packets */
|
|
|
|
sendPackets(dtime);
|
|
|
|
|
2015-10-14 08:33:04 +02:00
|
|
|
END_DEBUG_EXCEPTION_HANDLER
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
PROFILE(g_profiler->remove(ThreadIdentifier.str()));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ConnectionSendThread::Trigger()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
m_send_sleep_semaphore.post();
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool ConnectionSendThread::packetsQueued()
|
|
|
|
{
|
|
|
|
std::list<u16> peerIds = m_connection->getPeerIDs();
|
|
|
|
|
2014-12-12 15:55:40 +01:00
|
|
|
if (!m_outgoing_queue.empty() && !peerIds.empty())
|
2014-01-06 20:05:28 +01:00
|
|
|
return true;
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerId : peerIds) {
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peerId);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (!peer)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (dynamic_cast<UDPPeer*>(&peer) == 0)
|
|
|
|
continue;
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (Channel &channel : (dynamic_cast<UDPPeer *>(&peer))->channels) {
|
2017-08-20 13:30:50 +02:00
|
|
|
if (!channel.queued_commands.empty()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ConnectionSendThread::runTimeouts(float dtime)
|
|
|
|
{
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<u16> timeouted_peers;
|
2014-01-06 20:05:28 +01:00
|
|
|
std::list<u16> peerIds = m_connection->getPeerIDs();
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 &peerId : peerIds) {
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peerId);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (!peer)
|
|
|
|
continue;
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (dynamic_cast<UDPPeer*>(&peer) == 0)
|
2014-01-06 20:05:28 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
PROFILE(std::stringstream peerIdentifier);
|
2014-04-26 01:15:46 +02:00
|
|
|
PROFILE(peerIdentifier << "runTimeouts[" << m_connection->getDesc()
|
2017-08-19 22:23:47 +02:00
|
|
|
<< ";" << peerId << ";RELIABLE]");
|
2014-01-06 20:05:28 +01:00
|
|
|
PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier.str(), SPT_AVG));
|
|
|
|
|
|
|
|
SharedBuffer<u8> data(2); // data for sending ping, required here because of goto
|
2012-11-27 08:38:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
/*
|
|
|
|
Check peer timeout
|
|
|
|
*/
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (peer->isTimedOut(m_timeout))
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-06-10 20:11:06 +02:00
|
|
|
infostream<<m_connection->getDesc()
|
2014-01-06 20:05:28 +01:00
|
|
|
<<"RunTimeouts(): Peer "<<peer->id
|
2011-10-20 22:04:09 +02:00
|
|
|
<<" has timed out."
|
|
|
|
<<" (source=peer->timeout_counter)"
|
2014-04-19 22:12:01 +02:00
|
|
|
<<std::endl;
|
2011-10-20 22:04:09 +02:00
|
|
|
// Add peer to the list
|
|
|
|
timeouted_peers.push_back(peer->id);
|
|
|
|
// Don't bother going through the buffers of this one
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
float resend_timeout = dynamic_cast<UDPPeer*>(&peer)->getResendTimeout();
|
2016-06-03 09:50:21 +02:00
|
|
|
bool retry_count_exceeded = false;
|
2017-08-19 22:23:47 +02:00
|
|
|
for (Channel &channel : (dynamic_cast<UDPPeer *>(&peer))->channels) {
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<BufferedPacket> timed_outs;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer())
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.setWindowSize(g_settings->getU16("workaround_window_size"));
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Remove timed out incomplete unreliable split packets
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.incoming_splits.removeUnreliableTimedOuts(dtime, m_timeout);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Increment reliable packet times
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.outgoing_reliables_sent.incrementTimeouts(dtime);
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
unsigned int numpeers = m_connection->m_peers.size();
|
|
|
|
|
|
|
|
if (numpeers == 0)
|
|
|
|
return;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
|
|
|
// Re-send timed out outgoing reliables
|
2017-08-19 22:23:47 +02:00
|
|
|
timed_outs = channel.outgoing_reliables_sent.getTimedOuts(resend_timeout,
|
|
|
|
(m_max_data_packets_per_iteration/numpeers));
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.UpdatePacketLossCounter(timed_outs.size());
|
2014-07-12 15:58:08 +02:00
|
|
|
g_profiler->graphAdd("packets_lost", timed_outs.size());
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
m_iteration_packets_avaialble -= timed_outs.size();
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
for(std::list<BufferedPacket>::iterator k = timed_outs.begin();
|
|
|
|
k != timed_outs.end(); ++k)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-04-26 01:15:46 +02:00
|
|
|
u16 peer_id = readPeerId(*(k->data));
|
|
|
|
u8 channelnum = readChannel(*(k->data));
|
|
|
|
u16 seqnum = readU16(&(k->data[BASE_HEADER_SIZE+1]));
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.UpdateBytesLost(k->data.getSize());
|
2014-07-12 15:58:08 +02:00
|
|
|
k->resend_count++;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2016-06-03 09:50:21 +02:00
|
|
|
if (k-> resend_count > MAX_RELIABLE_RETRY) {
|
|
|
|
retry_count_exceeded = true;
|
|
|
|
timeouted_peers.push_back(peer->id);
|
|
|
|
/* no need to check additional packets if a single one did timeout*/
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"RE-SENDING timed-out RELIABLE to "
|
2014-04-26 01:15:46 +02:00
|
|
|
<< k->address.serializeString()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< "(t/o="<<resend_timeout<<"): "
|
|
|
|
<<"from_peer_id="<<peer_id
|
|
|
|
<<", channel="<<((int)channelnum&0xff)
|
|
|
|
<<", seqnum="<<seqnum
|
|
|
|
<<std::endl);
|
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
rawSend(*k);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
// do not handle rtt here as we can't decide if this packet was
|
|
|
|
// lost or really takes more time to transmit
|
|
|
|
}
|
2016-06-03 09:50:21 +02:00
|
|
|
|
|
|
|
if (retry_count_exceeded) {
|
|
|
|
break; /* no need to check other channels if we already did timeout */
|
|
|
|
}
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.UpdateTimers(dtime,dynamic_cast<UDPPeer*>(&peer)->getLegacyPeer());
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
2016-06-03 09:50:21 +02:00
|
|
|
/* skip to next peer if we did timeout */
|
|
|
|
if (retry_count_exceeded)
|
|
|
|
continue;
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
/* send ping if necessary */
|
|
|
|
if (dynamic_cast<UDPPeer*>(&peer)->Ping(dtime,data)) {
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"Sending ping for peer_id: "
|
|
|
|
<< dynamic_cast<UDPPeer*>(&peer)->id <<std::endl);
|
|
|
|
/* this may fail if there ain't a sequence number left */
|
|
|
|
if (!rawSendAsPacket(dynamic_cast<UDPPeer*>(&peer)->id, 0, data, true))
|
|
|
|
{
|
|
|
|
//retrigger with reduced ping interval
|
|
|
|
dynamic_cast<UDPPeer*>(&peer)->Ping(4.0,data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dynamic_cast<UDPPeer*>(&peer)->RunCommandQueues(m_max_packet_size,
|
|
|
|
m_max_commands_per_iteration,
|
|
|
|
m_max_packets_requeued);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove timed out peers
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 timeouted_peer : timeouted_peers) {
|
|
|
|
LOG(derr_con << m_connection->getDesc()
|
|
|
|
<< "RunTimeouts(): Removing peer "<< timeouted_peer <<std::endl);
|
|
|
|
m_connection->deletePeer(timeouted_peer, true);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ConnectionSendThread::rawSend(const BufferedPacket &packet)
|
|
|
|
{
|
|
|
|
try{
|
2014-04-26 01:15:46 +02:00
|
|
|
m_connection->m_udpSocket.Send(packet.address, *packet.data,
|
|
|
|
packet.data.getSize());
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con <<m_connection->getDesc()
|
2014-04-26 01:15:46 +02:00
|
|
|
<< " rawSend: " << packet.data.getSize()
|
|
|
|
<< " bytes sent" << std::endl);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
} catch(SendFailedException &e) {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"Connection::rawSend(): SendFailedException: "
|
|
|
|
<<packet.address.serializeString()<<std::endl);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ConnectionSendThread::sendAsPacketReliable(BufferedPacket& p, Channel* channel)
|
|
|
|
{
|
|
|
|
try{
|
|
|
|
p.absolute_send_time = porting::getTimeMs();
|
|
|
|
// Buffer the packet
|
|
|
|
channel->outgoing_reliables_sent.insert(p,
|
2014-04-26 01:15:46 +02:00
|
|
|
(channel->readOutgoingSequenceNumber() - MAX_RELIABLE_WINDOW_SIZE)
|
|
|
|
% (MAX_RELIABLE_WINDOW_SIZE+1));
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
catch(AlreadyExistsException &e)
|
|
|
|
{
|
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"WARNING: Going to send a reliable packet"
|
|
|
|
<<" in outgoing buffer" <<std::endl);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Send the packet
|
|
|
|
rawSend(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ConnectionSendThread::rawSendAsPacket(u16 peer_id, u8 channelnum,
|
|
|
|
SharedBuffer<u8> data, bool reliable)
|
|
|
|
{
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peer_id);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (!peer) {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
2014-04-26 01:15:46 +02:00
|
|
|
<<" INFO: dropped packet for non existent peer_id: "
|
|
|
|
<< peer_id << std::endl);
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR_IF(!reliable, "Trying to send raw packet reliable but no peer found!");
|
2014-01-06 20:05:28 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
Channel *channel = &(dynamic_cast<UDPPeer*>(&peer)->channels[channelnum]);
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (reliable)
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
bool have_sequence_number_for_raw_packet = true;
|
2014-04-26 01:15:46 +02:00
|
|
|
u16 seqnum =
|
|
|
|
channel->getOutgoingSequenceNumber(have_sequence_number_for_raw_packet);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (!have_sequence_number_for_raw_packet)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
SharedBuffer<u8> reliable = makeReliablePacket(data, seqnum);
|
|
|
|
Address peer_address;
|
2014-06-28 08:02:38 +02:00
|
|
|
peer->getAddress(MTP_MINETEST_RELIABLE_UDP, peer_address);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
// Add base headers and make a packet
|
|
|
|
BufferedPacket p = con::makePacket(peer_address, reliable,
|
|
|
|
m_connection->GetProtocolID(), m_connection->GetPeerID(),
|
|
|
|
channelnum);
|
|
|
|
|
|
|
|
// first check if our send window is already maxed out
|
|
|
|
if (channel->outgoing_reliables_sent.size()
|
|
|
|
< channel->getWindowSize()) {
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" INFO: sending a reliable packet to peer_id " << peer_id
|
|
|
|
<<" channel: " << channelnum
|
|
|
|
<<" seqnum: " << seqnum << std::endl);
|
|
|
|
sendAsPacketReliable(p,channel);
|
|
|
|
return true;
|
|
|
|
}
|
2017-08-19 22:23:47 +02:00
|
|
|
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" INFO: queueing reliable packet for peer_id: " << peer_id
|
|
|
|
<<" channel: " << channelnum
|
|
|
|
<<" seqnum: " << seqnum << std::endl);
|
|
|
|
channel->queued_reliables.push(p);
|
|
|
|
return false;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
Address peer_address;
|
|
|
|
if (peer->getAddress(MTP_UDP, peer_address)) {
|
|
|
|
// Add base headers and make a packet
|
|
|
|
BufferedPacket p = con::makePacket(peer_address, data,
|
|
|
|
m_connection->GetProtocolID(), m_connection->GetPeerID(),
|
|
|
|
channelnum);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
// Send the packet
|
|
|
|
rawSend(p);
|
|
|
|
return true;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
LOG(dout_con << m_connection->getDesc()
|
|
|
|
<< " INFO: dropped unreliable packet for peer_id: " << peer_id
|
|
|
|
<< " because of (yet) missing udp address" << std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ConnectionSendThread::processReliableCommand(ConnectionCommand &c)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(c.reliable); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
switch(c.type) {
|
2014-01-06 20:05:28 +01:00
|
|
|
case CONNCMD_NONE:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UDP processing reliable CONNCMD_NONE"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
return;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
case CONNCMD_SEND:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UDP processing reliable CONNCMD_SEND"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
sendReliable(c);
|
|
|
|
return;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
case CONNCMD_SEND_TO_ALL:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UDP processing CONNCMD_SEND_TO_ALL"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
sendToAllReliable(c);
|
|
|
|
return;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
case CONCMD_CREATE_PEER:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UDP processing reliable CONCMD_CREATE_PEER"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
if (!rawSendAsPacket(c.peer_id,c.channelnum,c.data,c.reliable))
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
/* put to queue if we couldn't send it immediately */
|
|
|
|
sendReliable(c);
|
|
|
|
}
|
|
|
|
return;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
case CONCMD_DISABLE_LEGACY:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UDP processing reliable CONCMD_DISABLE_LEGACY"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
if (!rawSendAsPacket(c.peer_id,c.channelnum,c.data,c.reliable))
|
|
|
|
{
|
|
|
|
/* put to queue if we couldn't send it immediately */
|
|
|
|
sendReliable(c);
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
case CONNCMD_SERVE:
|
|
|
|
case CONNCMD_CONNECT:
|
|
|
|
case CONNCMD_DISCONNECT:
|
|
|
|
case CONCMD_ACK:
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR("Got command that shouldn't be reliable as reliable command");
|
2014-01-06 20:05:28 +01:00
|
|
|
default:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" Invalid reliable command type: " << c.type <<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
void ConnectionSendThread::processNonReliableCommand(ConnectionCommand &c)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(!c.reliable); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
switch(c.type) {
|
2014-01-06 20:05:28 +01:00
|
|
|
case CONNCMD_NONE:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_NONE"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
return;
|
|
|
|
case CONNCMD_SERVE:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_SERVE port="
|
2014-02-05 21:24:46 +01:00
|
|
|
<<c.address.serializeString()<<std::endl);
|
|
|
|
serve(c.address);
|
2014-01-06 20:05:28 +01:00
|
|
|
return;
|
|
|
|
case CONNCMD_CONNECT:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_CONNECT"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
connect(c.address);
|
|
|
|
return;
|
|
|
|
case CONNCMD_DISCONNECT:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_DISCONNECT"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
disconnect();
|
|
|
|
return;
|
|
|
|
case CONNCMD_DISCONNECT_PEER:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_DISCONNECT_PEER"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
disconnect_peer(c.peer_id);
|
|
|
|
return;
|
|
|
|
case CONNCMD_SEND:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_SEND"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
send(c.peer_id, c.channelnum, c.data);
|
|
|
|
return;
|
|
|
|
case CONNCMD_SEND_TO_ALL:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONNCMD_SEND_TO_ALL"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
sendToAll(c.channelnum, c.data);
|
|
|
|
return;
|
|
|
|
case CONCMD_ACK:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" UDP processing CONCMD_ACK"<<std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
sendAsPacket(c.peer_id,c.channelnum,c.data,true);
|
|
|
|
return;
|
|
|
|
case CONCMD_CREATE_PEER:
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR("Got command that should be reliable as unreliable command");
|
2014-01-06 20:05:28 +01:00
|
|
|
default:
|
2014-04-26 01:15:46 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" Invalid command type: " << c.type <<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-02-05 21:24:46 +01:00
|
|
|
void ConnectionSendThread::serve(Address bind_address)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-02-05 21:24:46 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UDP serving at port " << bind_address.serializeString() <<std::endl);
|
2012-03-11 19:45:43 +01:00
|
|
|
try{
|
2014-02-05 21:24:46 +01:00
|
|
|
m_connection->m_udpSocket.Bind(bind_address);
|
2014-01-06 20:05:28 +01:00
|
|
|
m_connection->SetPeerID(PEER_ID_SERVER);
|
2012-03-11 19:45:43 +01:00
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
catch(SocketException &e) {
|
2012-03-11 19:45:43 +01:00
|
|
|
// Create event
|
2012-03-18 18:08:13 +01:00
|
|
|
ConnectionEvent ce;
|
|
|
|
ce.bindFailed();
|
2014-01-06 20:05:28 +01:00
|
|
|
m_connection->putEvent(ce);
|
2012-03-11 19:45:43 +01:00
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::connect(Address address)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<" connecting to "<<address.serializeString()
|
|
|
|
<<":"<<address.getPort()<<std::endl);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
UDPPeer *peer = m_connection->createServerPeer(address);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Create event
|
|
|
|
ConnectionEvent e;
|
|
|
|
e.peerAdded(peer->id, peer->address);
|
2014-01-06 20:05:28 +01:00
|
|
|
m_connection->putEvent(e);
|
|
|
|
|
2014-02-05 21:24:46 +01:00
|
|
|
Address bind_addr;
|
|
|
|
|
|
|
|
if (address.isIPv6())
|
|
|
|
bind_addr.setAddress((IPv6AddressBytes*) NULL);
|
|
|
|
else
|
|
|
|
bind_addr.setAddress(0,0,0,0);
|
|
|
|
|
|
|
|
m_connection->m_udpSocket.Bind(bind_addr);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Send a dummy packet to server with peer_id = PEER_ID_INEXISTENT
|
2014-01-06 20:05:28 +01:00
|
|
|
m_connection->SetPeerID(PEER_ID_INEXISTENT);
|
2015-03-13 22:01:49 +01:00
|
|
|
NetworkPacket pkt(0,0);
|
|
|
|
m_connection->Send(PEER_ID_SERVER, 0, &pkt, true);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::disconnect()
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<" disconnecting"<<std::endl);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Create and send DISCO packet
|
|
|
|
SharedBuffer<u8> data(2);
|
|
|
|
writeU8(&data[0], TYPE_CONTROL);
|
|
|
|
writeU8(&data[1], CONTROLTYPE_DISCO);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Send to all
|
2014-01-06 20:05:28 +01:00
|
|
|
std::list<u16> peerids = m_connection->getPeerIDs();
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerid : peerids) {
|
|
|
|
sendAsPacket(peerid, 0,data,false);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::disconnect_peer(u16 peer_id)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<" disconnecting peer"<<std::endl);
|
|
|
|
|
|
|
|
// Create and send DISCO packet
|
|
|
|
SharedBuffer<u8> data(2);
|
|
|
|
writeU8(&data[0], TYPE_CONTROL);
|
|
|
|
writeU8(&data[1], CONTROLTYPE_DISCO);
|
|
|
|
sendAsPacket(peer_id, 0,data,false);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peer_id);
|
|
|
|
|
|
|
|
if (!peer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (dynamic_cast<UDPPeer*>(&peer) == 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dynamic_cast<UDPPeer*>(&peer)->m_pending_disconnect = true;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::send(u16 peer_id, u8 channelnum,
|
|
|
|
SharedBuffer<u8> data)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(channelnum < CHANNEL_COUNT); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peer_id);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (!peer)
|
2014-02-05 21:24:46 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<" peer: peer_id="<<peer_id
|
|
|
|
<< ">>>NOT<<< found on sending packet"
|
|
|
|
<< ", channel " << (channelnum % 0xFF)
|
|
|
|
<< ", size: " << data.getSize() <<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
return;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<" sending to peer_id="<<peer_id
|
|
|
|
<< ", channel " << (channelnum % 0xFF)
|
|
|
|
<< ", size: " << data.getSize() <<std::endl);
|
|
|
|
|
|
|
|
u16 split_sequence_number = peer->getNextSplitSequenceNumber(channelnum);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
u32 chunksize_max = m_max_packet_size - BASE_HEADER_SIZE;
|
2012-12-20 18:19:49 +01:00
|
|
|
std::list<SharedBuffer<u8> > originals;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
originals = makeAutoSplitPacket(data, chunksize_max,split_sequence_number);
|
|
|
|
|
|
|
|
peer->setNextSplitSequenceNumber(channelnum,split_sequence_number);
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (const SharedBuffer<u8> &original : originals) {
|
2014-01-06 20:05:28 +01:00
|
|
|
sendAsPacket(peer_id, channelnum, original);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::sendReliable(ConnectionCommand &c)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(c.peer_id);
|
|
|
|
if (!peer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
peer->PutReliableSendCommand(c,m_max_packet_size);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::sendToAll(u8 channelnum, SharedBuffer<u8> data)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
std::list<u16> peerids = m_connection->getPeerIDs();
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerid : peerids) {
|
|
|
|
send(peerid, channelnum, data);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::sendToAllReliable(ConnectionCommand &c)
|
|
|
|
{
|
|
|
|
std::list<u16> peerids = m_connection->getPeerIDs();
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerid : peerids) {
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peerid);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
if (!peer)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
peer->PutReliableSendCommand(c,m_max_packet_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ConnectionSendThread::sendPackets(float dtime)
|
|
|
|
{
|
|
|
|
std::list<u16> peerIds = m_connection->getPeerIDs();
|
2014-01-31 00:24:00 +01:00
|
|
|
std::list<u16> pendingDisconnect;
|
|
|
|
std::map<u16,bool> pending_unreliable;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerId : peerIds) {
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peerId);
|
2014-01-06 20:05:28 +01:00
|
|
|
//peer may have been removed
|
|
|
|
if (!peer) {
|
2017-08-19 22:23:47 +02:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<< " Peer not found: peer_id=" << peerId
|
|
|
|
<< std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
peer->m_increment_packets_remaining = m_iteration_packets_avaialble/m_connection->m_peers.size();
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
UDPPeer *udpPeer = dynamic_cast<UDPPeer*>(&peer);
|
|
|
|
|
|
|
|
if (!udpPeer) {
|
2014-01-06 20:05:28 +01:00
|
|
|
continue;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
if (udpPeer->m_pending_disconnect) {
|
|
|
|
pendingDisconnect.push_back(peerId);
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
PROFILE(std::stringstream peerIdentifier);
|
2017-08-19 22:23:47 +02:00
|
|
|
PROFILE(peerIdentifier << "sendPackets[" << m_connection->getDesc() << ";" << peerId
|
|
|
|
<< ";RELIABLE]");
|
2014-01-06 20:05:28 +01:00
|
|
|
PROFILE(ScopeProfiler peerprofiler(g_profiler, peerIdentifier.str(), SPT_AVG));
|
|
|
|
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
2017-08-19 22:23:47 +02:00
|
|
|
<< " Handle per peer queues: peer_id=" << peerId
|
|
|
|
<< " packet quota: " << peer->m_increment_packets_remaining << std::endl);
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
// first send queued reliable packets for all peers (if possible)
|
2017-08-19 22:23:47 +02:00
|
|
|
for (unsigned int i=0; i < CHANNEL_COUNT; i++) {
|
|
|
|
Channel &channel = udpPeer->channels[i];
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 next_to_ack = 0;
|
2017-08-19 22:23:47 +02:00
|
|
|
|
|
|
|
channel.outgoing_reliables_sent.getFirstSeqnum(next_to_ack);
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 next_to_receive = 0;
|
2017-08-19 22:23:47 +02:00
|
|
|
channel.incoming_reliables.getFirstSeqnum(next_to_receive);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
LOG(dout_con<<m_connection->getDesc()<< "\t channel: "
|
|
|
|
<< i << ", peer quota:"
|
|
|
|
<< peer->m_increment_packets_remaining
|
|
|
|
<< std::endl
|
|
|
|
<< "\t\t\treliables on wire: "
|
2017-08-19 22:23:47 +02:00
|
|
|
<< channel.outgoing_reliables_sent.size()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< ", waiting for ack for " << next_to_ack
|
|
|
|
<< std::endl
|
|
|
|
<< "\t\t\tincoming_reliables: "
|
2017-08-19 22:23:47 +02:00
|
|
|
<< channel.incoming_reliables.size()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< ", next reliable packet: "
|
2017-08-19 22:23:47 +02:00
|
|
|
<< channel.readNextIncomingSeqNum()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< ", next queued: " << next_to_receive
|
|
|
|
<< std::endl
|
|
|
|
<< "\t\t\treliables queued : "
|
2017-08-19 22:23:47 +02:00
|
|
|
<< channel.queued_reliables.size()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< std::endl
|
|
|
|
<< "\t\t\tqueued commands : "
|
2017-08-19 22:23:47 +02:00
|
|
|
<< channel.queued_commands.size()
|
2014-01-06 20:05:28 +01:00
|
|
|
<< std::endl);
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
while ((!channel.queued_reliables.empty()) &&
|
|
|
|
(channel.outgoing_reliables_sent.size()
|
|
|
|
< channel.getWindowSize())&&
|
2014-01-06 20:05:28 +01:00
|
|
|
(peer->m_increment_packets_remaining > 0))
|
|
|
|
{
|
2017-08-19 22:23:47 +02:00
|
|
|
BufferedPacket p = channel.queued_reliables.front();
|
|
|
|
channel.queued_reliables.pop();
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" INFO: sending a queued reliable packet "
|
|
|
|
<<" channel: " << i
|
|
|
|
<<", seqnum: " << readU16(&p.data[BASE_HEADER_SIZE+1])
|
|
|
|
<< std::endl);
|
2017-08-19 22:23:47 +02:00
|
|
|
sendAsPacketReliable(p, &channel);
|
2014-01-06 20:05:28 +01:00
|
|
|
peer->m_increment_packets_remaining--;
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
if (!m_outgoing_queue.empty()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<< " Handle non reliable queue ("
|
|
|
|
<< m_outgoing_queue.size() << " pkts)" << std::endl);
|
|
|
|
}
|
|
|
|
|
2014-01-26 16:59:36 +01:00
|
|
|
unsigned int initial_queuesize = m_outgoing_queue.size();
|
2014-01-06 20:05:28 +01:00
|
|
|
/* send non reliable packets*/
|
2014-01-26 16:59:36 +01:00
|
|
|
for(unsigned int i=0;i < initial_queuesize;i++) {
|
2015-03-04 17:48:07 +01:00
|
|
|
OutgoingPacket packet = m_outgoing_queue.front();
|
|
|
|
m_outgoing_queue.pop();
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2015-03-04 17:48:07 +01:00
|
|
|
if (packet.reliable)
|
|
|
|
continue;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(packet.peer_id);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (!peer) {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" Outgoing queue: peer_id="<<packet.peer_id
|
|
|
|
<< ">>>NOT<<< found on sending packet"
|
|
|
|
<< ", channel " << (packet.channelnum % 0xFF)
|
|
|
|
<< ", size: " << packet.data.getSize() <<std::endl);
|
|
|
|
continue;
|
|
|
|
}
|
2017-08-19 22:23:47 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
/* send acks immediately */
|
2017-08-19 22:23:47 +02:00
|
|
|
if (packet.ack) {
|
2014-01-06 20:05:28 +01:00
|
|
|
rawSendAsPacket(packet.peer_id, packet.channelnum,
|
|
|
|
packet.data, packet.reliable);
|
|
|
|
peer->m_increment_packets_remaining =
|
|
|
|
MYMIN(0,peer->m_increment_packets_remaining--);
|
|
|
|
}
|
|
|
|
else if (
|
|
|
|
( peer->m_increment_packets_remaining > 0) ||
|
2015-04-07 12:13:12 +02:00
|
|
|
(stopRequested())) {
|
2014-01-06 20:05:28 +01:00
|
|
|
rawSendAsPacket(packet.peer_id, packet.channelnum,
|
|
|
|
packet.data, packet.reliable);
|
|
|
|
peer->m_increment_packets_remaining--;
|
|
|
|
}
|
|
|
|
else {
|
2015-03-04 17:48:07 +01:00
|
|
|
m_outgoing_queue.push(packet);
|
2014-01-31 00:24:00 +01:00
|
|
|
pending_unreliable[packet.peer_id] = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerId : pendingDisconnect) {
|
|
|
|
if (!pending_unreliable[peerId])
|
2014-01-31 00:24:00 +01:00
|
|
|
{
|
2017-08-19 22:23:47 +02:00
|
|
|
m_connection->deletePeer(peerId,false);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2011-10-17 17:02:26 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
void ConnectionSendThread::sendAsPacket(u16 peer_id, u8 channelnum,
|
|
|
|
SharedBuffer<u8> data, bool ack)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
OutgoingPacket packet(peer_id, channelnum, data, false, ack);
|
2015-03-04 17:48:07 +01:00
|
|
|
m_outgoing_queue.push(packet);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
|
2014-08-22 19:25:21 +02:00
|
|
|
ConnectionReceiveThread::ConnectionReceiveThread(unsigned int max_packet_size) :
|
2017-06-21 08:28:57 +02:00
|
|
|
Thread("ConnectionReceive")
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2015-04-07 12:13:12 +02:00
|
|
|
void * ConnectionReceiveThread::run()
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
assert(m_connection);
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"ConnectionReceive thread started"<<std::endl);
|
|
|
|
|
|
|
|
PROFILE(std::stringstream ThreadIdentifier);
|
|
|
|
PROFILE(ThreadIdentifier << "ConnectionReceive: [" << m_connection->getDesc() << "]");
|
|
|
|
|
|
|
|
#ifdef DEBUG_CONNECTION_KBPS
|
2017-04-29 14:36:55 +02:00
|
|
|
u64 curtime = porting::getTimeMs();
|
|
|
|
u64 lasttime = curtime;
|
2014-01-06 20:05:28 +01:00
|
|
|
float debug_print_timer = 0.0;
|
|
|
|
#endif
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2015-04-07 12:13:12 +02:00
|
|
|
while(!stopRequested()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
BEGIN_DEBUG_EXCEPTION_HANDLER
|
|
|
|
PROFILE(ScopeProfiler sp(g_profiler, ThreadIdentifier.str(), SPT_AVG));
|
|
|
|
|
|
|
|
#ifdef DEBUG_CONNECTION_KBPS
|
|
|
|
lasttime = curtime;
|
|
|
|
curtime = porting::getTimeMs();
|
|
|
|
float dtime = CALC_DTIME(lasttime,curtime);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* receive packets */
|
|
|
|
receive();
|
|
|
|
|
|
|
|
#ifdef DEBUG_CONNECTION_KBPS
|
|
|
|
debug_print_timer += dtime;
|
|
|
|
if (debug_print_timer > 20.0) {
|
|
|
|
debug_print_timer -= 20.0;
|
|
|
|
|
|
|
|
std::list<u16> peerids = m_connection->getPeerIDs();
|
|
|
|
|
|
|
|
for (std::list<u16>::iterator i = peerids.begin();
|
|
|
|
i != peerids.end();
|
|
|
|
i++)
|
|
|
|
{
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(*i);
|
|
|
|
if (!peer)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
float peer_current = 0.0;
|
|
|
|
float peer_loss = 0.0;
|
|
|
|
float avg_rate = 0.0;
|
|
|
|
float avg_loss = 0.0;
|
|
|
|
|
|
|
|
for(u16 j=0; j<CHANNEL_COUNT; j++)
|
|
|
|
{
|
|
|
|
peer_current +=peer->channels[j].getCurrentDownloadRateKB();
|
|
|
|
peer_loss += peer->channels[j].getCurrentLossRateKB();
|
|
|
|
avg_rate += peer->channels[j].getAvgDownloadRateKB();
|
|
|
|
avg_loss += peer->channels[j].getAvgLossRateKB();
|
|
|
|
}
|
|
|
|
|
|
|
|
std::stringstream output;
|
|
|
|
output << std::fixed << std::setprecision(1);
|
|
|
|
output << "OUT to Peer " << *i << " RATES (good / loss) " << std::endl;
|
|
|
|
output << "\tcurrent (sum): " << peer_current << "kb/s "<< peer_loss << "kb/s" << std::endl;
|
|
|
|
output << "\taverage (sum): " << avg_rate << "kb/s "<< avg_loss << "kb/s" << std::endl;
|
|
|
|
output << std::setfill(' ');
|
|
|
|
for(u16 j=0; j<CHANNEL_COUNT; j++)
|
|
|
|
{
|
|
|
|
output << "\tcha " << j << ":"
|
|
|
|
<< " CUR: " << std::setw(6) << peer->channels[j].getCurrentDownloadRateKB() <<"kb/s"
|
|
|
|
<< " AVG: " << std::setw(6) << peer->channels[j].getAvgDownloadRateKB() <<"kb/s"
|
|
|
|
<< " MAX: " << std::setw(6) << peer->channels[j].getMaxDownloadRateKB() <<"kb/s"
|
|
|
|
<< " /"
|
|
|
|
<< " CUR: " << std::setw(6) << peer->channels[j].getCurrentLossRateKB() <<"kb/s"
|
|
|
|
<< " AVG: " << std::setw(6) << peer->channels[j].getAvgLossRateKB() <<"kb/s"
|
|
|
|
<< " MAX: " << std::setw(6) << peer->channels[j].getMaxLossRateKB() <<"kb/s"
|
|
|
|
<< " / WS: " << peer->channels[j].getWindowSize()
|
|
|
|
<< std::endl;
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(stderr,"%s\n",output.str().c_str());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2015-10-14 08:33:04 +02:00
|
|
|
END_DEBUG_EXCEPTION_HANDLER
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2015-10-14 07:26:03 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
PROFILE(g_profiler->remove(ThreadIdentifier.str()));
|
|
|
|
return NULL;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
// Receive packets from the network and buffers and create ConnectionEvents
|
|
|
|
void ConnectionReceiveThread::receive()
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-31 00:24:00 +01:00
|
|
|
// use IPv6 minimum allowed MTU as receive buffer size as this is
|
|
|
|
// theoretical reliable upper boundary of a udp packet for all IPv6 enabled
|
|
|
|
// infrastructure
|
|
|
|
unsigned int packet_maxsize = 1500;
|
2014-01-06 20:05:28 +01:00
|
|
|
SharedBuffer<u8> packetdata(packet_maxsize);
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
bool packet_queued = true;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
unsigned int loop_count = 0;
|
|
|
|
|
|
|
|
/* first of all read packets from socket */
|
|
|
|
/* check for incoming data available */
|
|
|
|
while( (loop_count < 10) &&
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
(m_connection->m_udpSocket.WaitData(50))) {
|
2014-01-06 20:05:28 +01:00
|
|
|
loop_count++;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
try {
|
|
|
|
if (packet_queued) {
|
|
|
|
bool data_left = true;
|
|
|
|
u16 peer_id;
|
|
|
|
SharedBuffer<u8> resultdata;
|
|
|
|
while(data_left) {
|
|
|
|
try {
|
|
|
|
data_left = getFromBuffers(peer_id, resultdata);
|
|
|
|
if (data_left) {
|
|
|
|
ConnectionEvent e;
|
|
|
|
e.dataReceived(peer_id, resultdata);
|
|
|
|
m_connection->putEvent(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch(ProcessedSilentlyException &e) {
|
|
|
|
/* try reading again */
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
packet_queued = false;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
Address sender;
|
|
|
|
s32 received_size = m_connection->m_udpSocket.Receive(sender, *packetdata, packet_maxsize);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if ((received_size < BASE_HEADER_SIZE) ||
|
|
|
|
(readU32(&packetdata[0]) != m_connection->GetProtocolID()))
|
|
|
|
{
|
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"Receive(): Invalid incoming packet, "
|
|
|
|
<<"size: " << received_size
|
|
|
|
<<", protocol: "
|
|
|
|
<< ((received_size >= 4) ? readU32(&packetdata[0]) : -1)
|
|
|
|
<< std::endl);
|
|
|
|
continue;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
u16 peer_id = readPeerId(*packetdata);
|
|
|
|
u8 channelnum = readChannel(*packetdata);
|
2014-07-06 16:17:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (channelnum > CHANNEL_COUNT-1) {
|
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"Receive(): Invalid channel "<<channelnum<<std::endl);
|
|
|
|
throw InvalidIncomingDataException("Channel doesn't exist");
|
|
|
|
}
|
2014-07-06 16:17:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
/* Try to identify peer by sender address (may happen on join) */
|
|
|
|
if (peer_id == PEER_ID_INEXISTENT) {
|
|
|
|
peer_id = m_connection->lookupPeer(sender);
|
Tolerate packet reordering in the early init process
Fixes a bug where packet reordering made the server give the
client two peer ids instead of one. This in turn confused
reliable packet sending and made connecting to the server fail.
The client usually sends three packets at init: one "dummy"
packet consisting of two 0 bytes, and the init packet as well as
its legacy counterpart. The last one can be turned off since commit
af30183124d40a969040d7de4b3a487feec466e4, but this is of lower
relevance for the bug. The relevant part here is that network
packet reorder (which is a normal occurence) can make the packets
reach the server in different order.
If reorder puts the dummy packet further behind, the following
would happen before the patch:
1. The server will get one of the init packets on channel 1 and
assign the client a peer id, as the packet will have zero as
peer id.
2. The server sends a CONTROLTYPE_SET_PEER_ID packet to inform
the client of the peer id.
3. The next packet from the client will contain the peer id set by
the server.
4. The server sets the m_has_sent_with_id member for the client's
peer structure to true.
5. Now the dummy packet arrives. It has a peer id of zero, therefore
the server searches whether it already has a peer id for the
address the packet was sent from. The search fails because
m_has_sent_with_id was set to true and the server only searched
for peers with m_has_sent_with_id set to false.
6. In a working setup, the server would assign the dummy packet to
the correct peer id. However the server instead now assigns a
second peer id and peer structure to the peer, and assign the
packet to that new peer.
7. In order to inform the peer of its peer id, the server sends a
CONTROLTYPE_SET_PEER_ID command packet, reliably, to the peer.
This packet uses the new peer id.
8. The client sends an ack to that packet, not with the new peer id
but with the peer id sent in 2.
9. This packet reaches the server, but it drops the ACK as the peer
id does not map to any un-ACK-ed packets with that seqnum. The
same time, the server still waits for an ACK with the new peer
id, which of course won't come. This causes the server to
periodically re-try sending that packet, and the client ACKing it
each time.
Steps 7-9 cause annoyances and erroneous output, but don't cause
the connection failure itself.
The actual mistake that causes the connection failure happens in 6:
The server does not assign the dummy packet to the correct peer, but
to a newly created one.
Therefore, all further packets sent by the client on channel 0 are
now buffered by the server as it waits for the dummy packet to reach
the peer, which of course doesn't happen as the server assigned
that packet to the second peer it created for the client.
This makes the connection code indefinitely buffer the
TOSERVER_CLIENT_READY packet, not passing it to higher level code,
which stalls the continuation of the further init process
indefinitely and causes the actual bug.
Maybe this can be caused by reordered init packets as well, the only
studied case was where network has reliably reordered the dummy
packet to get sent after the init packets.
The patch fixes the bug by not ignoring peers where
m_has_sent_with_id has been set anymore. The other changes of the
patch are just cleanups of unused methods and fields and additional
explanatory comments.
One could think of alternate ways to fix the bug:
* The client could simply take the new peer id and continue
communicating with that. This is however worse than the fix as
it requires the peer id set command to be sent reliably (which
currently happens, but it cant be changed anymore). Also, such a
change would require both server and client to be patched in order
for the bug to be fixed, as right now the client ignores peer id
set commands after the peer id is different from
PEER_ID_INEXISTENT and the server requires modification too to
change the peer id internally.
And, most importantly, right now we guarantee higher level server
code that the peer id for a certain peer does not change. This
guarantee would have to be broken, and it would require much
larger changes to the server than this patch means.
* One could stop sending the dummy packet. One may be unsure whether
this is a good idea, as the meaning of the dummy packet is not
known (it might be there for something important), and as it is
possible that the init packets may cause this problem as well
(although it may be possible too that they can't cause this).
Thanks to @auouymous who had originally reported this bug and who
has helped patiently in finding its cause.
2016-05-18 06:18:08 +02:00
|
|
|
// We do not have to remind the peer of its
|
|
|
|
// peer id as the CONTROLTYPE_SET_PEER_ID
|
|
|
|
// command was sent reliably.
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
/* The peer was not found in our lists. Add it. */
|
|
|
|
if (peer_id == PEER_ID_INEXISTENT) {
|
|
|
|
peer_id = m_connection->createPeer(sender, MTP_MINETEST_RELIABLE_UDP, 0);
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peer_id);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (!peer) {
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" got packet from unknown peer_id: "
|
|
|
|
<<peer_id<<" Ignoring."<<std::endl);
|
|
|
|
continue;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
// Validate peer address
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
Address peer_address;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (peer->getAddress(MTP_UDP, peer_address)) {
|
|
|
|
if (peer_address != sender) {
|
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<m_connection->getDesc()
|
|
|
|
<<" Peer "<<peer_id<<" sending from different address."
|
|
|
|
" Ignoring."<<std::endl);
|
|
|
|
continue;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else {
|
|
|
|
|
|
|
|
bool invalid_address = true;
|
|
|
|
if (invalid_address) {
|
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<m_connection->getDesc()
|
|
|
|
<<" Peer "<<peer_id<<" unknown."
|
|
|
|
" Ignoring."<<std::endl);
|
|
|
|
continue;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
peer->ResetTimeout();
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
Channel *channel = 0;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (dynamic_cast<UDPPeer*>(&peer) != 0)
|
|
|
|
{
|
|
|
|
channel = &(dynamic_cast<UDPPeer*>(&peer)->channels[channelnum]);
|
|
|
|
}
|
2014-07-06 16:17:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (channel != 0) {
|
|
|
|
channel->UpdateBytesReceived(received_size);
|
|
|
|
}
|
2014-04-26 01:15:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
// Throw the received packet to channel->processPacket()
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
// Make a new SharedBuffer from the data without the base headers
|
|
|
|
SharedBuffer<u8> strippeddata(received_size - BASE_HEADER_SIZE);
|
|
|
|
memcpy(*strippeddata, &packetdata[BASE_HEADER_SIZE],
|
|
|
|
strippeddata.getSize());
|
2014-07-06 16:17:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
try{
|
|
|
|
// Process it (the result is some data with no headers made by us)
|
|
|
|
SharedBuffer<u8> resultdata = processPacket
|
|
|
|
(channel, strippeddata, peer_id, channelnum, false);
|
2014-07-06 16:17:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" ProcessPacket from peer_id: " << peer_id
|
|
|
|
<< ",channel: " << (channelnum & 0xFF) << ", returned "
|
|
|
|
<< resultdata.getSize() << " bytes" <<std::endl);
|
|
|
|
|
|
|
|
ConnectionEvent e;
|
|
|
|
e.dataReceived(peer_id, resultdata);
|
|
|
|
m_connection->putEvent(e);
|
|
|
|
}
|
|
|
|
catch(ProcessedSilentlyException &e) {
|
|
|
|
}
|
|
|
|
catch(ProcessedQueued &e) {
|
|
|
|
packet_queued = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch(InvalidIncomingDataException &e) {
|
|
|
|
}
|
|
|
|
catch(ProcessedSilentlyException &e) {
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
bool ConnectionReceiveThread::getFromBuffers(u16 &peer_id, SharedBuffer<u8> &dst)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
std::list<u16> peerids = m_connection->getPeerIDs();
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (u16 peerid : peerids) {
|
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peerid);
|
2014-01-06 20:05:28 +01:00
|
|
|
if (!peer)
|
|
|
|
continue;
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (dynamic_cast<UDPPeer*>(&peer) == 0)
|
2014-01-06 20:05:28 +01:00
|
|
|
continue;
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (Channel &channel : (dynamic_cast<UDPPeer *>(&peer))->channels) {
|
|
|
|
if (checkIncomingBuffers(&channel, peer_id, dst)) {
|
2011-10-20 22:04:09 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
bool ConnectionReceiveThread::checkIncomingBuffers(Channel *channel,
|
|
|
|
u16 &peer_id, SharedBuffer<u8> &dst)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
|
|
|
u16 firstseqnum = 0;
|
2014-01-06 20:05:28 +01:00
|
|
|
if (channel->incoming_reliables.getFirstSeqnum(firstseqnum))
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (firstseqnum == channel->readNextIncomingSeqNum())
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
|
|
|
BufferedPacket p = channel->incoming_reliables.popFirst();
|
|
|
|
peer_id = readPeerId(*p.data);
|
|
|
|
u8 channelnum = readChannel(*p.data);
|
|
|
|
u16 seqnum = readU16(&p.data[BASE_HEADER_SIZE+1]);
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"UNBUFFERING TYPE_RELIABLE"
|
2011-10-20 22:04:09 +02:00
|
|
|
<<" seqnum="<<seqnum
|
|
|
|
<<" peer_id="<<peer_id
|
|
|
|
<<" channel="<<((int)channelnum&0xff)
|
2014-01-06 20:05:28 +01:00
|
|
|
<<std::endl);
|
|
|
|
|
|
|
|
channel->incNextIncomingSeqNum();
|
2011-10-20 22:04:09 +02:00
|
|
|
|
|
|
|
u32 headers_size = BASE_HEADER_SIZE + RELIABLE_HEADER_SIZE;
|
|
|
|
// Get out the inside packet and re-process it
|
|
|
|
SharedBuffer<u8> payload(p.data.getSize() - headers_size);
|
|
|
|
memcpy(*payload, &p.data[headers_size], payload.getSize());
|
|
|
|
|
|
|
|
dst = processPacket(channel, payload, peer_id, channelnum, true);
|
|
|
|
return true;
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
return false;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
|
2014-04-26 01:15:46 +02:00
|
|
|
SharedBuffer<u8> packetdata, u16 peer_id, u8 channelnum, bool reliable)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-10-26 06:32:49 +01:00
|
|
|
PeerHelper peer = m_connection->getPeerNoEx(peer_id);
|
|
|
|
|
|
|
|
if (!peer) {
|
|
|
|
errorstream << "Peer not found (possible timeout)" << std::endl;
|
|
|
|
throw ProcessedSilentlyException("Peer not found (possible timeout)");
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (packetdata.getSize() < 1)
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException("packetdata.getSize() < 1");
|
|
|
|
|
2014-04-06 15:12:04 +02:00
|
|
|
u8 type = readU8(&(packetdata[0]));
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2014-12-29 14:53:08 +01:00
|
|
|
if (MAX_UDP_PEERS <= 65535 && peer_id >= MAX_UDP_PEERS) {
|
2015-08-05 08:56:23 +02:00
|
|
|
std::string errmsg = "Invalid peer_id=" + itos(peer_id);
|
|
|
|
errorstream << errmsg << std::endl;
|
|
|
|
throw InvalidIncomingDataException(errmsg.c_str());
|
2014-12-29 14:53:08 +01:00
|
|
|
}
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (type == TYPE_CONTROL)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (packetdata.getSize() < 2)
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException("packetdata.getSize() < 2");
|
|
|
|
|
2014-04-06 15:12:04 +02:00
|
|
|
u8 controltype = readU8(&(packetdata[1]));
|
2011-10-20 22:04:09 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (controltype == CONTROLTYPE_ACK)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2015-08-05 08:56:23 +02:00
|
|
|
assert(channel != NULL);
|
|
|
|
|
|
|
|
if (packetdata.getSize() < 4) {
|
|
|
|
throw InvalidIncomingDataException(
|
|
|
|
"packetdata.getSize() < 4 (ACK header size)");
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
|
|
|
|
u16 seqnum = readU16(&packetdata[2]);
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<" [ CONTROLTYPE_ACK: channelnum="
|
2011-10-20 22:04:09 +02:00
|
|
|
<<((int)channelnum&0xff)<<", peer_id="<<peer_id
|
2014-01-06 20:05:28 +01:00
|
|
|
<<", seqnum="<<seqnum<< " ]"<<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
|
|
|
|
try{
|
2014-01-06 20:05:28 +01:00
|
|
|
BufferedPacket p =
|
|
|
|
channel->outgoing_reliables_sent.popSeqnum(seqnum);
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-07-12 15:58:08 +02:00
|
|
|
// only calculate rtt from straight sent packets
|
|
|
|
if (p.resend_count == 0) {
|
|
|
|
// Get round trip time
|
2017-04-29 14:36:55 +02:00
|
|
|
u64 current_time = porting::getTimeMs();
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-07-12 15:58:08 +02:00
|
|
|
// a overflow is quite unlikely but as it'd result in major
|
|
|
|
// rtt miscalculation we handle it here
|
|
|
|
if (current_time > p.absolute_send_time)
|
|
|
|
{
|
|
|
|
float rtt = (current_time - p.absolute_send_time) / 1000.0;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-07-12 15:58:08 +02:00
|
|
|
// Let peer calculate stuff according to it
|
|
|
|
// (avg_rtt and resend_timeout)
|
|
|
|
dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt);
|
|
|
|
}
|
|
|
|
else if (p.totaltime > 0)
|
|
|
|
{
|
|
|
|
float rtt = p.totaltime;
|
|
|
|
|
|
|
|
// Let peer calculate stuff according to it
|
|
|
|
// (avg_rtt and resend_timeout)
|
|
|
|
dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt);
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
//put bytes for max bandwidth calculation
|
|
|
|
channel->UpdateBytesSent(p.data.getSize(),1);
|
2014-01-31 00:24:00 +01:00
|
|
|
if (channel->outgoing_reliables_sent.size() == 0)
|
|
|
|
{
|
|
|
|
m_connection->TriggerSend();
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
catch(NotFoundException &e) {
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"WARNING: ACKed packet not "
|
2011-10-20 22:04:09 +02:00
|
|
|
"in outgoing queue"
|
2014-01-06 20:05:28 +01:00
|
|
|
<<std::endl);
|
|
|
|
channel->UpdatePacketTooLateCounter();
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
throw ProcessedSilentlyException("Got an ACK");
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (controltype == CONTROLTYPE_SET_PEER_ID) {
|
2014-01-06 20:05:28 +01:00
|
|
|
// Got a packet to set our peer id
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (packetdata.getSize() < 4)
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException
|
|
|
|
("packetdata.getSize() < 4 (SET_PEER_ID header size)");
|
|
|
|
u16 peer_id_new = readU16(&packetdata[2]);
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"Got new peer id: "<<peer_id_new<<"... "<<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_connection->GetPeerID() != PEER_ID_INEXISTENT)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"WARNING: Not changing"
|
|
|
|
" existing peer id."<<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<"changing own peer id"<<std::endl);
|
|
|
|
m_connection->SetPeerID(peer_id_new);
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
ConnectionCommand cmd;
|
|
|
|
|
|
|
|
SharedBuffer<u8> reply(2);
|
|
|
|
writeU8(&reply[0], TYPE_CONTROL);
|
|
|
|
writeU8(&reply[1], CONTROLTYPE_ENABLE_BIG_SEND_WINDOW);
|
|
|
|
cmd.disableLegacy(PEER_ID_SERVER,reply);
|
|
|
|
m_connection->putCommand(cmd);
|
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
throw ProcessedSilentlyException("Got a SET_PEER_ID");
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (controltype == CONTROLTYPE_PING)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
|
|
|
// Just ignore it, the incoming data already reset
|
|
|
|
// the timeout counter
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()<<"PING"<<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
throw ProcessedSilentlyException("Got a PING");
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (controltype == CONTROLTYPE_DISCO)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
|
|
|
// Just ignore it, the incoming data already reset
|
|
|
|
// the timeout counter
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"DISCO: Removing peer "<<(peer_id)<<std::endl);
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
if (!m_connection->deletePeer(peer_id, false)) {
|
2014-01-06 20:05:28 +01:00
|
|
|
derr_con<<m_connection->getDesc()
|
|
|
|
<<"DISCO: Peer not found"<<std::endl;
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
throw ProcessedSilentlyException("Got a DISCO");
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (controltype == CONTROLTYPE_ENABLE_BIG_SEND_WINDOW)
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
dynamic_cast<UDPPeer*>(&peer)->setNonLegacyPeer();
|
|
|
|
throw ProcessedSilentlyException("Got non legacy control");
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
else{
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<<"INVALID TYPE_CONTROL: invalid controltype="
|
|
|
|
<<((int)controltype&0xff)<<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException("Invalid control type");
|
|
|
|
}
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (type == TYPE_ORIGINAL)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (packetdata.getSize() <= ORIGINAL_HEADER_SIZE)
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException
|
2014-04-06 15:12:04 +02:00
|
|
|
("packetdata.getSize() <= ORIGINAL_HEADER_SIZE");
|
2014-01-06 20:05:28 +01:00
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"RETURNING TYPE_ORIGINAL to user"
|
|
|
|
<<std::endl);
|
2011-10-20 22:04:09 +02:00
|
|
|
// Get the inside packet out and return it
|
|
|
|
SharedBuffer<u8> payload(packetdata.getSize() - ORIGINAL_HEADER_SIZE);
|
2014-04-06 15:12:04 +02:00
|
|
|
memcpy(*payload, &(packetdata[ORIGINAL_HEADER_SIZE]), payload.getSize());
|
2011-10-20 22:04:09 +02:00
|
|
|
return payload;
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (type == TYPE_SPLIT)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
Address peer_address;
|
|
|
|
|
2014-06-28 08:02:38 +02:00
|
|
|
if (peer->getAddress(MTP_UDP, peer_address)) {
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
// We have to create a packet again for buffering
|
|
|
|
// This isn't actually too bad an idea.
|
|
|
|
BufferedPacket packet = makePacket(
|
|
|
|
peer_address,
|
|
|
|
packetdata,
|
|
|
|
m_connection->GetProtocolID(),
|
|
|
|
peer_id,
|
|
|
|
channelnum);
|
|
|
|
|
|
|
|
// Buffer the packet
|
|
|
|
SharedBuffer<u8> data =
|
|
|
|
peer->addSpiltPacket(channelnum,packet,reliable);
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (data.getSize() != 0)
|
2014-01-06 20:05:28 +01:00
|
|
|
{
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<<"RETURNING TYPE_SPLIT: Constructed full data, "
|
|
|
|
<<"size="<<data.getSize()<<std::endl);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
LOG(dout_con<<m_connection->getDesc()<<"BUFFERED TYPE_SPLIT"<<std::endl);
|
|
|
|
throw ProcessedSilentlyException("Buffered a split packet chunk");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
//TODO throw some error
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
}
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
else if (type == TYPE_RELIABLE)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2015-08-05 08:56:23 +02:00
|
|
|
assert(channel != NULL);
|
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Recursive reliable packets not allowed
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (reliable)
|
2013-07-04 06:18:50 +02:00
|
|
|
throw InvalidIncomingDataException("Found nested reliable packets");
|
2011-10-20 22:04:09 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (packetdata.getSize() < RELIABLE_HEADER_SIZE)
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException
|
|
|
|
("packetdata.getSize() < RELIABLE_HEADER_SIZE");
|
|
|
|
|
|
|
|
u16 seqnum = readU16(&packetdata[1]);
|
2014-01-06 20:05:28 +01:00
|
|
|
bool is_future_packet = false;
|
|
|
|
bool is_old_packet = false;
|
2011-10-20 22:04:09 +02:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
/* packet is within our receive window send ack */
|
|
|
|
if (seqnum_in_window(seqnum, channel->readNextIncomingSeqNum(),MAX_RELIABLE_WINDOW_SIZE))
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
m_connection->sendAck(peer_id,channelnum,seqnum);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
is_future_packet = seqnum_higher(seqnum, channel->readNextIncomingSeqNum());
|
|
|
|
is_old_packet = seqnum_higher(channel->readNextIncomingSeqNum(), seqnum);
|
|
|
|
|
|
|
|
|
|
|
|
/* packet is not within receive window, don't send ack. *
|
|
|
|
* if this was a valid packet it's gonna be retransmitted */
|
|
|
|
if (is_future_packet)
|
|
|
|
{
|
|
|
|
throw ProcessedSilentlyException("Received packet newer then expected, not sending ack");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* seems like our ack was lost, send another one for a old packet */
|
|
|
|
if (is_old_packet)
|
|
|
|
{
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<< "RE-SENDING ACK: peer_id: " << peer_id
|
|
|
|
<< ", channel: " << (channelnum&0xFF)
|
|
|
|
<< ", seqnum: " << seqnum << std::endl;)
|
|
|
|
m_connection->sendAck(peer_id,channelnum,seqnum);
|
|
|
|
|
|
|
|
// we already have this packet so this one was on wire at least
|
|
|
|
// the current timeout
|
2014-07-12 15:58:08 +02:00
|
|
|
// we don't know how long this packet was on wire don't do silly guessing
|
|
|
|
// dynamic_cast<UDPPeer*>(&peer)->reportRTT(dynamic_cast<UDPPeer*>(&peer)->getResendTimeout());
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
throw ProcessedSilentlyException("Retransmitting ack for old packet");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (seqnum != channel->readNextIncomingSeqNum())
|
|
|
|
{
|
|
|
|
Address peer_address;
|
|
|
|
|
|
|
|
// this is a reliable packet so we have a udp address for sure
|
2014-06-28 08:02:38 +02:00
|
|
|
peer->getAddress(MTP_MINETEST_RELIABLE_UDP, peer_address);
|
2011-10-20 22:04:09 +02:00
|
|
|
// This one comes later, buffer it.
|
|
|
|
// Actually we have to make a packet to buffer one.
|
|
|
|
// Well, we have all the ingredients, so just do it.
|
2014-01-06 20:05:28 +01:00
|
|
|
BufferedPacket packet = con::makePacket(
|
|
|
|
peer_address,
|
2011-10-20 22:04:09 +02:00
|
|
|
packetdata,
|
2014-01-06 20:05:28 +01:00
|
|
|
m_connection->GetProtocolID(),
|
2011-10-20 22:04:09 +02:00
|
|
|
peer_id,
|
|
|
|
channelnum);
|
|
|
|
try{
|
2014-01-06 20:05:28 +01:00
|
|
|
channel->incoming_reliables.insert(packet,channel->readNextIncomingSeqNum());
|
|
|
|
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<< "BUFFERING, TYPE_RELIABLE peer_id: " << peer_id
|
|
|
|
<< ", channel: " << (channelnum&0xFF)
|
|
|
|
<< ", seqnum: " << seqnum << std::endl;)
|
|
|
|
|
|
|
|
throw ProcessedQueued("Buffered future reliable packet");
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
catch(AlreadyExistsException &e)
|
|
|
|
{
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
catch(IncomingDataCorruption &e)
|
|
|
|
{
|
|
|
|
ConnectionCommand discon;
|
|
|
|
discon.disconnect_peer(peer_id);
|
|
|
|
m_connection->putCommand(discon);
|
|
|
|
|
|
|
|
LOG(derr_con<<m_connection->getDesc()
|
|
|
|
<< "INVALID, TYPE_RELIABLE peer_id: " << peer_id
|
|
|
|
<< ", channel: " << (channelnum&0xFF)
|
|
|
|
<< ", seqnum: " << seqnum
|
|
|
|
<< "DROPPING CLIENT!" << std::endl;)
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
/* we got a packet to process right now */
|
|
|
|
LOG(dout_con<<m_connection->getDesc()
|
|
|
|
<< "RECURSIVE, TYPE_RELIABLE peer_id: " << peer_id
|
|
|
|
<< ", channel: " << (channelnum&0xFF)
|
|
|
|
<< ", seqnum: " << seqnum << std::endl;)
|
|
|
|
|
|
|
|
|
|
|
|
/* check for resend case */
|
|
|
|
u16 queued_seqnum = 0;
|
|
|
|
if (channel->incoming_reliables.getFirstSeqnum(queued_seqnum))
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
if (queued_seqnum == seqnum)
|
|
|
|
{
|
|
|
|
BufferedPacket queued_packet = channel->incoming_reliables.popFirst();
|
|
|
|
/** TODO find a way to verify the new against the old packet */
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
channel->incNextIncomingSeqNum();
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// Get out the inside packet and re-process it
|
|
|
|
SharedBuffer<u8> payload(packetdata.getSize() - RELIABLE_HEADER_SIZE);
|
|
|
|
memcpy(*payload, &packetdata[RELIABLE_HEADER_SIZE], payload.getSize());
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
return processPacket(channel, payload, peer_id, channelnum, true);
|
|
|
|
}
|
|
|
|
else
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
derr_con<<m_connection->getDesc()
|
|
|
|
<<"Got invalid type="<<((int)type&0xff)<<std::endl;
|
2011-10-20 22:04:09 +02:00
|
|
|
throw InvalidIncomingDataException("Invalid packet type");
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
// We should never get here.
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR("Invalid execution point");
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
/*
|
|
|
|
Connection
|
|
|
|
*/
|
|
|
|
|
|
|
|
Connection::Connection(u32 protocol_id, u32 max_packet_size, float timeout,
|
2014-04-26 01:15:46 +02:00
|
|
|
bool ipv6, PeerHandler *peerhandler) :
|
2014-01-06 20:05:28 +01:00
|
|
|
m_udpSocket(ipv6),
|
|
|
|
m_protocol_id(protocol_id),
|
2014-08-22 19:25:21 +02:00
|
|
|
m_sendThread(max_packet_size, timeout),
|
|
|
|
m_receiveThread(max_packet_size),
|
2017-06-21 08:28:57 +02:00
|
|
|
m_bc_peerhandler(peerhandler)
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
{
|
|
|
|
m_udpSocket.setTimeoutMs(5);
|
|
|
|
|
2014-08-22 19:25:21 +02:00
|
|
|
m_sendThread.setParent(this);
|
|
|
|
m_receiveThread.setParent(this);
|
|
|
|
|
2015-04-07 12:13:12 +02:00
|
|
|
m_sendThread.start();
|
|
|
|
m_receiveThread.start();
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Connection::~Connection()
|
|
|
|
{
|
|
|
|
m_shutting_down = true;
|
|
|
|
// request threads to stop
|
2015-04-07 12:13:12 +02:00
|
|
|
m_sendThread.stop();
|
|
|
|
m_receiveThread.stop();
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
//TODO for some unkonwn reason send/receive threads do not exit as they're
|
|
|
|
// supposed to be but wait on peer timeout. To speed up shutdown we reduce
|
|
|
|
// timeout to half a second.
|
|
|
|
m_sendThread.setPeerTimeout(0.5);
|
|
|
|
|
|
|
|
// wait for threads to finish
|
2015-04-07 12:13:12 +02:00
|
|
|
m_sendThread.wait();
|
|
|
|
m_receiveThread.wait();
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
// Delete peers
|
2017-08-19 22:23:47 +02:00
|
|
|
for (auto &peer : m_peers) {
|
|
|
|
delete peer.second;
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Internal stuff */
|
|
|
|
void Connection::putEvent(ConnectionEvent &e)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(e.type != CONNEVENT_NONE); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
m_event_queue.push_back(e);
|
|
|
|
}
|
|
|
|
|
|
|
|
PeerHelper Connection::getPeer(u16 peer_id)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock peerlock(m_peers_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
std::map<u16, Peer*>::iterator node = m_peers.find(peer_id);
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (node == m_peers.end()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
throw PeerNotFoundException("GetPeer: Peer not found (possible timeout)");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Error checking
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR_IF(node->second->id != peer_id, "Invalid peer id");
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
return PeerHelper(node->second);
|
|
|
|
}
|
|
|
|
|
|
|
|
PeerHelper Connection::getPeerNoEx(u16 peer_id)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock peerlock(m_peers_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
std::map<u16, Peer*>::iterator node = m_peers.find(peer_id);
|
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (node == m_peers.end()) {
|
2014-01-06 20:05:28 +01:00
|
|
|
return PeerHelper(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Error checking
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR_IF(node->second->id != peer_id, "Invalid peer id");
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
return PeerHelper(node->second);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find peer_id for address */
|
|
|
|
u16 Connection::lookupPeer(Address& sender)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock peerlock(m_peers_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
std::map<u16, Peer*>::iterator j;
|
|
|
|
j = m_peers.begin();
|
|
|
|
for(; j != m_peers.end(); ++j)
|
|
|
|
{
|
|
|
|
Peer *peer = j->second;
|
Tolerate packet reordering in the early init process
Fixes a bug where packet reordering made the server give the
client two peer ids instead of one. This in turn confused
reliable packet sending and made connecting to the server fail.
The client usually sends three packets at init: one "dummy"
packet consisting of two 0 bytes, and the init packet as well as
its legacy counterpart. The last one can be turned off since commit
af30183124d40a969040d7de4b3a487feec466e4, but this is of lower
relevance for the bug. The relevant part here is that network
packet reorder (which is a normal occurence) can make the packets
reach the server in different order.
If reorder puts the dummy packet further behind, the following
would happen before the patch:
1. The server will get one of the init packets on channel 1 and
assign the client a peer id, as the packet will have zero as
peer id.
2. The server sends a CONTROLTYPE_SET_PEER_ID packet to inform
the client of the peer id.
3. The next packet from the client will contain the peer id set by
the server.
4. The server sets the m_has_sent_with_id member for the client's
peer structure to true.
5. Now the dummy packet arrives. It has a peer id of zero, therefore
the server searches whether it already has a peer id for the
address the packet was sent from. The search fails because
m_has_sent_with_id was set to true and the server only searched
for peers with m_has_sent_with_id set to false.
6. In a working setup, the server would assign the dummy packet to
the correct peer id. However the server instead now assigns a
second peer id and peer structure to the peer, and assign the
packet to that new peer.
7. In order to inform the peer of its peer id, the server sends a
CONTROLTYPE_SET_PEER_ID command packet, reliably, to the peer.
This packet uses the new peer id.
8. The client sends an ack to that packet, not with the new peer id
but with the peer id sent in 2.
9. This packet reaches the server, but it drops the ACK as the peer
id does not map to any un-ACK-ed packets with that seqnum. The
same time, the server still waits for an ACK with the new peer
id, which of course won't come. This causes the server to
periodically re-try sending that packet, and the client ACKing it
each time.
Steps 7-9 cause annoyances and erroneous output, but don't cause
the connection failure itself.
The actual mistake that causes the connection failure happens in 6:
The server does not assign the dummy packet to the correct peer, but
to a newly created one.
Therefore, all further packets sent by the client on channel 0 are
now buffered by the server as it waits for the dummy packet to reach
the peer, which of course doesn't happen as the server assigned
that packet to the second peer it created for the client.
This makes the connection code indefinitely buffer the
TOSERVER_CLIENT_READY packet, not passing it to higher level code,
which stalls the continuation of the further init process
indefinitely and causes the actual bug.
Maybe this can be caused by reordered init packets as well, the only
studied case was where network has reliably reordered the dummy
packet to get sent after the init packets.
The patch fixes the bug by not ignoring peers where
m_has_sent_with_id has been set anymore. The other changes of the
patch are just cleanups of unused methods and fields and additional
explanatory comments.
One could think of alternate ways to fix the bug:
* The client could simply take the new peer id and continue
communicating with that. This is however worse than the fix as
it requires the peer id set command to be sent reliably (which
currently happens, but it cant be changed anymore). Also, such a
change would require both server and client to be patched in order
for the bug to be fixed, as right now the client ignores peer id
set commands after the peer id is different from
PEER_ID_INEXISTENT and the server requires modification too to
change the peer id internally.
And, most importantly, right now we guarantee higher level server
code that the peer id for a certain peer does not change. This
guarantee would have to be broken, and it would require much
larger changes to the server than this patch means.
* One could stop sending the dummy packet. One may be unsure whether
this is a good idea, as the meaning of the dummy packet is not
known (it might be there for something important), and as it is
possible that the init packets may cause this problem as well
(although it may be possible too that they can't cause this).
Thanks to @auouymous who had originally reported this bug and who
has helped patiently in finding its cause.
2016-05-18 06:18:08 +02:00
|
|
|
if (peer->isPendingDeletion())
|
2014-01-06 20:05:28 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
Address tocheck;
|
|
|
|
|
2014-06-28 08:02:38 +02:00
|
|
|
if ((peer->getAddress(MTP_MINETEST_RELIABLE_UDP, tocheck)) && (tocheck == sender))
|
2014-01-06 20:05:28 +01:00
|
|
|
return peer->id;
|
|
|
|
|
2014-06-28 08:02:38 +02:00
|
|
|
if ((peer->getAddress(MTP_UDP, tocheck)) && (tocheck == sender))
|
2014-01-06 20:05:28 +01:00
|
|
|
return peer->id;
|
|
|
|
}
|
|
|
|
|
|
|
|
return PEER_ID_INEXISTENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::list<Peer*> Connection::getPeers()
|
|
|
|
{
|
|
|
|
std::list<Peer*> list;
|
2017-08-19 22:23:47 +02:00
|
|
|
for (auto &p : m_peers) {
|
|
|
|
Peer *peer = p.second;
|
2014-01-06 20:05:28 +01:00
|
|
|
list.push_back(peer);
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
bool Connection::deletePeer(u16 peer_id, bool timeout)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
Peer *peer = 0;
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
/* lock list as short as possible */
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock peerlock(m_peers_mutex);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_peers.find(peer_id) == m_peers.end())
|
2014-01-06 20:05:28 +01:00
|
|
|
return false;
|
|
|
|
peer = m_peers[peer_id];
|
|
|
|
m_peers.erase(peer_id);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
m_peer_ids.remove(peer_id);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
Address peer_address;
|
|
|
|
//any peer has a primary address this never fails!
|
2014-06-28 08:02:38 +02:00
|
|
|
peer->getAddress(MTP_PRIMARY, peer_address);
|
2011-10-20 22:04:09 +02:00
|
|
|
// Create event
|
|
|
|
ConnectionEvent e;
|
2014-01-06 20:05:28 +01:00
|
|
|
e.peerRemoved(peer_id, timeout, peer_address);
|
2011-10-20 22:04:09 +02:00
|
|
|
putEvent(e);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
peer->Drop();
|
2011-10-20 22:04:09 +02:00
|
|
|
return true;
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
/* Interface */
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
ConnectionEvent Connection::waitEvent(u32 timeout_ms)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
try {
|
2011-10-20 22:04:09 +02:00
|
|
|
return m_event_queue.pop_front(timeout_ms);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
} catch(ItemNotFoundException &ex) {
|
2011-10-20 22:04:09 +02:00
|
|
|
ConnectionEvent e;
|
|
|
|
e.type = CONNEVENT_NONE;
|
|
|
|
return e;
|
2011-10-18 02:42:23 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
void Connection::putCommand(ConnectionCommand &c)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (!m_shutting_down) {
|
2014-01-06 20:05:28 +01:00
|
|
|
m_command_queue.push_back(c);
|
|
|
|
m_sendThread.Trigger();
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2014-02-05 21:24:46 +01:00
|
|
|
void Connection::Serve(Address bind_addr)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
|
|
|
ConnectionCommand c;
|
2014-02-05 21:24:46 +01:00
|
|
|
c.serve(bind_addr);
|
2011-10-20 22:04:09 +02:00
|
|
|
putCommand(c);
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
void Connection::Connect(Address address)
|
|
|
|
{
|
|
|
|
ConnectionCommand c;
|
|
|
|
c.connect(address);
|
|
|
|
putCommand(c);
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
bool Connection::Connected()
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock peerlock(m_peers_mutex);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_peers.size() != 1)
|
2011-10-20 22:04:09 +02:00
|
|
|
return false;
|
2014-07-06 16:17:46 +02:00
|
|
|
|
2012-12-20 18:19:49 +01:00
|
|
|
std::map<u16, Peer*>::iterator node = m_peers.find(PEER_ID_SERVER);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (node == m_peers.end())
|
2011-10-20 22:04:09 +02:00
|
|
|
return false;
|
2014-07-06 16:17:46 +02:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_peer_id == PEER_ID_INEXISTENT)
|
2011-10-20 22:04:09 +02:00
|
|
|
return false;
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
return true;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
void Connection::Disconnect()
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2011-10-20 22:04:09 +02:00
|
|
|
ConnectionCommand c;
|
|
|
|
c.disconnect();
|
|
|
|
putCommand(c);
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2015-03-31 10:35:51 +02:00
|
|
|
void Connection::Receive(NetworkPacket* pkt)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
for(;;) {
|
2011-10-20 22:04:09 +02:00
|
|
|
ConnectionEvent e = waitEvent(m_bc_receive_timeout);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (e.type != CONNEVENT_NONE)
|
2015-03-31 10:35:51 +02:00
|
|
|
LOG(dout_con << getDesc() << ": Receive: got event: "
|
|
|
|
<< e.describe() << std::endl);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
switch(e.type) {
|
2011-10-20 22:04:09 +02:00
|
|
|
case CONNEVENT_NONE:
|
|
|
|
throw NoIncomingDataException("No incoming data");
|
|
|
|
case CONNEVENT_DATA_RECEIVED:
|
2015-03-31 10:35:51 +02:00
|
|
|
// Data size is lesser than command size, ignoring packet
|
|
|
|
if (e.data.getSize() < 2) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
pkt->putRawPacket(*e.data, e.data.getSize(), e.peer_id);
|
|
|
|
return;
|
2011-10-20 22:04:09 +02:00
|
|
|
case CONNEVENT_PEER_ADDED: {
|
2014-01-06 20:05:28 +01:00
|
|
|
UDPPeer tmp(e.peer_id, e.address, this);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_bc_peerhandler)
|
2011-10-20 22:04:09 +02:00
|
|
|
m_bc_peerhandler->peerAdded(&tmp);
|
2015-03-31 10:35:51 +02:00
|
|
|
continue;
|
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
case CONNEVENT_PEER_REMOVED: {
|
2014-01-06 20:05:28 +01:00
|
|
|
UDPPeer tmp(e.peer_id, e.address, this);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (m_bc_peerhandler)
|
2011-10-20 22:04:09 +02:00
|
|
|
m_bc_peerhandler->deletingPeer(&tmp, e.timeout);
|
2015-03-31 10:35:51 +02:00
|
|
|
continue;
|
|
|
|
}
|
2012-03-11 19:45:43 +01:00
|
|
|
case CONNEVENT_BIND_FAILED:
|
|
|
|
throw ConnectionBindFailed("Failed to bind socket "
|
|
|
|
"(port already in use?)");
|
2011-10-20 22:04:09 +02:00
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
2011-10-20 22:04:09 +02:00
|
|
|
throw NoIncomingDataException("No incoming data");
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
void Connection::Send(u16 peer_id, u8 channelnum,
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
NetworkPacket* pkt, bool reliable)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(channelnum < CHANNEL_COUNT); // Pre-condition
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
ConnectionCommand c;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
|
2015-03-22 12:18:16 +01:00
|
|
|
c.send(peer_id, channelnum, pkt, reliable);
|
2011-10-20 22:04:09 +02:00
|
|
|
putCommand(c);
|
|
|
|
}
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-10-20 22:04:09 +02:00
|
|
|
Address Connection::GetPeerAddress(u16 peer_id)
|
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
PeerHelper peer = getPeerNoEx(peer_id);
|
|
|
|
|
|
|
|
if (!peer)
|
|
|
|
throw PeerNotFoundException("No address for peer found!");
|
|
|
|
Address peer_address;
|
2014-06-28 08:02:38 +02:00
|
|
|
peer->getAddress(MTP_PRIMARY, peer_address);
|
2014-01-06 20:05:28 +01:00
|
|
|
return peer_address;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
2014-02-13 20:17:42 +01:00
|
|
|
float Connection::getPeerStat(u16 peer_id, rtt_stat_type type)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
PeerHelper peer = getPeerNoEx(peer_id);
|
|
|
|
if (!peer) return -1;
|
2014-02-13 20:17:42 +01:00
|
|
|
return peer->getStat(type);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
float Connection::getLocalStat(rate_stat_type type)
|
|
|
|
{
|
|
|
|
PeerHelper peer = getPeerNoEx(PEER_ID_SERVER);
|
|
|
|
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR_IF(!peer, "Connection::getLocalStat we couldn't get our own peer? are you serious???");
|
2014-04-26 01:15:46 +02:00
|
|
|
|
|
|
|
float retval = 0.0;
|
|
|
|
|
2017-08-19 22:23:47 +02:00
|
|
|
for (Channel &channel : dynamic_cast<UDPPeer *>(&peer)->channels) {
|
2014-04-26 01:15:46 +02:00
|
|
|
switch(type) {
|
|
|
|
case CUR_DL_RATE:
|
2017-08-19 22:23:47 +02:00
|
|
|
retval += channel.getCurrentDownloadRateKB();
|
2014-04-26 01:15:46 +02:00
|
|
|
break;
|
|
|
|
case AVG_DL_RATE:
|
2017-08-19 22:23:47 +02:00
|
|
|
retval += channel.getAvgDownloadRateKB();
|
2014-04-26 01:15:46 +02:00
|
|
|
break;
|
|
|
|
case CUR_INC_RATE:
|
2017-08-19 22:23:47 +02:00
|
|
|
retval += channel.getCurrentIncomingRateKB();
|
2014-04-26 01:15:46 +02:00
|
|
|
break;
|
|
|
|
case AVG_INC_RATE:
|
2017-08-19 22:23:47 +02:00
|
|
|
retval += channel.getAvgIncomingRateKB();
|
2014-04-26 01:15:46 +02:00
|
|
|
break;
|
|
|
|
case AVG_LOSS_RATE:
|
2017-08-19 22:23:47 +02:00
|
|
|
retval += channel.getAvgLossRateKB();
|
2014-04-26 01:15:46 +02:00
|
|
|
break;
|
|
|
|
case CUR_LOSS_RATE:
|
2017-08-19 22:23:47 +02:00
|
|
|
retval += channel.getCurrentLossRateKB();
|
2014-04-26 01:15:46 +02:00
|
|
|
break;
|
|
|
|
default:
|
2015-03-06 11:21:51 +01:00
|
|
|
FATAL_ERROR("Connection::getLocalStat Invalid stat type");
|
2014-04-26 01:15:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 Connection::createPeer(Address& sender, MTProtocols protocol, int fd)
|
|
|
|
{
|
|
|
|
// Somebody wants to make a new connection
|
|
|
|
|
|
|
|
// Get a unique peer id (2 or higher)
|
2014-01-31 00:24:00 +01:00
|
|
|
u16 peer_id_new = m_next_remote_peer_id;
|
2014-01-06 20:05:28 +01:00
|
|
|
u16 overflow = MAX_UDP_PEERS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find an unused peer id
|
|
|
|
*/
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock lock(m_peers_mutex);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
bool out_of_ids = false;
|
|
|
|
for(;;) {
|
|
|
|
// Check if exists
|
|
|
|
if (m_peers.find(peer_id_new) == m_peers.end())
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
break;
|
|
|
|
// Check for overflow
|
|
|
|
if (peer_id_new == overflow) {
|
|
|
|
out_of_ids = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
peer_id_new++;
|
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
if (out_of_ids) {
|
|
|
|
errorstream << getDesc() << " ran out of peer ids" << std::endl;
|
|
|
|
return PEER_ID_INEXISTENT;
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
// Create a peer
|
|
|
|
Peer *peer = 0;
|
|
|
|
peer = new UDPPeer(peer_id_new, sender, this);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
m_peers[peer->id] = peer;
|
|
|
|
m_peer_ids.push_back(peer->id);
|
|
|
|
|
|
|
|
m_next_remote_peer_id = (peer_id_new +1 ) % MAX_UDP_PEERS;
|
|
|
|
|
|
|
|
LOG(dout_con << getDesc()
|
|
|
|
<< "createPeer(): giving peer_id=" << peer_id_new << std::endl);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
ConnectionCommand cmd;
|
|
|
|
SharedBuffer<u8> reply(4);
|
|
|
|
writeU8(&reply[0], TYPE_CONTROL);
|
|
|
|
writeU8(&reply[1], CONTROLTYPE_SET_PEER_ID);
|
|
|
|
writeU16(&reply[2], peer_id_new);
|
|
|
|
cmd.createPeer(peer_id_new,reply);
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
putCommand(cmd);
|
2014-01-06 20:05:28 +01:00
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
// Create peer addition event
|
|
|
|
ConnectionEvent e;
|
|
|
|
e.peerAdded(peer_id_new, sender);
|
|
|
|
putEvent(e);
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
// We're now talking to a valid peer_id
|
|
|
|
return peer_id_new;
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void Connection::PrintInfo(std::ostream &out)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
m_info_mutex.lock();
|
2011-10-20 22:04:09 +02:00
|
|
|
out<<getDesc()<<": ";
|
2015-04-07 12:13:12 +02:00
|
|
|
m_info_mutex.unlock();
|
2010-11-27 00:02:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void Connection::PrintInfo()
|
|
|
|
{
|
|
|
|
PrintInfo(dout_con);
|
|
|
|
}
|
|
|
|
|
2014-01-06 20:05:28 +01:00
|
|
|
const std::string Connection::getDesc()
|
|
|
|
{
|
2014-04-26 01:15:46 +02:00
|
|
|
return std::string("con(")+
|
|
|
|
itos(m_udpSocket.GetHandle())+"/"+itos(m_peer_id)+")";
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
void Connection::DisconnectPeer(u16 peer_id)
|
|
|
|
{
|
|
|
|
ConnectionCommand discon;
|
|
|
|
discon.disconnect_peer(peer_id);
|
|
|
|
putCommand(discon);
|
|
|
|
}
|
|
|
|
|
2014-04-26 01:15:46 +02:00
|
|
|
void Connection::sendAck(u16 peer_id, u8 channelnum, u16 seqnum)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(channelnum < CHANNEL_COUNT); // Pre-condition
|
2014-01-06 20:05:28 +01:00
|
|
|
|
|
|
|
LOG(dout_con<<getDesc()
|
|
|
|
<<" Queuing ACK command to peer_id: " << peer_id <<
|
|
|
|
" channel: " << (channelnum & 0xFF) <<
|
|
|
|
" seqnum: " << seqnum << std::endl);
|
|
|
|
|
|
|
|
ConnectionCommand c;
|
|
|
|
SharedBuffer<u8> ack(4);
|
|
|
|
writeU8(&ack[0], TYPE_CONTROL);
|
|
|
|
writeU8(&ack[1], CONTROLTYPE_ACK);
|
|
|
|
writeU16(&ack[2], seqnum);
|
|
|
|
|
|
|
|
c.ack(peer_id, channelnum, ack);
|
|
|
|
putCommand(c);
|
|
|
|
m_sendThread.Trigger();
|
|
|
|
}
|
|
|
|
|
|
|
|
UDPPeer* Connection::createServerPeer(Address& address)
|
2011-10-20 22:04:09 +02:00
|
|
|
{
|
2014-01-06 20:05:28 +01:00
|
|
|
if (getPeerNoEx(PEER_ID_SERVER) != 0)
|
|
|
|
{
|
|
|
|
throw ConnectionException("Already connected to a server");
|
|
|
|
}
|
|
|
|
|
|
|
|
UDPPeer *peer = new UDPPeer(PEER_ID_SERVER, address, this);
|
|
|
|
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock lock(m_peers_mutex);
|
2014-01-06 20:05:28 +01:00
|
|
|
m_peers[peer->id] = peer;
|
[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
2015-01-16 11:37:49 +01:00
|
|
|
m_peer_ids.push_back(peer->id);
|
2014-01-06 20:05:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return peer;
|
|
|
|
}
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
} // namespace
|