2014-01-31 00:24:00 +01:00
|
|
|
/*
|
|
|
|
Minetest
|
|
|
|
Copyright (C) 2010-2014 celeron55, Perttu Ahola <celeron55@gmail.com>
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
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
|
|
|
|
(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
|
|
|
|
GNU Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2014-02-13 20:17:42 +01:00
|
|
|
#include <sstream>
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
#include "clientiface.h"
|
2014-09-12 00:22:05 +02:00
|
|
|
#include "util/numeric.h"
|
|
|
|
#include "util/mathconstants.h"
|
2016-10-08 19:08:23 +02:00
|
|
|
#include "remoteplayer.h"
|
2014-01-31 00:24:00 +01:00
|
|
|
#include "settings.h"
|
|
|
|
#include "mapblock.h"
|
[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
|
|
|
#include "network/connection.h"
|
2014-01-31 00:24:00 +01:00
|
|
|
#include "environment.h"
|
|
|
|
#include "map.h"
|
|
|
|
#include "emerge.h"
|
2016-10-30 14:53:26 +01:00
|
|
|
#include "content_sao.h" // TODO this is used for cleanup of only
|
2014-09-12 00:22:05 +02:00
|
|
|
#include "log.h"
|
2015-04-12 04:49:13 +02:00
|
|
|
#include "util/srp.h"
|
2014-01-31 00:24:00 +01:00
|
|
|
|
2014-06-28 08:02:38 +02:00
|
|
|
const char *ClientInterface::statenames[] = {
|
|
|
|
"Invalid",
|
|
|
|
"Disconnecting",
|
|
|
|
"Denied",
|
|
|
|
"Created",
|
2015-08-31 13:26:40 +02:00
|
|
|
"AwaitingInit2",
|
|
|
|
"HelloSent",
|
2014-06-28 08:02:38 +02:00
|
|
|
"InitDone",
|
|
|
|
"DefinitionsSent",
|
2015-08-31 13:26:40 +02:00
|
|
|
"Active",
|
|
|
|
"SudoMode",
|
2014-06-28 08:02:38 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::string ClientInterface::state2Name(ClientState state)
|
|
|
|
{
|
|
|
|
return statenames[state];
|
|
|
|
}
|
|
|
|
|
2014-07-12 20:20:11 +02:00
|
|
|
void RemoteClient::ResendBlockIfOnWire(v3s16 p)
|
|
|
|
{
|
|
|
|
// if this block is on wire, mark it for sending again as soon as possible
|
|
|
|
if (m_blocks_sending.find(p) != m_blocks_sending.end()) {
|
|
|
|
SetBlockNotSent(p);
|
|
|
|
}
|
|
|
|
}
|
2014-06-28 08:02:38 +02:00
|
|
|
|
2015-02-15 17:30:38 +01:00
|
|
|
void RemoteClient::GetNextBlocks (
|
2014-01-31 00:24:00 +01:00
|
|
|
ServerEnvironment *env,
|
|
|
|
EmergeManager * emerge,
|
|
|
|
float dtime,
|
|
|
|
std::vector<PrioritySortedBlockTransfer> &dest)
|
|
|
|
{
|
2015-10-14 08:39:30 +02:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
// Increment timers
|
|
|
|
m_nothing_to_send_pause_timer -= dtime;
|
|
|
|
m_nearest_unsent_reset_timer += dtime;
|
|
|
|
|
|
|
|
if(m_nothing_to_send_pause_timer >= 0)
|
|
|
|
return;
|
|
|
|
|
2016-10-08 16:31:22 +02:00
|
|
|
RemotePlayer *player = env->getPlayer(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// This can happen sometimes; clients and players are not in perfect sync.
|
2016-10-08 16:31:22 +02:00
|
|
|
if (player == NULL)
|
2014-01-31 00:24:00 +01:00
|
|
|
return;
|
|
|
|
|
2016-10-30 14:53:26 +01:00
|
|
|
PlayerSAO *sao = player->getPlayerSAO();
|
|
|
|
if (sao == NULL)
|
|
|
|
return;
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
// Won't send anything if already sending
|
|
|
|
if(m_blocks_sending.size() >= g_settings->getU16
|
|
|
|
("max_simultaneous_block_sends_per_client"))
|
|
|
|
{
|
|
|
|
//infostream<<"Not sending any blocks, Queue full."<<std::endl;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-10-30 14:53:26 +01:00
|
|
|
v3f playerpos = sao->getBasePosition();
|
2014-01-31 00:24:00 +01:00
|
|
|
v3f playerspeed = player->getSpeed();
|
|
|
|
v3f playerspeeddir(0,0,0);
|
|
|
|
if(playerspeed.getLength() > 1.0*BS)
|
|
|
|
playerspeeddir = playerspeed / playerspeed.getLength();
|
|
|
|
// Predict to next block
|
|
|
|
v3f playerpos_predicted = playerpos + playerspeeddir*MAP_BLOCKSIZE*BS;
|
|
|
|
|
|
|
|
v3s16 center_nodepos = floatToInt(playerpos_predicted, BS);
|
|
|
|
|
|
|
|
v3s16 center = getNodeBlockPos(center_nodepos);
|
|
|
|
|
|
|
|
// Camera position and direction
|
2016-10-30 14:53:26 +01:00
|
|
|
v3f camera_pos = sao->getEyePosition();
|
2014-01-31 00:24:00 +01:00
|
|
|
v3f camera_dir = v3f(0,0,1);
|
2016-10-30 14:53:26 +01:00
|
|
|
camera_dir.rotateYZBy(sao->getPitch());
|
|
|
|
camera_dir.rotateXZBy(sao->getYaw());
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
/*infostream<<"camera_dir=("<<camera_dir.X<<","<<camera_dir.Y<<","
|
|
|
|
<<camera_dir.Z<<")"<<std::endl;*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
Get the starting value of the block finder radius.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if(m_last_center != center)
|
|
|
|
{
|
|
|
|
m_nearest_unsent_d = 0;
|
|
|
|
m_last_center = center;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*infostream<<"m_nearest_unsent_reset_timer="
|
|
|
|
<<m_nearest_unsent_reset_timer<<std::endl;*/
|
|
|
|
|
|
|
|
// Reset periodically to workaround for some bugs or stuff
|
|
|
|
if(m_nearest_unsent_reset_timer > 20.0)
|
|
|
|
{
|
|
|
|
m_nearest_unsent_reset_timer = 0;
|
|
|
|
m_nearest_unsent_d = 0;
|
|
|
|
//infostream<<"Resetting m_nearest_unsent_d for "
|
|
|
|
// <<server->getPlayerName(peer_id)<<std::endl;
|
|
|
|
}
|
|
|
|
|
|
|
|
//s16 last_nearest_unsent_d = m_nearest_unsent_d;
|
|
|
|
s16 d_start = m_nearest_unsent_d;
|
|
|
|
|
|
|
|
//infostream<<"d_start="<<d_start<<std::endl;
|
|
|
|
|
|
|
|
u16 max_simul_sends_setting = g_settings->getU16
|
|
|
|
("max_simultaneous_block_sends_per_client");
|
|
|
|
u16 max_simul_sends_usually = max_simul_sends_setting;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Check the time from last addNode/removeNode.
|
|
|
|
|
|
|
|
Decrease send rate if player is building stuff.
|
|
|
|
*/
|
|
|
|
m_time_from_building += dtime;
|
|
|
|
if(m_time_from_building < g_settings->getFloat(
|
|
|
|
"full_block_send_enable_min_time_from_building"))
|
|
|
|
{
|
|
|
|
max_simul_sends_usually
|
|
|
|
= LIMITED_MAX_SIMULTANEOUS_BLOCK_SENDS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Number of blocks sending + number of blocks selected for sending
|
|
|
|
*/
|
|
|
|
u32 num_blocks_selected = m_blocks_sending.size();
|
|
|
|
|
|
|
|
/*
|
|
|
|
next time d will be continued from the d from which the nearest
|
|
|
|
unsent block was found this time.
|
|
|
|
|
|
|
|
This is because not necessarily any of the blocks found this
|
|
|
|
time are actually sent.
|
|
|
|
*/
|
|
|
|
s32 new_nearest_unsent_d = -1;
|
|
|
|
|
2014-03-26 17:53:11 +01:00
|
|
|
const s16 full_d_max = g_settings->getS16("max_block_send_distance");
|
|
|
|
s16 d_max = full_d_max;
|
2014-01-31 00:24:00 +01:00
|
|
|
s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
|
|
|
|
|
|
|
|
// Don't loop very much at a time
|
|
|
|
s16 max_d_increment_at_time = 2;
|
|
|
|
if(d_max > d_start + max_d_increment_at_time)
|
|
|
|
d_max = d_start + max_d_increment_at_time;
|
|
|
|
|
|
|
|
s32 nearest_emerged_d = -1;
|
|
|
|
s32 nearest_emergefull_d = -1;
|
|
|
|
s32 nearest_sent_d = -1;
|
2015-01-19 05:29:19 +01:00
|
|
|
//bool queue_is_full = false;
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
s16 d;
|
2015-02-15 17:30:38 +01:00
|
|
|
for(d = d_start; d <= d_max; d++) {
|
2014-01-31 00:24:00 +01:00
|
|
|
/*
|
|
|
|
Get the border/face dot coordinates of a "d-radiused"
|
|
|
|
box
|
|
|
|
*/
|
2015-02-15 17:30:38 +01:00
|
|
|
std::vector<v3s16> list = FacePositionCache::getFacePositions(d);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
2015-02-15 17:30:38 +01:00
|
|
|
std::vector<v3s16>::iterator li;
|
|
|
|
for(li = list.begin(); li != list.end(); ++li) {
|
2014-01-31 00:24:00 +01:00
|
|
|
v3s16 p = *li + center;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Send throttling
|
|
|
|
- Don't allow too many simultaneous transfers
|
|
|
|
- EXCEPT when the blocks are very close
|
|
|
|
|
|
|
|
Also, don't send blocks that are already flying.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// Start with the usual maximum
|
|
|
|
u16 max_simul_dynamic = max_simul_sends_usually;
|
|
|
|
|
|
|
|
// If block is very close, allow full maximum
|
|
|
|
if(d <= BLOCK_SEND_DISABLE_LIMITS_MAX_D)
|
|
|
|
max_simul_dynamic = max_simul_sends_setting;
|
|
|
|
|
|
|
|
// Don't select too many blocks for sending
|
2015-07-13 17:01:31 +02:00
|
|
|
if (num_blocks_selected >= max_simul_dynamic) {
|
2015-01-19 05:29:19 +01:00
|
|
|
//queue_is_full = true;
|
2014-01-31 00:24:00 +01:00
|
|
|
goto queue_full_break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Don't send blocks that are currently being transferred
|
2015-07-13 17:01:31 +02:00
|
|
|
if (m_blocks_sending.find(p) != m_blocks_sending.end())
|
2014-01-31 00:24:00 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Do not go over-limit
|
|
|
|
*/
|
2015-07-13 17:01:31 +02:00
|
|
|
if (blockpos_over_limit(p))
|
2014-01-31 00:24:00 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// If this is true, inexistent block will be made from scratch
|
|
|
|
bool generate = d <= d_max_gen;
|
|
|
|
|
|
|
|
{
|
|
|
|
/*// Limit the generating area vertically to 2/3
|
|
|
|
if(abs(p.Y - center.Y) > d_max_gen - d_max_gen / 3)
|
|
|
|
generate = false;*/
|
|
|
|
|
|
|
|
// Limit the send area vertically to 1/2
|
2015-07-13 17:01:31 +02:00
|
|
|
if (abs(p.Y - center.Y) > full_d_max / 2)
|
2014-01-31 00:24:00 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Don't generate or send if not in sight
|
|
|
|
FIXME This only works if the client uses a small enough
|
|
|
|
FOV setting. The default of 72 degrees is fine.
|
|
|
|
*/
|
|
|
|
|
|
|
|
float camera_fov = (72.0*M_PI/180) * 4./3.;
|
|
|
|
if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, 10000*BS) == false)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Don't send already sent blocks
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
if(m_blocks_sent.find(p) != m_blocks_sent.end())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Check if map has this block
|
|
|
|
*/
|
|
|
|
MapBlock *block = env->getMap().getBlockNoCreateNoEx(p);
|
|
|
|
|
|
|
|
bool surely_not_found_on_disk = false;
|
|
|
|
bool block_is_invalid = false;
|
|
|
|
if(block != NULL)
|
|
|
|
{
|
|
|
|
// Reset usage timer, this block will be of use in the future.
|
|
|
|
block->resetUsageTimer();
|
|
|
|
|
|
|
|
// Block is dummy if data doesn't exist.
|
|
|
|
// It means it has been not found from disk and not generated
|
|
|
|
if(block->isDummy())
|
|
|
|
{
|
|
|
|
surely_not_found_on_disk = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Block is valid if lighting is up-to-date and data exists
|
|
|
|
if(block->isValid() == false)
|
|
|
|
{
|
|
|
|
block_is_invalid = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(block->isGenerated() == false)
|
|
|
|
block_is_invalid = true;
|
|
|
|
|
|
|
|
/*
|
|
|
|
If block is not close, don't send it unless it is near
|
|
|
|
ground level.
|
|
|
|
|
|
|
|
Block is near ground level if night-time mesh
|
|
|
|
differs from day-time mesh.
|
|
|
|
*/
|
|
|
|
if(d >= 4)
|
|
|
|
{
|
|
|
|
if(block->getDayNightDiff() == false)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
If block has been marked to not exist on disk (dummy)
|
|
|
|
and generating new ones is not wanted, skip block.
|
|
|
|
*/
|
|
|
|
if(generate == false && surely_not_found_on_disk == true)
|
|
|
|
{
|
|
|
|
// get next one.
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Add inexistent block to emerge queue.
|
|
|
|
*/
|
|
|
|
if(block == NULL || surely_not_found_on_disk || block_is_invalid)
|
|
|
|
{
|
|
|
|
if (emerge->enqueueBlockEmerge(peer_id, p, generate)) {
|
|
|
|
if (nearest_emerged_d == -1)
|
|
|
|
nearest_emerged_d = d;
|
|
|
|
} else {
|
|
|
|
if (nearest_emergefull_d == -1)
|
|
|
|
nearest_emergefull_d = d;
|
|
|
|
goto queue_full_break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// get next one.
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(nearest_sent_d == -1)
|
|
|
|
nearest_sent_d = d;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Add block to send queue
|
|
|
|
*/
|
|
|
|
PrioritySortedBlockTransfer q((float)d, p, peer_id);
|
|
|
|
|
|
|
|
dest.push_back(q);
|
|
|
|
|
|
|
|
num_blocks_selected += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
queue_full_break:
|
|
|
|
|
|
|
|
// If nothing was found for sending and nothing was queued for
|
|
|
|
// emerging, continue next time browsing from here
|
|
|
|
if(nearest_emerged_d != -1){
|
|
|
|
new_nearest_unsent_d = nearest_emerged_d;
|
|
|
|
} else if(nearest_emergefull_d != -1){
|
|
|
|
new_nearest_unsent_d = nearest_emergefull_d;
|
|
|
|
} else {
|
|
|
|
if(d > g_settings->getS16("max_block_send_distance")){
|
|
|
|
new_nearest_unsent_d = 0;
|
|
|
|
m_nothing_to_send_pause_timer = 2.0;
|
|
|
|
} else {
|
|
|
|
if(nearest_sent_d != -1)
|
|
|
|
new_nearest_unsent_d = nearest_sent_d;
|
|
|
|
else
|
|
|
|
new_nearest_unsent_d = d;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(new_nearest_unsent_d != -1)
|
|
|
|
m_nearest_unsent_d = new_nearest_unsent_d;
|
|
|
|
}
|
|
|
|
|
|
|
|
void RemoteClient::GotBlock(v3s16 p)
|
|
|
|
{
|
2016-02-15 16:05:40 +01:00
|
|
|
if (m_blocks_modified.find(p) == m_blocks_modified.end()) {
|
|
|
|
if (m_blocks_sending.find(p) != m_blocks_sending.end())
|
|
|
|
m_blocks_sending.erase(p);
|
|
|
|
else
|
|
|
|
m_excess_gotblocks++;
|
|
|
|
|
|
|
|
m_blocks_sent.insert(p);
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void RemoteClient::SentBlock(v3s16 p)
|
|
|
|
{
|
2016-02-15 16:05:40 +01:00
|
|
|
if (m_blocks_modified.find(p) != m_blocks_modified.end())
|
|
|
|
m_blocks_modified.erase(p);
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
if(m_blocks_sending.find(p) == m_blocks_sending.end())
|
|
|
|
m_blocks_sending[p] = 0.0;
|
|
|
|
else
|
|
|
|
infostream<<"RemoteClient::SentBlock(): Sent block"
|
|
|
|
" already in m_blocks_sending"<<std::endl;
|
|
|
|
}
|
|
|
|
|
|
|
|
void RemoteClient::SetBlockNotSent(v3s16 p)
|
|
|
|
{
|
|
|
|
m_nearest_unsent_d = 0;
|
2016-02-01 19:29:53 +01:00
|
|
|
m_nothing_to_send_pause_timer = 0;
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
if(m_blocks_sending.find(p) != m_blocks_sending.end())
|
|
|
|
m_blocks_sending.erase(p);
|
|
|
|
if(m_blocks_sent.find(p) != m_blocks_sent.end())
|
|
|
|
m_blocks_sent.erase(p);
|
2016-02-15 16:05:40 +01:00
|
|
|
m_blocks_modified.insert(p);
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void RemoteClient::SetBlocksNotSent(std::map<v3s16, MapBlock*> &blocks)
|
|
|
|
{
|
|
|
|
m_nearest_unsent_d = 0;
|
2016-02-01 19:29:53 +01:00
|
|
|
m_nothing_to_send_pause_timer = 0;
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
for(std::map<v3s16, MapBlock*>::iterator
|
|
|
|
i = blocks.begin();
|
|
|
|
i != blocks.end(); ++i)
|
|
|
|
{
|
|
|
|
v3s16 p = i->first;
|
2016-02-15 16:05:40 +01:00
|
|
|
m_blocks_modified.insert(p);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
if(m_blocks_sending.find(p) != m_blocks_sending.end())
|
|
|
|
m_blocks_sending.erase(p);
|
|
|
|
if(m_blocks_sent.find(p) != m_blocks_sent.end())
|
|
|
|
m_blocks_sent.erase(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void RemoteClient::notifyEvent(ClientStateEvent event)
|
|
|
|
{
|
2014-02-13 20:17:42 +01:00
|
|
|
std::ostringstream myerror;
|
2014-01-31 00:24:00 +01:00
|
|
|
switch (m_state)
|
|
|
|
{
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_Invalid:
|
2014-02-13 20:17:42 +01:00
|
|
|
//intentionally do nothing
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_Created:
|
2015-04-12 04:49:13 +02:00
|
|
|
switch (event) {
|
|
|
|
case CSE_Hello:
|
|
|
|
m_state = CS_HelloSent;
|
|
|
|
break;
|
|
|
|
case CSE_InitLegacy:
|
|
|
|
m_state = CS_AwaitingInit2;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
|
|
|
/* GotInit2 SetDefinitionsSent SetMediaSent */
|
|
|
|
default:
|
2014-02-13 20:17:42 +01:00
|
|
|
myerror << "Created: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_Denied:
|
2014-01-31 00:24:00 +01:00
|
|
|
/* don't do anything if in denied state */
|
|
|
|
break;
|
2015-04-12 04:49:13 +02:00
|
|
|
case CS_HelloSent:
|
|
|
|
switch(event)
|
|
|
|
{
|
|
|
|
case CSE_AuthAccept:
|
|
|
|
m_state = CS_AwaitingInit2;
|
|
|
|
if ((chosen_mech == AUTH_MECHANISM_SRP)
|
|
|
|
|| (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
|
|
|
|
srp_verifier_delete((SRPVerifier *) auth_data);
|
|
|
|
chosen_mech = AUTH_MECHANISM_NONE;
|
|
|
|
break;
|
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
|
|
|
break;
|
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
|
|
|
if ((chosen_mech == AUTH_MECHANISM_SRP)
|
|
|
|
|| (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
|
|
|
|
srp_verifier_delete((SRPVerifier *) auth_data);
|
|
|
|
chosen_mech = AUTH_MECHANISM_NONE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
myerror << "HelloSent: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CS_AwaitingInit2:
|
2014-01-31 00:24:00 +01:00
|
|
|
switch(event)
|
|
|
|
{
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_GotInit2:
|
2014-01-31 00:24:00 +01:00
|
|
|
confirmSerializationVersion();
|
2014-06-28 08:02:38 +02:00
|
|
|
m_state = CS_InitDone;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Init SetDefinitionsSent SetMediaSent */
|
|
|
|
default:
|
2014-02-13 20:17:42 +01:00
|
|
|
myerror << "InitSent: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_InitDone:
|
2014-01-31 00:24:00 +01:00
|
|
|
switch(event)
|
|
|
|
{
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetDefinitionsSent:
|
|
|
|
m_state = CS_DefinitionsSent;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Init GotInit2 SetMediaSent */
|
|
|
|
default:
|
2014-02-13 20:17:42 +01:00
|
|
|
myerror << "InitDone: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_DefinitionsSent:
|
2014-01-31 00:24:00 +01:00
|
|
|
switch(event)
|
|
|
|
{
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetClientReady:
|
|
|
|
m_state = CS_Active;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
|
|
|
/* Init GotInit2 SetDefinitionsSent */
|
|
|
|
default:
|
2014-02-13 20:17:42 +01:00
|
|
|
myerror << "DefinitionsSent: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_Active:
|
2014-01-31 00:24:00 +01:00
|
|
|
switch(event)
|
|
|
|
{
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
2015-04-12 04:49:13 +02:00
|
|
|
case CSE_SudoSuccess:
|
|
|
|
m_state = CS_SudoMode;
|
|
|
|
if ((chosen_mech == AUTH_MECHANISM_SRP)
|
|
|
|
|| (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
|
|
|
|
srp_verifier_delete((SRPVerifier *) auth_data);
|
|
|
|
chosen_mech = AUTH_MECHANISM_NONE;
|
|
|
|
break;
|
2014-01-31 00:24:00 +01:00
|
|
|
/* Init GotInit2 SetDefinitionsSent SetMediaSent SetDenied */
|
|
|
|
default:
|
2014-02-13 20:17:42 +01:00
|
|
|
myerror << "Active: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
2014-01-31 00:24:00 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2015-04-12 04:49:13 +02:00
|
|
|
case CS_SudoMode:
|
|
|
|
switch(event)
|
|
|
|
{
|
|
|
|
case CSE_SetDenied:
|
|
|
|
m_state = CS_Denied;
|
|
|
|
break;
|
|
|
|
case CSE_Disconnect:
|
|
|
|
m_state = CS_Disconnecting;
|
|
|
|
break;
|
|
|
|
case CSE_SudoLeave:
|
|
|
|
m_state = CS_Active;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
myerror << "Active: Invalid client state transition! " << event;
|
|
|
|
throw ClientStateError(myerror.str());
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2014-06-28 08:02:38 +02:00
|
|
|
case CS_Disconnecting:
|
2014-01-31 00:24:00 +01:00
|
|
|
/* we are already disconnecting */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-13 20:17:42 +01:00
|
|
|
u32 RemoteClient::uptime()
|
|
|
|
{
|
|
|
|
return getTime(PRECISION_SECONDS) - m_connection_time;
|
|
|
|
}
|
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
ClientInterface::ClientInterface(con::Connection* con)
|
|
|
|
:
|
|
|
|
m_con(con),
|
|
|
|
m_env(NULL),
|
|
|
|
m_print_info_timer(0.0)
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
ClientInterface::~ClientInterface()
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Delete clients
|
|
|
|
*/
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
2016-10-05 09:03:55 +02:00
|
|
|
for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
|
|
|
|
i != m_clients.end(); ++i) {
|
2014-01-31 00:24:00 +01:00
|
|
|
// Delete client
|
|
|
|
delete i->second;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-04 16:30:24 +01:00
|
|
|
std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
|
2014-01-31 00:24:00 +01:00
|
|
|
{
|
2015-03-04 16:30:24 +01:00
|
|
|
std::vector<u16> reply;
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
2016-10-05 09:03:55 +02:00
|
|
|
for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
|
|
|
|
i != m_clients.end(); ++i) {
|
2014-01-31 00:24:00 +01:00
|
|
|
if (i->second->getState() >= min_state)
|
|
|
|
reply.push_back(i->second->peer_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::step(float dtime)
|
|
|
|
{
|
|
|
|
m_print_info_timer += dtime;
|
|
|
|
if(m_print_info_timer >= 30.0)
|
|
|
|
{
|
|
|
|
m_print_info_timer = 0.0;
|
|
|
|
UpdatePlayerList();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::UpdatePlayerList()
|
|
|
|
{
|
2016-10-08 16:31:22 +02:00
|
|
|
if (m_env != NULL) {
|
2015-03-04 16:30:24 +01:00
|
|
|
std::vector<u16> clients = getClientIDs();
|
2014-01-31 00:24:00 +01:00
|
|
|
m_clients_names.clear();
|
|
|
|
|
|
|
|
|
2014-12-12 15:55:40 +01:00
|
|
|
if(!clients.empty())
|
2014-01-31 00:24:00 +01:00
|
|
|
infostream<<"Players:"<<std::endl;
|
2015-03-04 16:30:24 +01:00
|
|
|
|
2016-10-08 16:31:22 +02:00
|
|
|
for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
|
|
|
|
RemotePlayer *player = m_env->getPlayer(*i);
|
2015-03-04 16:30:24 +01:00
|
|
|
|
|
|
|
if (player == NULL)
|
2014-01-31 00:24:00 +01:00
|
|
|
continue;
|
2015-03-04 16:30:24 +01:00
|
|
|
|
|
|
|
infostream << "* " << player->getName() << "\t";
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
RemoteClient* client = lockedGetClientNoEx(*i);
|
|
|
|
if(client != NULL)
|
|
|
|
client->PrintInfo(infostream);
|
|
|
|
}
|
2015-03-04 16:30:24 +01:00
|
|
|
|
2014-01-31 00:24:00 +01:00
|
|
|
m_clients_names.push_back(player->getName());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[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
|
|
|
void ClientInterface::send(u16 peer_id, u8 channelnum,
|
2015-03-13 22:01:49 +01:00
|
|
|
NetworkPacket* pkt, bool reliable)
|
2014-01-31 00:24:00 +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_con->Send(peer_id, channelnum, pkt, reliable);
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::sendToAll(u16 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)
|
2014-01-31 00:24:00 +01:00
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2016-10-05 09:03:55 +02:00
|
|
|
for(UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
|
[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
|
|
|
i != m_clients.end(); ++i) {
|
2014-01-31 00:24:00 +01:00
|
|
|
RemoteClient *client = i->second;
|
|
|
|
|
[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 (client->net_proto_version != 0) {
|
|
|
|
m_con->Send(client->peer_id, channelnum, pkt, reliable);
|
2014-01-31 00:24:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// The client may not exist; clients are immediately removed if their
|
|
|
|
// access is denied, and this event occurs later then.
|
2016-10-05 09:03:55 +02:00
|
|
|
if (n == m_clients.end())
|
2014-01-31 00:24:00 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (n->second->getState() >= state_min)
|
|
|
|
return n->second;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min)
|
|
|
|
{
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// The client may not exist; clients are immediately removed if their
|
|
|
|
// access is denied, and this event occurs later then.
|
2016-10-05 09:03:55 +02:00
|
|
|
if (n == m_clients.end())
|
2014-01-31 00:24:00 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (n->second->getState() >= state_min)
|
|
|
|
return n->second;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ClientState ClientInterface::getClientState(u16 peer_id)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// The client may not exist; clients are immediately removed if their
|
|
|
|
// access is denied, and this event occurs later then.
|
2016-10-05 09:03:55 +02:00
|
|
|
if (n == m_clients.end())
|
2014-06-28 08:02:38 +02:00
|
|
|
return CS_Invalid;
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
return n->second->getState();
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::setPlayerName(u16 peer_id,std::string name)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientslock(m_clients_mutex);
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// The client may not exist; clients are immediately removed if their
|
|
|
|
// access is denied, and this event occurs later then.
|
2016-10-05 09:03:55 +02:00
|
|
|
if (n != m_clients.end())
|
2014-01-31 00:24:00 +01:00
|
|
|
n->second->setName(name);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::DeleteClient(u16 peer_id)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock conlock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
// Error check
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// The client may not exist; clients are immediately removed if their
|
|
|
|
// access is denied, and this event occurs later then.
|
2016-10-05 09:03:55 +02:00
|
|
|
if (n == m_clients.end())
|
2014-01-31 00:24:00 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Mark objects to be not known by the client
|
|
|
|
*/
|
|
|
|
//TODO this should be done by client destructor!!!
|
|
|
|
RemoteClient *client = n->second;
|
|
|
|
// Handle objects
|
|
|
|
for(std::set<u16>::iterator
|
|
|
|
i = client->m_known_objects.begin();
|
|
|
|
i != client->m_known_objects.end(); ++i)
|
|
|
|
{
|
|
|
|
// Get object
|
|
|
|
u16 id = *i;
|
|
|
|
ServerActiveObject* obj = m_env->getActiveObject(id);
|
|
|
|
|
|
|
|
if(obj && obj->m_known_by_count > 0)
|
|
|
|
obj->m_known_by_count--;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete client
|
|
|
|
delete m_clients[peer_id];
|
|
|
|
m_clients.erase(peer_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::CreateClient(u16 peer_id)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock conlock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
// Error check
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
// The client shouldn't already exist
|
2016-10-05 09:03:55 +02:00
|
|
|
if (n != m_clients.end()) return;
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
// Create client
|
|
|
|
RemoteClient *client = new RemoteClient();
|
|
|
|
client->peer_id = peer_id;
|
|
|
|
m_clients[client->peer_id] = client;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ClientInterface::event(u16 peer_id, ClientStateEvent event)
|
|
|
|
{
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock clientlock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
// Error check
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
// No client to deliver event
|
|
|
|
if (n == m_clients.end())
|
|
|
|
return;
|
|
|
|
n->second->notifyEvent(event);
|
|
|
|
}
|
|
|
|
|
2014-06-28 08:02:38 +02:00
|
|
|
if ((event == CSE_SetClientReady) ||
|
|
|
|
(event == CSE_Disconnect) ||
|
|
|
|
(event == CSE_SetDenied))
|
2014-01-31 00:24:00 +01:00
|
|
|
{
|
|
|
|
UpdatePlayerList();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
u16 ClientInterface::getProtocolVersion(u16 peer_id)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock conlock(m_clients_mutex);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
|
|
|
// Error check
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-01-31 00:24:00 +01:00
|
|
|
|
2014-02-13 20:17:42 +01:00
|
|
|
// No client to get version
|
2014-01-31 00:24:00 +01:00
|
|
|
if (n == m_clients.end())
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return n->second->net_proto_version;
|
|
|
|
}
|
2014-02-13 20:17:42 +01:00
|
|
|
|
|
|
|
void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch, std::string full)
|
|
|
|
{
|
2015-04-07 12:13:12 +02:00
|
|
|
MutexAutoLock conlock(m_clients_mutex);
|
2014-02-13 20:17:42 +01:00
|
|
|
|
|
|
|
// Error check
|
2016-10-05 09:03:55 +02:00
|
|
|
UNORDERED_MAP<u16, RemoteClient*>::iterator n = m_clients.find(peer_id);
|
2014-02-13 20:17:42 +01:00
|
|
|
|
|
|
|
// No client to set versions
|
|
|
|
if (n == m_clients.end())
|
|
|
|
return;
|
|
|
|
|
|
|
|
n->second->setVersionInfo(major,minor,patch,full);
|
|
|
|
}
|