2010-11-29 13:13:04 -05:00
|
|
|
/*
|
2013-02-24 12:40:43 -05:00
|
|
|
Minetest
|
2013-02-24 13:38:45 -05:00
|
|
|
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
|
2010-11-29 13:13:04 -05:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
2012-06-05 10:56:56 -04: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 13:13:04 -05: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 10:56:56 -04:00
|
|
|
GNU Lesser General Public License for more details.
|
2010-11-29 13:13:04 -05:00
|
|
|
|
2012-06-05 10:56:56 -04:00
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
2010-11-29 13:13:04 -05:00
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
#include <iostream>
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
#include <algorithm>
|
2014-09-11 18:22:05 -04:00
|
|
|
#include <sstream>
|
|
|
|
#include <IFileSystem.h>
|
2015-04-07 06:13:12 -04:00
|
|
|
#include "threading/mutex_auto_lock.h"
|
2015-04-11 22:49:13 -04:00
|
|
|
#include "util/auth.h"
|
2014-09-11 18:22:05 -04:00
|
|
|
#include "util/directiontables.h"
|
|
|
|
#include "util/pointedthing.h"
|
|
|
|
#include "util/serialize.h"
|
|
|
|
#include "util/string.h"
|
2015-04-11 22:49:13 -04:00
|
|
|
#include "util/srp.h"
|
2014-09-11 18:22:05 -04:00
|
|
|
#include "client.h"
|
2015-01-12 11:01:41 -05:00
|
|
|
#include "network/clientopcodes.h"
|
2013-08-10 22:09:45 -04:00
|
|
|
#include "filesys.h"
|
2010-12-21 20:33:58 -05:00
|
|
|
#include "porting.h"
|
2011-06-25 19:34:36 -04:00
|
|
|
#include "mapblock_mesh.h"
|
|
|
|
#include "mapblock.h"
|
2015-06-21 22:34:56 -04:00
|
|
|
#include "minimap.h"
|
2011-10-12 06:53:38 -04:00
|
|
|
#include "settings.h"
|
|
|
|
#include "profiler.h"
|
2013-05-11 10:02:41 -04:00
|
|
|
#include "gettext.h"
|
2011-10-16 07:57:53 -04:00
|
|
|
#include "log.h"
|
2011-11-13 05:54:33 -05:00
|
|
|
#include "nodemetadata.h"
|
2012-01-12 00:10:39 -05:00
|
|
|
#include "itemdef.h"
|
2012-03-18 21:59:12 -04:00
|
|
|
#include "shader.h"
|
2012-03-15 18:25:18 -04:00
|
|
|
#include "clientmap.h"
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
#include "clientmedia.h"
|
2012-03-23 06:05:17 -04:00
|
|
|
#include "sound.h"
|
2012-10-24 15:10:05 -04:00
|
|
|
#include "IMeshCache.h"
|
2012-12-14 06:30:17 -05:00
|
|
|
#include "config.h"
|
2013-11-05 07:57:43 -05:00
|
|
|
#include "version.h"
|
2014-04-27 10:09:21 -04:00
|
|
|
#include "drawscene.h"
|
2014-10-09 08:02:02 -04:00
|
|
|
#include "database-sqlite3.h"
|
2014-11-16 15:31:57 -05:00
|
|
|
#include "serialization.h"
|
2015-03-09 09:32:11 -04:00
|
|
|
#include "guiscalingfilter.h"
|
2014-04-27 10:09:21 -04:00
|
|
|
|
|
|
|
extern gui::IGUIEnvironment* guienv;
|
2012-12-14 06:30:17 -05:00
|
|
|
|
2011-06-25 19:34:36 -04:00
|
|
|
/*
|
|
|
|
QueuedMeshUpdate
|
|
|
|
*/
|
|
|
|
|
|
|
|
QueuedMeshUpdate::QueuedMeshUpdate():
|
|
|
|
p(-1337,-1337,-1337),
|
|
|
|
data(NULL),
|
|
|
|
ack_block_to_server(false)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
QueuedMeshUpdate::~QueuedMeshUpdate()
|
|
|
|
{
|
|
|
|
if(data)
|
|
|
|
delete data;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
MeshUpdateQueue
|
|
|
|
*/
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2011-06-25 19:34:36 -04:00
|
|
|
MeshUpdateQueue::MeshUpdateQueue()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
MeshUpdateQueue::~MeshUpdateQueue()
|
|
|
|
{
|
2015-04-07 06:13:12 -04:00
|
|
|
MutexAutoLock lock(m_mutex);
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
for(std::vector<QueuedMeshUpdate*>::iterator
|
|
|
|
i = m_queue.begin();
|
2015-08-25 16:23:05 -04:00
|
|
|
i != m_queue.end(); ++i)
|
2011-06-25 19:34:36 -04:00
|
|
|
{
|
|
|
|
QueuedMeshUpdate *q = *i;
|
|
|
|
delete q;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
peer_id=0 adds with nobody to send to
|
|
|
|
*/
|
2012-03-13 13:56:12 -04:00
|
|
|
void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent)
|
2011-06-25 19:34:36 -04:00
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2015-03-06 05:21:51 -05:00
|
|
|
assert(data); // pre-condition
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2015-04-07 06:13:12 -04:00
|
|
|
MutexAutoLock lock(m_mutex);
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
if(urgent)
|
|
|
|
m_urgents.insert(p);
|
|
|
|
|
2011-06-25 19:34:36 -04:00
|
|
|
/*
|
|
|
|
Find if block is already in queue.
|
|
|
|
If it is, update the data and quit.
|
|
|
|
*/
|
2012-03-13 13:56:12 -04:00
|
|
|
for(std::vector<QueuedMeshUpdate*>::iterator
|
|
|
|
i = m_queue.begin();
|
2015-08-25 16:23:05 -04:00
|
|
|
i != m_queue.end(); ++i)
|
2011-06-25 19:34:36 -04:00
|
|
|
{
|
|
|
|
QueuedMeshUpdate *q = *i;
|
|
|
|
if(q->p == p)
|
|
|
|
{
|
|
|
|
if(q->data)
|
|
|
|
delete q->data;
|
|
|
|
q->data = data;
|
|
|
|
if(ack_block_to_server)
|
|
|
|
q->ack_block_to_server = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2011-06-25 19:34:36 -04:00
|
|
|
/*
|
|
|
|
Add the block
|
|
|
|
*/
|
|
|
|
QueuedMeshUpdate *q = new QueuedMeshUpdate;
|
|
|
|
q->p = p;
|
|
|
|
q->data = data;
|
|
|
|
q->ack_block_to_server = ack_block_to_server;
|
|
|
|
m_queue.push_back(q);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returned pointer must be deleted
|
|
|
|
// Returns NULL if queue is empty
|
2015-06-29 05:06:03 -04:00
|
|
|
QueuedMeshUpdate *MeshUpdateQueue::pop()
|
2011-06-25 19:34:36 -04:00
|
|
|
{
|
2015-04-07 06:13:12 -04:00
|
|
|
MutexAutoLock lock(m_mutex);
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
bool must_be_urgent = !m_urgents.empty();
|
|
|
|
for(std::vector<QueuedMeshUpdate*>::iterator
|
|
|
|
i = m_queue.begin();
|
2015-08-25 16:23:05 -04:00
|
|
|
i != m_queue.end(); ++i)
|
2012-03-13 13:56:12 -04:00
|
|
|
{
|
|
|
|
QueuedMeshUpdate *q = *i;
|
|
|
|
if(must_be_urgent && m_urgents.count(q->p) == 0)
|
|
|
|
continue;
|
|
|
|
m_queue.erase(i);
|
|
|
|
m_urgents.erase(q->p);
|
|
|
|
return q;
|
|
|
|
}
|
|
|
|
return NULL;
|
2011-06-25 19:34:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
MeshUpdateThread
|
|
|
|
*/
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2015-06-29 05:06:03 -04:00
|
|
|
void MeshUpdateThread::enqueueUpdate(v3s16 p, MeshMakeData *data,
|
|
|
|
bool ack_block_to_server, bool urgent)
|
2010-11-26 18:02:21 -05:00
|
|
|
{
|
2015-06-29 05:06:03 -04:00
|
|
|
m_queue_in.addBlock(p, data, ack_block_to_server, urgent);
|
|
|
|
deferUpdate();
|
|
|
|
}
|
2014-04-05 09:27:33 -04:00
|
|
|
|
2015-06-29 05:06:03 -04:00
|
|
|
void MeshUpdateThread::doUpdate()
|
|
|
|
{
|
|
|
|
QueuedMeshUpdate *q;
|
|
|
|
while ((q = m_queue_in.pop())) {
|
2011-04-03 19:05:12 -04:00
|
|
|
|
2011-10-18 19:17:23 -04:00
|
|
|
ScopeProfiler sp(g_profiler, "Client: Mesh making");
|
2011-06-18 15:31:24 -04:00
|
|
|
|
2014-01-26 05:40:21 -05:00
|
|
|
MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset);
|
2011-04-03 19:05:12 -04:00
|
|
|
|
|
|
|
MeshUpdateResult r;
|
|
|
|
r.p = q->p;
|
|
|
|
r.mesh = mesh_new;
|
|
|
|
r.ack_block_to_server = q->ack_block_to_server;
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2011-04-03 19:05:12 -04:00
|
|
|
m_queue_out.push_back(r);
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2011-04-03 19:05:12 -04:00
|
|
|
delete q;
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
/*
|
|
|
|
Client
|
|
|
|
*/
|
2012-12-14 06:30:17 -05:00
|
|
|
|
2010-12-19 12:11:05 -05:00
|
|
|
Client::Client(
|
|
|
|
IrrlichtDevice *device,
|
|
|
|
const char *playername,
|
2011-05-20 15:28:03 -04:00
|
|
|
std::string password,
|
2011-11-13 17:19:48 -05:00
|
|
|
MapDrawControl &control,
|
2011-11-14 14:41:30 -05:00
|
|
|
IWritableTextureSource *tsrc,
|
2012-03-18 21:59:12 -04:00
|
|
|
IWritableShaderSource *shsrc,
|
2012-01-12 00:10:39 -05:00
|
|
|
IWritableItemDefManager *itemdef,
|
2012-03-23 09:29:30 -04:00
|
|
|
IWritableNodeDefManager *nodedef,
|
2012-03-23 14:23:03 -04:00
|
|
|
ISoundManager *sound,
|
2013-06-23 03:31:22 -04:00
|
|
|
MtEventManager *event,
|
|
|
|
bool ipv6
|
2011-11-14 14:41:30 -05:00
|
|
|
):
|
2014-05-01 18:18:25 -04:00
|
|
|
m_packetcounter_timer(0.0),
|
|
|
|
m_connection_reinit_timer(0.1),
|
|
|
|
m_avg_rtt_timer(0.0),
|
|
|
|
m_playerpos_send_timer(0.0),
|
|
|
|
m_ignore_damage_timer(0.0),
|
2011-11-13 17:19:48 -05:00
|
|
|
m_tsrc(tsrc),
|
2012-03-18 21:59:12 -04:00
|
|
|
m_shsrc(shsrc),
|
2012-01-12 00:10:39 -05:00
|
|
|
m_itemdef(itemdef),
|
2011-11-14 14:41:30 -05:00
|
|
|
m_nodedef(nodedef),
|
2012-03-23 09:29:30 -04:00
|
|
|
m_sound(sound),
|
2012-03-23 14:23:03 -04:00
|
|
|
m_event(event),
|
2015-06-29 05:06:03 -04:00
|
|
|
m_mesh_update_thread(),
|
2011-02-20 17:45:14 -05:00
|
|
|
m_env(
|
2011-11-13 17:19:48 -05:00
|
|
|
new ClientMap(this, this, control,
|
2010-11-26 18:02:21 -05:00
|
|
|
device->getSceneManager()->getRootSceneNode(),
|
|
|
|
device->getSceneManager(), 666),
|
2011-11-13 17:19:48 -05:00
|
|
|
device->getSceneManager(),
|
2011-12-01 11:23:58 -05:00
|
|
|
tsrc, this, device
|
2011-02-20 17:45:14 -05:00
|
|
|
),
|
2015-01-05 12:34:59 -05:00
|
|
|
m_particle_manager(&m_env),
|
2013-06-23 03:31:22 -04:00
|
|
|
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
|
2010-11-26 18:02:21 -05:00
|
|
|
m_device(device),
|
2016-02-15 08:01:01 -05:00
|
|
|
m_camera(NULL),
|
2015-08-31 21:07:02 -04:00
|
|
|
m_minimap_disabled_by_server(false),
|
2010-11-26 18:02:21 -05:00
|
|
|
m_server_ser_ver(SER_FMT_VER_INVALID),
|
2015-07-05 15:05:07 -04:00
|
|
|
m_proto_ver(0),
|
2011-11-29 10:15:18 -05:00
|
|
|
m_playeritem(0),
|
2010-12-18 10:46:00 -05:00
|
|
|
m_inventory_updated(false),
|
2012-01-21 18:49:02 -05:00
|
|
|
m_inventory_from_server(NULL),
|
|
|
|
m_inventory_from_server_age(0.0),
|
2012-03-13 13:56:12 -04:00
|
|
|
m_animation_time(0),
|
|
|
|
m_crack_level(-1),
|
|
|
|
m_crack_pos(0,0,0),
|
2011-05-20 15:28:03 -04:00
|
|
|
m_map_seed(0),
|
|
|
|
m_password(password),
|
2015-04-11 22:49:13 -04:00
|
|
|
m_chosen_auth_mech(AUTH_MECHANISM_NONE),
|
|
|
|
m_auth_data(NULL),
|
2011-11-15 16:58:56 -05:00
|
|
|
m_access_denied(false),
|
2015-07-17 10:40:41 -04:00
|
|
|
m_access_denied_reconnect(false),
|
2012-01-12 00:10:39 -05:00
|
|
|
m_itemdef_received(false),
|
2012-03-16 10:34:30 -04:00
|
|
|
m_nodedef_received(false),
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
m_media_downloader(new ClientMediaDownloader()),
|
2012-03-16 10:34:30 -04:00
|
|
|
m_time_of_day_set(false),
|
|
|
|
m_last_time_of_day_f(-1),
|
2012-03-24 13:01:26 -04:00
|
|
|
m_time_of_day_update_timer(0),
|
2012-11-26 15:31:21 -05:00
|
|
|
m_recommended_send_interval(0.1),
|
2014-02-13 14:17:42 -05:00
|
|
|
m_removed_sounds_check_timer(0),
|
2014-11-16 15:31:57 -05:00
|
|
|
m_state(LC_Created),
|
|
|
|
m_localdb(NULL)
|
2010-11-26 18:02:21 -05:00
|
|
|
{
|
2014-11-16 15:31:57 -05:00
|
|
|
// Add local player
|
|
|
|
m_env.addPlayer(new LocalPlayer(this, playername));
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2015-06-21 22:34:56 -04:00
|
|
|
m_mapper = new Mapper(device, this);
|
2014-11-16 15:31:57 -05:00
|
|
|
m_cache_save_interval = g_settings->getU16("server_map_save_interval");
|
2014-10-09 08:02:02 -04:00
|
|
|
|
2014-12-06 09:37:37 -05:00
|
|
|
m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
|
2015-02-11 02:45:49 -05:00
|
|
|
m_cache_enable_shaders = g_settings->getBool("enable_shaders");
|
2016-02-12 06:25:20 -05:00
|
|
|
m_cache_use_tangent_vertices = m_cache_enable_shaders && (
|
2016-04-10 23:51:36 -04:00
|
|
|
g_settings->getBool("enable_bumpmapping") ||
|
2016-02-12 06:25:20 -05:00
|
|
|
g_settings->getBool("enable_parallax_occlusion"));
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
2014-01-06 06:45:42 -05:00
|
|
|
void Client::Stop()
|
|
|
|
{
|
|
|
|
//request all client managed threads to stop
|
2015-04-07 06:13:12 -04:00
|
|
|
m_mesh_update_thread.stop();
|
2014-11-16 15:31:57 -05:00
|
|
|
// Save local server map
|
|
|
|
if (m_localdb) {
|
|
|
|
infostream << "Local map saving ended." << std::endl;
|
|
|
|
m_localdb->endSave();
|
2014-10-09 08:02:02 -04:00
|
|
|
}
|
2014-01-06 06:45:42 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
bool Client::isShutdown()
|
|
|
|
{
|
|
|
|
|
2015-04-07 06:13:12 -04:00
|
|
|
if (!m_mesh_update_thread.isRunning()) return true;
|
2014-01-06 06:45:42 -05:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
Client::~Client()
|
|
|
|
{
|
2014-02-04 18:17:57 -05:00
|
|
|
m_con.Disconnect();
|
2010-12-24 10:08:50 -05:00
|
|
|
|
2015-04-07 06:13:12 -04:00
|
|
|
m_mesh_update_thread.stop();
|
|
|
|
m_mesh_update_thread.wait();
|
2015-08-01 19:31:57 -04:00
|
|
|
while (!m_mesh_update_thread.m_queue_out.empty()) {
|
2014-01-06 06:45:42 -05:00
|
|
|
MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
|
2013-05-17 19:52:18 -04:00
|
|
|
delete r.mesh;
|
|
|
|
}
|
|
|
|
|
2012-01-21 18:49:02 -05:00
|
|
|
|
|
|
|
delete m_inventory_from_server;
|
2012-07-24 13:57:17 -04:00
|
|
|
|
|
|
|
// Delete detached inventories
|
2016-10-05 03:03:55 -04:00
|
|
|
for (UNORDERED_MAP<std::string, Inventory*>::iterator
|
2014-02-04 18:17:57 -05:00
|
|
|
i = m_detached_inventories.begin();
|
2015-08-01 19:31:57 -04:00
|
|
|
i != m_detached_inventories.end(); ++i) {
|
2014-02-04 18:17:57 -05:00
|
|
|
delete i->second;
|
2012-07-24 13:57:17 -04:00
|
|
|
}
|
2012-12-17 11:56:59 -05:00
|
|
|
|
2013-04-07 14:13:21 -04:00
|
|
|
// cleanup 3d model meshes on client shutdown
|
|
|
|
while (m_device->getSceneManager()->getMeshCache()->getMeshCount() != 0) {
|
2015-08-01 19:31:57 -04:00
|
|
|
scene::IAnimatedMesh *mesh =
|
2013-04-07 14:13:21 -04:00
|
|
|
m_device->getSceneManager()->getMeshCache()->getMeshByIndex(0);
|
|
|
|
|
|
|
|
if (mesh != NULL)
|
|
|
|
m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
|
|
|
|
}
|
2015-08-01 19:31:57 -04:00
|
|
|
|
|
|
|
delete m_mapper;
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
2015-01-30 09:33:23 -05:00
|
|
|
void Client::connect(Address address,
|
|
|
|
const std::string &address_name,
|
|
|
|
bool is_local_server)
|
2010-11-26 18:02:21 -05:00
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2015-01-30 09:33:23 -05:00
|
|
|
|
|
|
|
initLocalMapSaving(address, address_name, is_local_server);
|
|
|
|
|
2011-10-20 16:04:09 -04:00
|
|
|
m_con.SetTimeoutMs(0);
|
2010-11-26 18:02:21 -05:00
|
|
|
m_con.Connect(address);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::step(float dtime)
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2014-05-01 18:18:25 -04:00
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
// Limit a bit
|
|
|
|
if(dtime > 2.0)
|
|
|
|
dtime = 2.0;
|
2014-05-01 18:18:25 -04:00
|
|
|
|
2011-04-21 12:35:17 -04:00
|
|
|
if(m_ignore_damage_timer > dtime)
|
|
|
|
m_ignore_damage_timer -= dtime;
|
|
|
|
else
|
|
|
|
m_ignore_damage_timer = 0.0;
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
m_animation_time += dtime;
|
|
|
|
if(m_animation_time > 60.0)
|
|
|
|
m_animation_time -= 60.0;
|
|
|
|
|
2012-03-16 10:34:30 -04:00
|
|
|
m_time_of_day_update_timer += dtime;
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2014-02-04 18:17:57 -05:00
|
|
|
ReceiveAll();
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2010-11-27 10:18:34 -05:00
|
|
|
/*
|
|
|
|
Packet counter
|
|
|
|
*/
|
|
|
|
{
|
2010-12-19 09:51:45 -05:00
|
|
|
float &counter = m_packetcounter_timer;
|
2010-11-27 10:18:34 -05:00
|
|
|
counter -= dtime;
|
|
|
|
if(counter <= 0.0)
|
|
|
|
{
|
2010-11-29 05:16:17 -05:00
|
|
|
counter = 20.0;
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2014-05-01 18:18:25 -04:00
|
|
|
infostream << "Client packetcounter (" << m_packetcounter_timer
|
|
|
|
<< "):"<<std::endl;
|
2011-10-16 07:57:53 -04:00
|
|
|
m_packetcounter.print(infostream);
|
2010-11-27 10:18:34 -05:00
|
|
|
m_packetcounter.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-01 18:18:25 -04:00
|
|
|
// UGLY hack to fix 2 second startup delay caused by non existent
|
|
|
|
// server client startup synchronization in local server or singleplayer mode
|
|
|
|
static bool initial_step = true;
|
|
|
|
if (initial_step) {
|
|
|
|
initial_step = false;
|
|
|
|
}
|
[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 05:37:49 -05:00
|
|
|
else if(m_state == LC_Created) {
|
2010-12-19 09:51:45 -05:00
|
|
|
float &counter = m_connection_reinit_timer;
|
2010-11-26 18:02:21 -05:00
|
|
|
counter -= 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 05:37:49 -05:00
|
|
|
if(counter <= 0.0) {
|
2010-11-26 18:02:21 -05:00
|
|
|
counter = 2.0;
|
|
|
|
|
2015-04-16 04:12:26 -04:00
|
|
|
Player *myplayer = m_env.getLocalPlayer();
|
2015-03-06 05:21:51 -05:00
|
|
|
FATAL_ERROR_IF(myplayer == NULL, "Local player not found in environment.");
|
|
|
|
|
2016-03-14 05:18:29 -04:00
|
|
|
u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
|
|
|
|
CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
|
|
|
|
|
|
|
|
if (proto_version_min < 25) {
|
|
|
|
// Send TOSERVER_INIT_LEGACY
|
|
|
|
// [0] u16 TOSERVER_INIT_LEGACY
|
|
|
|
// [2] u8 SER_FMT_VER_HIGHEST_READ
|
|
|
|
// [3] u8[20] player_name
|
|
|
|
// [23] u8[28] password (new in some version)
|
|
|
|
// [51] u16 minimum supported network protocol version (added sometime)
|
|
|
|
// [53] u16 maximum supported network protocol version (added later than the previous one)
|
|
|
|
|
|
|
|
char pName[PLAYERNAME_SIZE];
|
|
|
|
char pPassword[PASSWORD_SIZE];
|
|
|
|
memset(pName, 0, PLAYERNAME_SIZE * sizeof(char));
|
|
|
|
memset(pPassword, 0, PASSWORD_SIZE * sizeof(char));
|
|
|
|
|
|
|
|
std::string hashed_password = translate_password(myplayer->getName(), m_password);
|
|
|
|
snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName());
|
|
|
|
snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str());
|
|
|
|
|
|
|
|
sendLegacyInit(pName, pPassword);
|
|
|
|
}
|
|
|
|
if (CLIENT_PROTOCOL_VERSION_MAX >= 25)
|
2015-04-11 22:49:13 -04:00
|
|
|
sendInit(myplayer->getName());
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Not connected, return
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Do stuff if connected
|
|
|
|
*/
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2011-06-26 17:27:17 -04:00
|
|
|
/*
|
|
|
|
Run Map's timers and unload unused data
|
|
|
|
*/
|
|
|
|
const float map_timer_and_unload_dtime = 5.25;
|
[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 05:37:49 -05:00
|
|
|
if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) {
|
2011-10-12 06:53:38 -04:00
|
|
|
ScopeProfiler sp(g_profiler, "Client: map timer and unload");
|
2015-02-17 09:04:08 -05:00
|
|
|
std::vector<v3s16> deleted_blocks;
|
2011-06-26 17:27:17 -04:00
|
|
|
m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
|
2015-08-10 16:24:47 -04:00
|
|
|
g_settings->getFloat("client_unload_unused_data_timeout"),
|
|
|
|
g_settings->getS32("client_mapblock_limit"),
|
|
|
|
&deleted_blocks);
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2011-06-26 17:27:17 -04:00
|
|
|
/*
|
|
|
|
Send info to server
|
|
|
|
NOTE: This loop is intentionally iterated the way it is.
|
|
|
|
*/
|
|
|
|
|
2015-02-17 09:04:08 -05:00
|
|
|
std::vector<v3s16>::iterator i = deleted_blocks.begin();
|
|
|
|
std::vector<v3s16> sendlist;
|
[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 05:37:49 -05:00
|
|
|
for(;;) {
|
|
|
|
if(sendlist.size() == 255 || i == deleted_blocks.end()) {
|
2014-12-12 09:55:40 -05:00
|
|
|
if(sendlist.empty())
|
2011-06-26 17:27:17 -04:00
|
|
|
break;
|
|
|
|
/*
|
|
|
|
[0] u16 command
|
|
|
|
[2] u8 count
|
|
|
|
[3] v3s16 pos_0
|
|
|
|
[3+6] v3s16 pos_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 05:37:49 -05:00
|
|
|
|
2015-03-16 07:39:27 -04:00
|
|
|
sendDeletedBlocks(sendlist);
|
2011-06-26 17:27:17 -04:00
|
|
|
|
|
|
|
if(i == deleted_blocks.end())
|
|
|
|
break;
|
|
|
|
|
|
|
|
sendlist.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
sendlist.push_back(*i);
|
2012-12-20 12:19:49 -05:00
|
|
|
++i;
|
2011-06-26 17:27:17 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-21 12:35:17 -04:00
|
|
|
/*
|
|
|
|
Handle environment
|
|
|
|
*/
|
[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 05:37:49 -05:00
|
|
|
// Control local player (0ms)
|
|
|
|
LocalPlayer *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
|
|
|
player->applyControl(dtime);
|
2015-01-04 16:32:31 -05: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 05:37:49 -05:00
|
|
|
// Step environment
|
|
|
|
m_env.step(dtime);
|
2011-04-21 12:35:17 -04: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 05:37:49 -05:00
|
|
|
/*
|
|
|
|
Get events
|
|
|
|
*/
|
|
|
|
for(;;) {
|
|
|
|
ClientEnvEvent event = m_env.getClientEvent();
|
|
|
|
if(event.type == CEE_NONE) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if(event.type == CEE_PLAYER_DAMAGE) {
|
|
|
|
if(m_ignore_damage_timer <= 0) {
|
|
|
|
u8 damage = event.player_damage.amount;
|
|
|
|
|
|
|
|
if(event.player_damage.send_to_server)
|
|
|
|
sendDamage(damage);
|
|
|
|
|
|
|
|
// Add to ClientEvent queue
|
|
|
|
ClientEvent event;
|
|
|
|
event.type = CE_PLAYER_DAMAGE;
|
|
|
|
event.player_damage.amount = damage;
|
2015-03-04 11:48:07 -05:00
|
|
|
m_client_event_queue.push(event);
|
2013-07-19 13:50:33 -04:00
|
|
|
}
|
2011-04-21 12:35:17 -04: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 05:37:49 -05:00
|
|
|
else if(event.type == CEE_PLAYER_BREATH) {
|
|
|
|
u16 breath = event.player_breath.amount;
|
|
|
|
sendBreath(breath);
|
|
|
|
}
|
2011-04-21 12:35:17 -04:00
|
|
|
}
|
2013-07-19 13:50:33 -04:00
|
|
|
|
2011-04-21 12:35:17 -04:00
|
|
|
/*
|
|
|
|
Print some info
|
|
|
|
*/
|
[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 05:37:49 -05:00
|
|
|
float &counter = m_avg_rtt_timer;
|
|
|
|
counter += dtime;
|
|
|
|
if(counter >= 10) {
|
|
|
|
counter = 0.0;
|
|
|
|
// connectedAndInitialized() is true, peer exists.
|
|
|
|
float avg_rtt = getRTT();
|
|
|
|
infostream << "Client: avg_rtt=" << avg_rtt << std::endl;
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
2011-04-21 12:35:17 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
Send player position to server
|
|
|
|
*/
|
2010-11-26 18:02:21 -05:00
|
|
|
{
|
2010-12-19 09:51:45 -05:00
|
|
|
float &counter = m_playerpos_send_timer;
|
2010-11-26 18:02:21 -05:00
|
|
|
counter += dtime;
|
2014-02-13 14:17:42 -05:00
|
|
|
if((m_state == LC_Ready) && (counter >= m_recommended_send_interval))
|
2010-11-26 18:02:21 -05:00
|
|
|
{
|
|
|
|
counter = 0.0;
|
|
|
|
sendPlayerPos();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-03 19:05:12 -04:00
|
|
|
/*
|
|
|
|
Replace updated meshes
|
|
|
|
*/
|
2010-11-26 18:02:21 -05:00
|
|
|
{
|
2012-03-20 21:33:02 -04:00
|
|
|
int num_processed_meshes = 0;
|
2015-06-21 22:34:56 -04:00
|
|
|
while (!m_mesh_update_thread.m_queue_out.empty())
|
2011-04-03 19:05:12 -04:00
|
|
|
{
|
2012-03-20 21:33:02 -04:00
|
|
|
num_processed_meshes++;
|
2015-07-08 00:45:24 -04:00
|
|
|
|
|
|
|
MinimapMapblock *minimap_mapblock = NULL;
|
|
|
|
bool do_mapper_update = true;
|
|
|
|
|
2014-01-06 06:45:42 -05:00
|
|
|
MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
|
2011-04-03 19:05:12 -04:00
|
|
|
MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
|
2015-06-21 22:34:56 -04:00
|
|
|
if (block) {
|
2012-03-13 13:56:12 -04:00
|
|
|
// Delete the old mesh
|
2015-07-08 00:45:24 -04:00
|
|
|
if (block->mesh != NULL) {
|
2012-03-13 13:56:12 -04:00
|
|
|
delete block->mesh;
|
|
|
|
block->mesh = NULL;
|
|
|
|
}
|
|
|
|
|
2015-07-08 00:45:24 -04:00
|
|
|
if (r.mesh) {
|
2015-07-18 19:35:47 -04:00
|
|
|
minimap_mapblock = r.mesh->moveMinimapMapblock();
|
|
|
|
if (minimap_mapblock == NULL)
|
|
|
|
do_mapper_update = false;
|
2015-07-08 00:45:24 -04:00
|
|
|
}
|
2015-06-21 22:34:56 -04:00
|
|
|
|
|
|
|
if (r.mesh && r.mesh->getMesh()->getMeshBufferCount() == 0) {
|
|
|
|
delete r.mesh;
|
|
|
|
} else {
|
|
|
|
// Replace with the new mesh
|
|
|
|
block->mesh = r.mesh;
|
|
|
|
}
|
2013-05-17 19:52:18 -04:00
|
|
|
} else {
|
|
|
|
delete r.mesh;
|
2011-04-03 19:05:12 -04: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 05:37:49 -05:00
|
|
|
|
2015-07-08 00:45:24 -04:00
|
|
|
if (do_mapper_update)
|
|
|
|
m_mapper->addBlock(r.p, minimap_mapblock);
|
2015-06-21 22:34:56 -04:00
|
|
|
|
|
|
|
if (r.ack_block_to_server) {
|
2011-04-03 19:05:12 -04:00
|
|
|
/*
|
|
|
|
Acknowledge block
|
[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 05:37:49 -05:00
|
|
|
[0] u8 count
|
|
|
|
[1] v3s16 pos_0
|
2011-04-03 19:05:12 -04:00
|
|
|
*/
|
2015-03-16 07:39:27 -04:00
|
|
|
sendGotBlocks(r.p);
|
2011-04-03 19:05:12 -04: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 05:37:49 -05:00
|
|
|
|
2015-06-21 22:34:56 -04:00
|
|
|
if (num_processed_meshes > 0)
|
2012-03-20 21:33:02 -04:00
|
|
|
g_profiler->graphAdd("num_processed_meshes", num_processed_meshes);
|
2011-04-03 19:05:12 -04:00
|
|
|
}
|
2012-01-21 18:49:02 -05:00
|
|
|
|
2012-12-14 06:30:17 -05:00
|
|
|
/*
|
|
|
|
Load fetched media
|
|
|
|
*/
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
if (m_media_downloader && m_media_downloader->isStarted()) {
|
|
|
|
m_media_downloader->step(this);
|
|
|
|
if (m_media_downloader->isDone()) {
|
2014-01-30 18:24:00 -05:00
|
|
|
received_media();
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
delete m_media_downloader;
|
|
|
|
m_media_downloader = NULL;
|
2012-12-14 06:30:17 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-21 18:49:02 -05:00
|
|
|
/*
|
|
|
|
If the server didn't update the inventory in a while, revert
|
|
|
|
the local inventory (so the player notices the lag problem
|
|
|
|
and knows something is wrong).
|
|
|
|
*/
|
|
|
|
if(m_inventory_from_server)
|
|
|
|
{
|
|
|
|
float interval = 10.0;
|
|
|
|
float count_before = floor(m_inventory_from_server_age / interval);
|
|
|
|
|
|
|
|
m_inventory_from_server_age += dtime;
|
|
|
|
|
|
|
|
float count_after = floor(m_inventory_from_server_age / interval);
|
|
|
|
|
|
|
|
if(count_after != count_before)
|
|
|
|
{
|
|
|
|
// Do this every <interval> seconds after TOCLIENT_INVENTORY
|
|
|
|
// Reset the locally changed inventory to the authoritative inventory
|
|
|
|
Player *player = m_env.getLocalPlayer();
|
|
|
|
player->inventory = *m_inventory_from_server;
|
|
|
|
m_inventory_updated = true;
|
|
|
|
}
|
|
|
|
}
|
2012-03-24 13:01:26 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
Update positions of sounds attached to objects
|
|
|
|
*/
|
|
|
|
{
|
2016-10-06 02:48:20 -04:00
|
|
|
for(UNORDERED_MAP<int, u16>::iterator i = m_sounds_to_objects.begin();
|
|
|
|
i != m_sounds_to_objects.end(); ++i) {
|
2012-03-24 13:01:26 -04:00
|
|
|
int client_id = i->first;
|
|
|
|
u16 object_id = i->second;
|
|
|
|
ClientActiveObject *cao = m_env.getActiveObject(object_id);
|
|
|
|
if(!cao)
|
|
|
|
continue;
|
|
|
|
v3f pos = cao->getPosition();
|
|
|
|
m_sound->updateSoundPosition(client_id, pos);
|
|
|
|
}
|
|
|
|
}
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2012-03-24 13:01:26 -04:00
|
|
|
/*
|
|
|
|
Handle removed remotely initiated sounds
|
|
|
|
*/
|
|
|
|
m_removed_sounds_check_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 05:37:49 -05:00
|
|
|
if(m_removed_sounds_check_timer >= 2.32) {
|
2012-03-24 13:01:26 -04:00
|
|
|
m_removed_sounds_check_timer = 0;
|
|
|
|
// Find removed sounds and clear references to them
|
2015-03-16 07:39:27 -04:00
|
|
|
std::vector<s32> removed_server_ids;
|
2016-10-06 02:48:20 -04:00
|
|
|
for(UNORDERED_MAP<s32, int>::iterator i = m_sounds_server_to_client.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 05:37:49 -05:00
|
|
|
i != m_sounds_server_to_client.end();) {
|
2012-03-24 13:01:26 -04:00
|
|
|
s32 server_id = i->first;
|
|
|
|
int client_id = i->second;
|
2015-08-25 16:23:05 -04:00
|
|
|
++i;
|
[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 05:37:49 -05:00
|
|
|
if(!m_sound->soundExists(client_id)) {
|
2012-03-24 13:01:26 -04:00
|
|
|
m_sounds_server_to_client.erase(server_id);
|
|
|
|
m_sounds_client_to_server.erase(client_id);
|
|
|
|
m_sounds_to_objects.erase(client_id);
|
2015-03-16 07:39:27 -04:00
|
|
|
removed_server_ids.push_back(server_id);
|
2012-03-24 13:01:26 -04: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 05:37:49 -05:00
|
|
|
|
2012-03-24 13:01:26 -04:00
|
|
|
// Sync to 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 05:37:49 -05:00
|
|
|
if(!removed_server_ids.empty()) {
|
2015-03-16 07:39:27 -04:00
|
|
|
sendRemovedSounds(removed_server_ids);
|
2012-03-24 13:01:26 -04:00
|
|
|
}
|
|
|
|
}
|
2014-11-16 15:31:57 -05:00
|
|
|
|
|
|
|
// Write server map
|
|
|
|
if (m_localdb && m_localdb_save_interval.step(dtime,
|
|
|
|
m_cache_save_interval)) {
|
|
|
|
m_localdb->endSave();
|
|
|
|
m_localdb->beginSave();
|
|
|
|
}
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
2012-03-25 07:47:51 -04:00
|
|
|
bool Client::loadMedia(const std::string &data, const std::string &filename)
|
|
|
|
{
|
|
|
|
// Silly irrlicht's const-incorrectness
|
|
|
|
Buffer<char> data_rw(data.c_str(), data.size());
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2012-03-25 07:47:51 -04:00
|
|
|
std::string name;
|
|
|
|
|
|
|
|
const char *image_ext[] = {
|
|
|
|
".png", ".jpg", ".bmp", ".tga",
|
|
|
|
".pcx", ".ppm", ".psd", ".wal", ".rgb",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
name = removeStringEnd(filename, image_ext);
|
|
|
|
if(name != "")
|
|
|
|
{
|
2012-11-12 09:35:10 -05:00
|
|
|
verbosestream<<"Client: Attempting to load image "
|
|
|
|
<<"file \""<<filename<<"\""<<std::endl;
|
2012-03-25 07:47:51 -04:00
|
|
|
|
|
|
|
io::IFileSystem *irrfs = m_device->getFileSystem();
|
|
|
|
video::IVideoDriver *vdrv = m_device->getVideoDriver();
|
|
|
|
|
|
|
|
// Create an irrlicht memory file
|
|
|
|
io::IReadFile *rfile = irrfs->createMemoryReadFile(
|
|
|
|
*data_rw, data_rw.getSize(), "_tempreadfile");
|
2015-03-06 05:21:51 -05:00
|
|
|
|
|
|
|
FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file.");
|
|
|
|
|
2012-03-25 07:47:51 -04:00
|
|
|
// Read image
|
|
|
|
video::IImage *img = vdrv->createImageFromFile(rfile);
|
|
|
|
if(!img){
|
|
|
|
errorstream<<"Client: Cannot create image from data of "
|
|
|
|
<<"file \""<<filename<<"\""<<std::endl;
|
|
|
|
rfile->drop();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
m_tsrc->insertSourceImage(filename, img);
|
|
|
|
img->drop();
|
|
|
|
rfile->drop();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *sound_ext[] = {
|
2012-03-25 09:21:34 -04:00
|
|
|
".0.ogg", ".1.ogg", ".2.ogg", ".3.ogg", ".4.ogg",
|
|
|
|
".5.ogg", ".6.ogg", ".7.ogg", ".8.ogg", ".9.ogg",
|
2012-03-25 07:47:51 -04:00
|
|
|
".ogg", NULL
|
|
|
|
};
|
|
|
|
name = removeStringEnd(filename, sound_ext);
|
|
|
|
if(name != "")
|
|
|
|
{
|
2012-11-12 09:35:10 -05:00
|
|
|
verbosestream<<"Client: Attempting to load sound "
|
|
|
|
<<"file \""<<filename<<"\""<<std::endl;
|
2012-03-25 07:47:51 -04:00
|
|
|
m_sound->loadSoundData(name, data);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-10-23 17:11:24 -04:00
|
|
|
const char *model_ext[] = {
|
2012-10-24 15:10:05 -04:00
|
|
|
".x", ".b3d", ".md2", ".obj",
|
2012-10-23 17:11:24 -04:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
name = removeStringEnd(filename, model_ext);
|
|
|
|
if(name != "")
|
|
|
|
{
|
2014-01-06 06:24:06 -05:00
|
|
|
verbosestream<<"Client: Storing model into memory: "
|
2012-10-24 15:10:05 -04:00
|
|
|
<<"\""<<filename<<"\""<<std::endl;
|
2014-01-06 06:24:06 -05:00
|
|
|
if(m_mesh_data.count(filename))
|
|
|
|
errorstream<<"Multiple models with name \""<<filename.c_str()
|
|
|
|
<<"\" found; replacing previous model"<<std::endl;
|
|
|
|
m_mesh_data[filename] = data;
|
2012-10-23 17:11:24 -04:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-03-25 07:47:51 -04:00
|
|
|
errorstream<<"Client: Don't know how to load file \""
|
|
|
|
<<filename<<"\""<<std::endl;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
// Virtual methods from con::PeerHandler
|
|
|
|
void Client::peerAdded(con::Peer *peer)
|
|
|
|
{
|
2015-07-17 02:51:07 -04:00
|
|
|
infostream << "Client::peerAdded(): peer->id="
|
|
|
|
<< peer->id << std::endl;
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
void Client::deletingPeer(con::Peer *peer, bool timeout)
|
|
|
|
{
|
2015-07-17 02:51:07 -04:00
|
|
|
infostream << "Client::deletingPeer(): "
|
2010-11-26 18:02:21 -05:00
|
|
|
"Server Peer is getting deleted "
|
2015-07-17 02:51:07 -04:00
|
|
|
<< "(timeout=" << timeout << ")" << std::endl;
|
|
|
|
|
|
|
|
if (timeout) {
|
|
|
|
m_access_denied = true;
|
|
|
|
m_access_denied_reason = gettext("Connection timed out.");
|
|
|
|
}
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
2012-12-14 06:30:17 -05:00
|
|
|
/*
|
|
|
|
u16 command
|
|
|
|
u16 number of files requested
|
|
|
|
for each file {
|
|
|
|
u16 length of name
|
|
|
|
string name
|
|
|
|
}
|
|
|
|
*/
|
2015-03-05 04:43:08 -05:00
|
|
|
void Client::request_media(const std::vector<std::string> &file_requests)
|
2012-12-14 06:30:17 -05:00
|
|
|
{
|
|
|
|
std::ostringstream os(std::ios_base::binary);
|
|
|
|
writeU16(os, TOSERVER_REQUEST_MEDIA);
|
2014-02-04 18:17:57 -05:00
|
|
|
size_t file_requests_size = file_requests.size();
|
2015-03-06 05:21:51 -05:00
|
|
|
|
|
|
|
FATAL_ERROR_IF(file_requests_size > 0xFFFF, "Unsupported number of file requests");
|
[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 05:37:49 -05:00
|
|
|
|
|
|
|
// Packet dynamicly resized
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_REQUEST_MEDIA, 2 + 0);
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << (u16) (file_requests_size & 0xFFFF);
|
2012-12-14 06:30:17 -05:00
|
|
|
|
2015-03-05 04:43:08 -05:00
|
|
|
for(std::vector<std::string>::const_iterator i = file_requests.begin();
|
2012-12-20 12:19:49 -05:00
|
|
|
i != file_requests.end(); ++i) {
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << (*i);
|
2012-12-14 06:30:17 -05:00
|
|
|
}
|
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
infostream << "Client: Sending media request list to server ("
|
|
|
|
<< file_requests.size() << " files. packet size)" << std::endl;
|
2012-12-14 06:30:17 -05:00
|
|
|
}
|
|
|
|
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
void Client::received_media()
|
|
|
|
{
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_RECEIVED_MEDIA, 0);
|
|
|
|
Send(&pkt);
|
|
|
|
infostream << "Client: Notifying server that we received all media"
|
|
|
|
<< std::endl;
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
}
|
|
|
|
|
2015-01-30 09:33:23 -05:00
|
|
|
void Client::initLocalMapSaving(const Address &address,
|
|
|
|
const std::string &hostname,
|
|
|
|
bool is_local_server)
|
|
|
|
{
|
2014-11-16 15:31:57 -05:00
|
|
|
if (!g_settings->getBool("enable_local_map_saving") || is_local_server) {
|
2015-01-30 09:33:23 -05:00
|
|
|
return;
|
2014-11-16 15:31:57 -05:00
|
|
|
}
|
2015-01-30 09:33:23 -05:00
|
|
|
|
|
|
|
const std::string world_path = porting::path_user
|
|
|
|
+ DIR_DELIM + "worlds"
|
|
|
|
+ DIR_DELIM + "server_"
|
2016-08-11 13:22:40 -04:00
|
|
|
+ hostname + "_" + std::to_string(address.getPort());
|
2015-01-30 09:33:23 -05:00
|
|
|
|
2014-11-16 15:31:57 -05:00
|
|
|
fs::CreateAllDirs(world_path);
|
2015-01-30 09:33:23 -05:00
|
|
|
|
2014-11-16 15:31:57 -05:00
|
|
|
m_localdb = new Database_SQLite3(world_path);
|
|
|
|
m_localdb->beginSave();
|
2015-01-30 09:33:23 -05:00
|
|
|
actionstream << "Local map saving started, map will be saved at '" << world_path << "'" << std::endl;
|
|
|
|
}
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
void Client::ReceiveAll()
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2011-11-15 16:58:56 -05:00
|
|
|
u32 start_ms = porting::getTimeMs();
|
2010-11-26 18:02:21 -05:00
|
|
|
for(;;)
|
|
|
|
{
|
2011-11-15 16:58:56 -05:00
|
|
|
// Limit time even if there would be huge amounts of data to
|
|
|
|
// process
|
|
|
|
if(porting::getTimeMs() > start_ms + 100)
|
|
|
|
break;
|
2015-01-04 16:32:31 -05: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 05:37:49 -05:00
|
|
|
try {
|
2010-11-26 18:02:21 -05:00
|
|
|
Receive();
|
2012-03-20 21:33:02 -04:00
|
|
|
g_profiler->graphAdd("client_received_packets", 1);
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
catch(con::NoIncomingDataException &e) {
|
2010-11-26 18:02:21 -05:00
|
|
|
break;
|
|
|
|
}
|
[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 05:37:49 -05:00
|
|
|
catch(con::InvalidIncomingDataException &e) {
|
2011-10-16 07:57:53 -04:00
|
|
|
infostream<<"Client::ReceiveAll(): "
|
2010-11-26 18:02:21 -05:00
|
|
|
"InvalidIncomingDataException: what()="
|
|
|
|
<<e.what()<<std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::Receive()
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2015-03-31 04:35:51 -04:00
|
|
|
NetworkPacket pkt;
|
|
|
|
m_con.Receive(&pkt);
|
|
|
|
ProcessData(&pkt);
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
inline void Client::handleCommand(NetworkPacket* pkt)
|
2015-01-12 11:01:41 -05:00
|
|
|
{
|
|
|
|
const ToClientCommandHandler& opHandle = toClientCommandTable[pkt->getCommand()];
|
|
|
|
(this->*opHandle.handler)(pkt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
sender_peer_id given to this shall be quaranteed to be a valid peer
|
|
|
|
*/
|
2015-03-31 04:35:51 -04:00
|
|
|
void Client::ProcessData(NetworkPacket *pkt)
|
2015-01-12 11:01:41 -05:00
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2015-01-12 11:01:41 -05:00
|
|
|
|
2015-03-31 04:35:51 -04:00
|
|
|
ToClientCommand command = (ToClientCommand) pkt->getCommand();
|
|
|
|
u32 sender_peer_id = pkt->getPeerId();
|
2014-01-08 07:47:53 -05:00
|
|
|
|
2015-01-12 11:01:41 -05:00
|
|
|
//infostream<<"Client: received command="<<command<<std::endl;
|
|
|
|
m_packetcounter.add((u16)command);
|
|
|
|
|
|
|
|
/*
|
|
|
|
If this check is removed, be sure to change the queue
|
|
|
|
system to know the ids
|
|
|
|
*/
|
|
|
|
if(sender_peer_id != PEER_ID_SERVER) {
|
|
|
|
infostream << "Client::ProcessData(): Discarding data not "
|
|
|
|
"coming from server: peer_id=" << sender_peer_id
|
|
|
|
<< std::endl;
|
|
|
|
return;
|
2014-01-08 07:47:53 -05:00
|
|
|
}
|
2014-04-11 09:32:46 -04:00
|
|
|
|
2015-01-12 11:01:41 -05:00
|
|
|
// Command must be handled into ToClientCommandHandler
|
|
|
|
if (command >= TOCLIENT_NUM_MSG_TYPES) {
|
|
|
|
infostream << "Client: Ignoring unknown command "
|
|
|
|
<< command << std::endl;
|
2015-06-24 16:45:52 -04:00
|
|
|
return;
|
2015-01-12 11:01:41 -05:00
|
|
|
}
|
2014-04-11 09:32:46 -04:00
|
|
|
|
2015-01-12 11:01:41 -05:00
|
|
|
/*
|
|
|
|
* Those packets are handled before m_server_ser_ver is set, it's normal
|
|
|
|
* But we must use the new ToClientConnectionState in the future,
|
|
|
|
* as a byte mask
|
|
|
|
*/
|
|
|
|
if(toClientCommandTable[command].state == TOCLIENT_STATE_NOT_CONNECTED) {
|
2015-03-31 04:35:51 -04:00
|
|
|
handleCommand(pkt);
|
2015-01-12 11:01:41 -05:00
|
|
|
return;
|
2014-04-11 09:32:46 -04:00
|
|
|
}
|
2015-01-12 11:01:41 -05:00
|
|
|
|
|
|
|
if(m_server_ser_ver == SER_FMT_VER_INVALID) {
|
|
|
|
infostream << "Client: Server serialization"
|
|
|
|
" format invalid or not initialized."
|
|
|
|
" Skipping incoming command=" << command << std::endl;
|
|
|
|
return;
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
2015-01-12 11:01:41 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
Handle runtime commands
|
|
|
|
*/
|
|
|
|
|
2015-03-31 04:35:51 -04:00
|
|
|
handleCommand(pkt);
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
void Client::Send(NetworkPacket* pkt)
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
m_con.Send(PEER_ID_SERVER,
|
|
|
|
serverCommandFactoryTable[pkt->getCommand()].channel,
|
|
|
|
pkt,
|
|
|
|
serverCommandFactoryTable[pkt->getCommand()].reliable);
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
2011-11-29 10:15:18 -05:00
|
|
|
void Client::interact(u8 action, const PointedThing& pointed)
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
if(m_state != LC_Ready) {
|
|
|
|
errorstream << "Client::interact() "
|
2015-03-13 17:08:41 -04:00
|
|
|
"Canceled (not connected)"
|
[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 05:37:49 -05:00
|
|
|
<< std::endl;
|
2010-11-26 18:02:21 -05:00
|
|
|
return;
|
|
|
|
}
|
2011-11-29 10:15:18 -05:00
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
/*
|
|
|
|
[0] u16 command
|
2010-12-18 06:10:37 -05:00
|
|
|
[2] u8 action
|
2011-11-29 10:15:18 -05:00
|
|
|
[3] u16 item
|
|
|
|
[5] u32 length of the next item
|
|
|
|
[9] serialized PointedThing
|
2010-12-18 06:10:37 -05:00
|
|
|
actions:
|
2011-11-29 10:15:18 -05:00
|
|
|
0: start digging (from undersurface) or use
|
|
|
|
1: stop digging (all parameters ignored)
|
|
|
|
2: digging completed
|
|
|
|
3: place block or item (to abovesurface)
|
|
|
|
4: use item
|
2015-11-18 14:26:09 -05:00
|
|
|
5: perform secondary action of item
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_INTERACT, 1 + 2 + 0);
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << action;
|
|
|
|
pkt << (u16)getPlayerItem();
|
[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 05:37:49 -05:00
|
|
|
|
2011-11-29 10:15:18 -05:00
|
|
|
std::ostringstream tmp_os(std::ios::binary);
|
|
|
|
pointed.serialize(tmp_os);
|
2011-10-15 05:17:21 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt.putLongString(tmp_os.str());
|
2011-10-15 05:17:21 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2011-04-09 21:15:10 -04:00
|
|
|
}
|
|
|
|
|
2015-04-11 22:49:13 -04:00
|
|
|
void Client::deleteAuthData()
|
|
|
|
{
|
|
|
|
if (!m_auth_data)
|
|
|
|
return;
|
|
|
|
|
|
|
|
switch (m_chosen_auth_mech) {
|
|
|
|
case AUTH_MECHANISM_FIRST_SRP:
|
|
|
|
break;
|
|
|
|
case AUTH_MECHANISM_SRP:
|
|
|
|
case AUTH_MECHANISM_LEGACY_PASSWORD:
|
|
|
|
srp_user_delete((SRPUser *) m_auth_data);
|
|
|
|
m_auth_data = NULL;
|
|
|
|
break;
|
|
|
|
case AUTH_MECHANISM_NONE:
|
|
|
|
break;
|
|
|
|
}
|
2015-07-27 01:44:48 -04:00
|
|
|
m_chosen_auth_mech = AUTH_MECHANISM_NONE;
|
2015-04-11 22:49:13 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
AuthMechanism Client::choseAuthMech(const u32 mechs)
|
|
|
|
{
|
|
|
|
if (mechs & AUTH_MECHANISM_SRP)
|
|
|
|
return AUTH_MECHANISM_SRP;
|
|
|
|
|
|
|
|
if (mechs & AUTH_MECHANISM_FIRST_SRP)
|
|
|
|
return AUTH_MECHANISM_FIRST_SRP;
|
|
|
|
|
|
|
|
if (mechs & AUTH_MECHANISM_LEGACY_PASSWORD)
|
|
|
|
return AUTH_MECHANISM_LEGACY_PASSWORD;
|
|
|
|
|
|
|
|
return AUTH_MECHANISM_NONE;
|
|
|
|
}
|
|
|
|
|
2015-03-16 07:39:27 -04:00
|
|
|
void Client::sendLegacyInit(const char* playerName, const char* playerPassword)
|
|
|
|
{
|
|
|
|
NetworkPacket pkt(TOSERVER_INIT_LEGACY,
|
|
|
|
1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2);
|
|
|
|
|
2016-03-14 05:18:29 -04:00
|
|
|
u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
|
|
|
|
CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
|
|
|
|
|
2015-03-16 07:39:27 -04:00
|
|
|
pkt << (u8) SER_FMT_VER_HIGHEST_READ;
|
|
|
|
pkt.putRawString(playerName,PLAYERNAME_SIZE);
|
|
|
|
pkt.putRawString(playerPassword, PASSWORD_SIZE);
|
2016-03-14 05:18:29 -04:00
|
|
|
pkt << (u16) proto_version_min << (u16) CLIENT_PROTOCOL_VERSION_MAX;
|
2015-03-16 07:39:27 -04:00
|
|
|
|
|
|
|
Send(&pkt);
|
|
|
|
}
|
|
|
|
|
2015-04-11 22:49:13 -04:00
|
|
|
void Client::sendInit(const std::string &playerName)
|
|
|
|
{
|
|
|
|
NetworkPacket pkt(TOSERVER_INIT, 1 + 2 + 2 + (1 + playerName.size()));
|
|
|
|
|
2015-05-15 19:19:43 -04:00
|
|
|
// we don't support network compression yet
|
|
|
|
u16 supp_comp_modes = NETPROTO_COMPRESSION_NONE;
|
2016-03-14 05:18:29 -04:00
|
|
|
|
|
|
|
u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
|
|
|
|
CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
|
|
|
|
|
2015-05-15 19:19:43 -04:00
|
|
|
pkt << (u8) SER_FMT_VER_HIGHEST_READ << (u16) supp_comp_modes;
|
2016-03-14 05:18:29 -04:00
|
|
|
pkt << (u16) proto_version_min << (u16) CLIENT_PROTOCOL_VERSION_MAX;
|
2015-04-11 22:49:13 -04:00
|
|
|
pkt << playerName;
|
|
|
|
|
|
|
|
Send(&pkt);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::startAuth(AuthMechanism chosen_auth_mechanism)
|
|
|
|
{
|
|
|
|
m_chosen_auth_mech = chosen_auth_mechanism;
|
|
|
|
|
|
|
|
switch (chosen_auth_mechanism) {
|
|
|
|
case AUTH_MECHANISM_FIRST_SRP: {
|
|
|
|
// send srp verifier to server
|
2016-03-08 21:12:22 -05:00
|
|
|
std::string verifier;
|
|
|
|
std::string salt;
|
|
|
|
generate_srp_verifier_and_salt(getPlayerName(), m_password,
|
|
|
|
&verifier, &salt);
|
|
|
|
|
2015-04-11 22:49:13 -04:00
|
|
|
NetworkPacket resp_pkt(TOSERVER_FIRST_SRP, 0);
|
2016-03-08 21:12:22 -05:00
|
|
|
resp_pkt << salt << verifier << (u8)((m_password == "") ? 1 : 0);
|
|
|
|
|
2015-04-11 22:49:13 -04:00
|
|
|
Send(&resp_pkt);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case AUTH_MECHANISM_SRP:
|
|
|
|
case AUTH_MECHANISM_LEGACY_PASSWORD: {
|
|
|
|
u8 based_on = 1;
|
|
|
|
|
|
|
|
if (chosen_auth_mechanism == AUTH_MECHANISM_LEGACY_PASSWORD) {
|
2016-03-08 21:12:22 -05:00
|
|
|
m_password = translate_password(getPlayerName(), m_password);
|
2015-04-11 22:49:13 -04:00
|
|
|
based_on = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::string playername_u = lowercase(getPlayerName());
|
|
|
|
m_auth_data = srp_user_new(SRP_SHA256, SRP_NG_2048,
|
|
|
|
getPlayerName().c_str(), playername_u.c_str(),
|
|
|
|
(const unsigned char *) m_password.c_str(),
|
|
|
|
m_password.length(), NULL, NULL);
|
|
|
|
char *bytes_A = 0;
|
|
|
|
size_t len_A = 0;
|
2015-09-29 18:38:05 -04:00
|
|
|
SRP_Result res = srp_user_start_authentication(
|
|
|
|
(struct SRPUser *) m_auth_data, NULL, NULL, 0,
|
|
|
|
(unsigned char **) &bytes_A, &len_A);
|
|
|
|
FATAL_ERROR_IF(res != SRP_OK, "Creating local SRP user failed.");
|
2015-04-11 22:49:13 -04:00
|
|
|
|
|
|
|
NetworkPacket resp_pkt(TOSERVER_SRP_BYTES_A, 0);
|
|
|
|
resp_pkt << std::string(bytes_A, len_A) << based_on;
|
|
|
|
Send(&resp_pkt);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case AUTH_MECHANISM_NONE:
|
|
|
|
break; // not handled in this method
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-16 07:39:27 -04:00
|
|
|
void Client::sendDeletedBlocks(std::vector<v3s16> &blocks)
|
|
|
|
{
|
|
|
|
NetworkPacket pkt(TOSERVER_DELETEDBLOCKS, 1 + sizeof(v3s16) * blocks.size());
|
|
|
|
|
|
|
|
pkt << (u8) blocks.size();
|
|
|
|
|
|
|
|
u32 k = 0;
|
|
|
|
for(std::vector<v3s16>::iterator
|
|
|
|
j = blocks.begin();
|
|
|
|
j != blocks.end(); ++j) {
|
|
|
|
pkt << *j;
|
|
|
|
k++;
|
|
|
|
}
|
|
|
|
|
|
|
|
Send(&pkt);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::sendGotBlocks(v3s16 block)
|
|
|
|
{
|
|
|
|
NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6);
|
|
|
|
pkt << (u8) 1 << block;
|
|
|
|
Send(&pkt);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::sendRemovedSounds(std::vector<s32> &soundList)
|
|
|
|
{
|
|
|
|
size_t server_ids = soundList.size();
|
|
|
|
assert(server_ids <= 0xFFFF);
|
|
|
|
|
|
|
|
NetworkPacket pkt(TOSERVER_REMOVED_SOUNDS, 2 + server_ids * 4);
|
|
|
|
|
|
|
|
pkt << (u16) (server_ids & 0xFFFF);
|
|
|
|
|
|
|
|
for(std::vector<s32>::iterator i = soundList.begin();
|
2015-08-25 16:23:05 -04:00
|
|
|
i != soundList.end(); ++i)
|
2015-03-16 07:39:27 -04:00
|
|
|
pkt << *i;
|
|
|
|
|
|
|
|
Send(&pkt);
|
|
|
|
}
|
|
|
|
|
2012-06-01 13:51:15 -04:00
|
|
|
void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
|
2015-05-19 02:24:14 -04:00
|
|
|
const StringMap &fields)
|
2011-04-03 22:12:33 -04:00
|
|
|
{
|
2014-02-04 18:17:57 -05:00
|
|
|
size_t fields_size = fields.size();
|
2015-03-06 05:21:51 -05:00
|
|
|
|
|
|
|
FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of nodemeta fields");
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_NODEMETA_FIELDS, 0);
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << p << formname << (u16) (fields_size & 0xFFFF);
|
[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 05:37:49 -05:00
|
|
|
|
2015-05-19 02:24:14 -04:00
|
|
|
StringMap::const_iterator it;
|
|
|
|
for (it = fields.begin(); it != fields.end(); ++it) {
|
|
|
|
const std::string &name = it->first;
|
|
|
|
const std::string &value = it->second;
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << name;
|
|
|
|
pkt.putLongString(value);
|
2012-06-01 13:51:15 -04:00
|
|
|
}
|
2011-04-03 22:12:33 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2011-04-03 22:12:33 -04:00
|
|
|
}
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2013-11-30 19:52:06 -05:00
|
|
|
void Client::sendInventoryFields(const std::string &formname,
|
2015-05-19 02:24:14 -04:00
|
|
|
const StringMap &fields)
|
2012-07-22 10:10:58 -04:00
|
|
|
{
|
2014-02-04 18:17:57 -05:00
|
|
|
size_t fields_size = fields.size();
|
2015-03-06 05:21:51 -05:00
|
|
|
FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of inventory fields");
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_INVENTORY_FIELDS, 0);
|
|
|
|
pkt << formname << (u16) (fields_size & 0xFFFF);
|
[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 05:37:49 -05:00
|
|
|
|
2015-05-19 02:24:14 -04:00
|
|
|
StringMap::const_iterator it;
|
|
|
|
for (it = fields.begin(); it != fields.end(); ++it) {
|
|
|
|
const std::string &name = it->first;
|
|
|
|
const std::string &value = it->second;
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << name;
|
|
|
|
pkt.putLongString(value);
|
2012-07-22 10:10:58 -04:00
|
|
|
}
|
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2012-07-22 10:10:58 -04:00
|
|
|
}
|
|
|
|
|
2010-12-22 09:30:23 -05:00
|
|
|
void Client::sendInventoryAction(InventoryAction *a)
|
|
|
|
{
|
|
|
|
std::ostringstream os(std::ios_base::binary);
|
|
|
|
|
|
|
|
a->serialize(os);
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2010-12-22 09:30:23 -05:00
|
|
|
// Make data buffer
|
|
|
|
std::string s = os.str();
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_INVENTORY_ACTION, s.size());
|
|
|
|
pkt.putRawString(s.c_str(),s.size());
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2010-12-22 09:30:23 -05:00
|
|
|
}
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2010-12-23 15:35:53 -05:00
|
|
|
void Client::sendChatMessage(const std::wstring &message)
|
|
|
|
{
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_CHAT_MESSAGE, 2 + message.size() * sizeof(u16));
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << message;
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2010-12-23 15:35:53 -05:00
|
|
|
}
|
|
|
|
|
2015-04-17 00:10:30 -04:00
|
|
|
void Client::sendChangePassword(const std::string &oldpassword,
|
|
|
|
const std::string &newpassword)
|
2011-05-22 16:09:12 -04:00
|
|
|
{
|
|
|
|
Player *player = m_env.getLocalPlayer();
|
2015-04-11 22:49:13 -04:00
|
|
|
if (player == NULL)
|
2011-05-22 16:09:12 -04:00
|
|
|
return;
|
|
|
|
|
|
|
|
std::string playername = player->getName();
|
2015-04-11 22:49:13 -04:00
|
|
|
if (m_proto_ver >= 25) {
|
|
|
|
// get into sudo mode and then send new password to server
|
|
|
|
m_password = oldpassword;
|
|
|
|
m_new_password = newpassword;
|
|
|
|
startAuth(choseAuthMech(m_sudo_auth_methods));
|
|
|
|
} else {
|
2016-03-08 21:12:22 -05:00
|
|
|
std::string oldpwd = translate_password(playername, oldpassword);
|
|
|
|
std::string newpwd = translate_password(playername, newpassword);
|
2015-04-11 22:49:13 -04:00
|
|
|
|
|
|
|
NetworkPacket pkt(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE);
|
|
|
|
|
|
|
|
for (u8 i = 0; i < PASSWORD_SIZE; i++) {
|
|
|
|
pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0);
|
|
|
|
}
|
2011-05-22 16:09:12 -04:00
|
|
|
|
2015-04-11 22:49:13 -04:00
|
|
|
for (u8 i = 0; i < PASSWORD_SIZE; i++) {
|
|
|
|
pkt << (u8) (i < newpwd.length() ? newpwd[i] : 0);
|
|
|
|
}
|
|
|
|
Send(&pkt);
|
[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 05:37:49 -05:00
|
|
|
}
|
2011-05-22 16:09:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-04-21 12:35:17 -04:00
|
|
|
void Client::sendDamage(u8 damage)
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2011-04-21 12:35:17 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_DAMAGE, sizeof(u8));
|
|
|
|
pkt << damage;
|
|
|
|
Send(&pkt);
|
2011-04-21 12:35:17 -04:00
|
|
|
}
|
|
|
|
|
2013-07-19 13:50:33 -04:00
|
|
|
void Client::sendBreath(u16 breath)
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2013-07-19 13:50:33 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_BREATH, sizeof(u16));
|
|
|
|
pkt << breath;
|
|
|
|
Send(&pkt);
|
2013-07-19 13:50:33 -04:00
|
|
|
}
|
|
|
|
|
2011-10-15 07:46:59 -04:00
|
|
|
void Client::sendRespawn()
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2011-10-15 07:46:59 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_RESPAWN, 0);
|
|
|
|
Send(&pkt);
|
2011-10-15 07:46:59 -04:00
|
|
|
}
|
|
|
|
|
2014-02-13 14:17:42 -05:00
|
|
|
void Client::sendReady()
|
|
|
|
{
|
2015-10-14 02:39:30 -04:00
|
|
|
DSTACK(FUNCTION_NAME);
|
2014-02-13 14:17:42 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_CLIENT_READY,
|
2015-02-27 18:05:29 -05:00
|
|
|
1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(g_version_hash));
|
2014-02-13 14:17:42 -05:00
|
|
|
|
2015-02-27 18:05:29 -05:00
|
|
|
pkt << (u8) VERSION_MAJOR << (u8) VERSION_MINOR << (u8) VERSION_PATCH
|
|
|
|
<< (u8) 0 << (u16) strlen(g_version_hash);
|
2014-02-13 14:17:42 -05:00
|
|
|
|
2015-02-27 18:05:29 -05:00
|
|
|
pkt.putRawString(g_version_hash, (u16) strlen(g_version_hash));
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2014-02-13 14:17:42 -05:00
|
|
|
}
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
void Client::sendPlayerPos()
|
|
|
|
{
|
2012-12-02 07:59:08 -05:00
|
|
|
LocalPlayer *myplayer = m_env.getLocalPlayer();
|
2010-11-26 18:02:21 -05:00
|
|
|
if(myplayer == NULL)
|
|
|
|
return;
|
2012-12-02 07:59:08 -05:00
|
|
|
|
|
|
|
// Save bandwidth by only updating position when something changed
|
2014-02-04 18:17:57 -05:00
|
|
|
if(myplayer->last_position == myplayer->getPosition() &&
|
|
|
|
myplayer->last_speed == myplayer->getSpeed() &&
|
|
|
|
myplayer->last_pitch == myplayer->getPitch() &&
|
|
|
|
myplayer->last_yaw == myplayer->getYaw() &&
|
2012-12-02 07:59:08 -05:00
|
|
|
myplayer->last_keyPressed == myplayer->keyPressed)
|
|
|
|
return;
|
|
|
|
|
2014-02-04 18:17:57 -05:00
|
|
|
myplayer->last_position = myplayer->getPosition();
|
|
|
|
myplayer->last_speed = myplayer->getSpeed();
|
|
|
|
myplayer->last_pitch = myplayer->getPitch();
|
|
|
|
myplayer->last_yaw = myplayer->getYaw();
|
2012-12-02 07:59:08 -05:00
|
|
|
myplayer->last_keyPressed = myplayer->keyPressed;
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
u16 our_peer_id;
|
|
|
|
{
|
2015-04-07 06:13:12 -04:00
|
|
|
//MutexAutoLock lock(m_con_mutex); //bulk comment-out
|
2010-11-26 18:02:21 -05:00
|
|
|
our_peer_id = m_con.GetPeerID();
|
|
|
|
}
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
// Set peer id if not set already
|
2011-01-14 20:28:19 -05:00
|
|
|
if(myplayer->peer_id == PEER_ID_INEXISTENT)
|
2010-11-26 18:02:21 -05:00
|
|
|
myplayer->peer_id = our_peer_id;
|
2015-03-06 05:21:51 -05:00
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
assert(myplayer->peer_id == our_peer_id);
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2014-02-04 18:17:57 -05:00
|
|
|
v3f pf = myplayer->getPosition();
|
|
|
|
v3f sf = myplayer->getSpeed();
|
|
|
|
s32 pitch = myplayer->getPitch() * 100;
|
|
|
|
s32 yaw = myplayer->getYaw() * 100;
|
|
|
|
u32 keyPressed = myplayer->keyPressed;
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
v3s32 position(pf.X*100, pf.Y*100, pf.Z*100);
|
|
|
|
v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100);
|
|
|
|
/*
|
|
|
|
Format:
|
[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 05:37:49 -05:00
|
|
|
[0] v3s32 position*100
|
|
|
|
[12] v3s32 speed*100
|
|
|
|
[12+12] s32 pitch*100
|
|
|
|
[12+12+4] s32 yaw*100
|
|
|
|
[12+12+4+4] u32 keyPressed
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << position << speed << pitch << yaw << keyPressed;
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2010-11-26 18:02:21 -05:00
|
|
|
}
|
|
|
|
|
2011-08-10 15:43:40 -04:00
|
|
|
void Client::sendPlayerItem(u16 item)
|
|
|
|
{
|
|
|
|
Player *myplayer = m_env.getLocalPlayer();
|
|
|
|
if(myplayer == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
u16 our_peer_id = m_con.GetPeerID();
|
|
|
|
|
|
|
|
// Set peer id if not set already
|
|
|
|
if(myplayer->peer_id == PEER_ID_INEXISTENT)
|
|
|
|
myplayer->peer_id = our_peer_id;
|
|
|
|
assert(myplayer->peer_id == our_peer_id);
|
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
NetworkPacket pkt(TOSERVER_PLAYERITEM, 2);
|
2011-08-10 15:43:40 -04:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
pkt << item;
|
[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 05:37:49 -05:00
|
|
|
|
2015-03-13 17:01:49 -04:00
|
|
|
Send(&pkt);
|
2011-08-10 15:43:40 -04:00
|
|
|
}
|
|
|
|
|
2010-12-23 15:35:53 -05:00
|
|
|
void Client::removeNode(v3s16 p)
|
|
|
|
{
|
2012-12-20 12:19:49 -05:00
|
|
|
std::map<v3s16, MapBlock*> modified_blocks;
|
2010-11-26 18:02:21 -05: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 05:37:49 -05:00
|
|
|
try {
|
2010-12-23 15:35:53 -05:00
|
|
|
m_env.getMap().removeNodeAndUpdate(p, modified_blocks);
|
|
|
|
}
|
[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 05:37:49 -05:00
|
|
|
catch(InvalidPositionException &e) {
|
2010-12-23 15:35:53 -05:00
|
|
|
}
|
2015-01-04 16:32:31 -05: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 05:37:49 -05:00
|
|
|
for(std::map<v3s16, MapBlock *>::iterator
|
2012-12-20 12:19:49 -05:00
|
|
|
i = modified_blocks.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 05:37:49 -05:00
|
|
|
i != modified_blocks.end(); ++i) {
|
2014-12-07 20:34:29 -05:00
|
|
|
addUpdateMeshTaskWithEdge(i->first, false, true);
|
2010-12-23 15:35:53 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-23 09:35:49 -05:00
|
|
|
void Client::addNode(v3s16 p, MapNode n, bool remove_metadata)
|
2010-12-23 15:35:53 -05:00
|
|
|
{
|
2014-11-07 15:52:43 -05:00
|
|
|
//TimeTaker timer1("Client::addNode()");
|
2011-02-23 17:19:41 -05:00
|
|
|
|
2012-12-20 12:19:49 -05:00
|
|
|
std::map<v3s16, MapBlock*> modified_blocks;
|
2010-12-23 15:35:53 -05: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 05:37:49 -05:00
|
|
|
try {
|
2011-06-25 19:34:36 -04:00
|
|
|
//TimeTaker timer3("Client::addNode(): addNodeAndUpdate");
|
2013-11-23 09:35:49 -05:00
|
|
|
m_env.getMap().addNodeAndUpdate(p, n, modified_blocks, remove_metadata);
|
2010-12-23 15:35:53 -05: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 05:37:49 -05:00
|
|
|
catch(InvalidPositionException &e) {
|
|
|
|
}
|
2015-01-04 16:32:31 -05: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 05:37:49 -05:00
|
|
|
for(std::map<v3s16, MapBlock *>::iterator
|
2012-12-20 12:19:49 -05:00
|
|
|
i = modified_blocks.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 05:37:49 -05:00
|
|
|
i != modified_blocks.end(); ++i) {
|
2014-12-07 20:34:29 -05:00
|
|
|
addUpdateMeshTaskWithEdge(i->first, false, true);
|
2010-12-23 15:35:53 -05:00
|
|
|
}
|
|
|
|
}
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
void Client::setPlayerControl(PlayerControl &control)
|
|
|
|
{
|
|
|
|
LocalPlayer *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
|
|
|
player->control = control;
|
|
|
|
}
|
|
|
|
|
2011-08-10 12:31:44 -04:00
|
|
|
void Client::selectPlayerItem(u16 item)
|
|
|
|
{
|
2011-11-29 10:15:18 -05:00
|
|
|
m_playeritem = item;
|
|
|
|
m_inventory_updated = true;
|
2011-08-10 15:43:40 -04:00
|
|
|
sendPlayerItem(item);
|
2011-08-10 12:31:44 -04:00
|
|
|
}
|
|
|
|
|
2010-11-26 18:02:21 -05:00
|
|
|
// Returns true if the inventory of the local player has been
|
|
|
|
// updated from the server. If it is true, it is set to false.
|
|
|
|
bool Client::getLocalInventoryUpdated()
|
|
|
|
{
|
|
|
|
bool updated = m_inventory_updated;
|
|
|
|
m_inventory_updated = false;
|
|
|
|
return updated;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Copies the inventory of the local player to parameter
|
|
|
|
void Client::getLocalInventory(Inventory &dst)
|
|
|
|
{
|
|
|
|
Player *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
|
|
|
dst = player->inventory;
|
|
|
|
}
|
|
|
|
|
2011-12-06 08:21:56 -05:00
|
|
|
Inventory* Client::getInventory(const InventoryLocation &loc)
|
|
|
|
{
|
|
|
|
switch(loc.type){
|
|
|
|
case InventoryLocation::UNDEFINED:
|
|
|
|
{}
|
|
|
|
break;
|
2012-01-12 00:10:39 -05:00
|
|
|
case InventoryLocation::CURRENT_PLAYER:
|
|
|
|
{
|
|
|
|
Player *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
|
|
|
return &player->inventory;
|
|
|
|
}
|
|
|
|
break;
|
2011-12-06 08:21:56 -05:00
|
|
|
case InventoryLocation::PLAYER:
|
|
|
|
{
|
2016-10-08 06:21:41 -04:00
|
|
|
LocalPlayer *player = m_env.getPlayer(loc.name.c_str());
|
2011-12-06 08:21:56 -05:00
|
|
|
if(!player)
|
|
|
|
return NULL;
|
|
|
|
return &player->inventory;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case InventoryLocation::NODEMETA:
|
|
|
|
{
|
|
|
|
NodeMetadata *meta = m_env.getMap().getNodeMetadata(loc.p);
|
|
|
|
if(!meta)
|
|
|
|
return NULL;
|
|
|
|
return meta->getInventory();
|
|
|
|
}
|
|
|
|
break;
|
2012-07-24 13:57:17 -04:00
|
|
|
case InventoryLocation::DETACHED:
|
|
|
|
{
|
2016-10-05 03:03:55 -04:00
|
|
|
if (m_detached_inventories.count(loc.name) == 0)
|
2012-07-24 13:57:17 -04:00
|
|
|
return NULL;
|
|
|
|
return m_detached_inventories[loc.name];
|
|
|
|
}
|
|
|
|
break;
|
2011-12-06 08:21:56 -05:00
|
|
|
default:
|
2015-03-06 05:21:51 -05:00
|
|
|
FATAL_ERROR("Invalid inventory location type.");
|
2015-03-13 17:08:41 -04:00
|
|
|
break;
|
2011-12-06 08:21:56 -05:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2014-02-04 18:17:57 -05:00
|
|
|
|
2011-04-04 08:13:19 -04:00
|
|
|
void Client::inventoryAction(InventoryAction *a)
|
|
|
|
{
|
2012-01-21 18:49:02 -05:00
|
|
|
/*
|
|
|
|
Send it to the server
|
|
|
|
*/
|
2011-04-04 08:13:19 -04:00
|
|
|
sendInventoryAction(a);
|
2012-01-21 18:49:02 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
Predict some local inventory changes
|
|
|
|
*/
|
|
|
|
a->clientApply(this, this);
|
2013-05-10 18:12:14 -04:00
|
|
|
|
|
|
|
// Remove it
|
|
|
|
delete a;
|
2011-04-04 08:13:19 -04:00
|
|
|
}
|
|
|
|
|
2011-04-07 17:47:14 -04:00
|
|
|
ClientActiveObject * Client::getSelectedActiveObject(
|
|
|
|
f32 max_d,
|
|
|
|
v3f from_pos_f_on_map,
|
|
|
|
core::line3d<f32> shootline_on_map
|
|
|
|
)
|
|
|
|
{
|
2012-12-20 12:19:49 -05:00
|
|
|
std::vector<DistanceSortedActiveObject> objects;
|
2011-04-07 17:47:14 -04:00
|
|
|
|
|
|
|
m_env.getActiveObjects(from_pos_f_on_map, max_d, objects);
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2011-04-07 17:47:14 -04:00
|
|
|
// Sort them.
|
|
|
|
// After this, the closest object is the first in the array.
|
2012-12-20 12:19:49 -05:00
|
|
|
std::sort(objects.begin(), objects.end());
|
2011-04-07 17:47:14 -04:00
|
|
|
|
2014-02-04 18:17:57 -05:00
|
|
|
for(unsigned int i=0; i<objects.size(); i++)
|
2011-04-07 17:47:14 -04:00
|
|
|
{
|
|
|
|
ClientActiveObject *obj = objects[i].obj;
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2016-02-11 09:21:21 -05:00
|
|
|
aabb3f *selection_box = obj->getSelectionBox();
|
2011-04-07 17:47:14 -04:00
|
|
|
if(selection_box == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
v3f pos = obj->getPosition();
|
|
|
|
|
2016-02-11 09:21:21 -05:00
|
|
|
aabb3f offsetted_box(
|
2011-04-07 17:47:14 -04:00
|
|
|
selection_box->MinEdge + pos,
|
|
|
|
selection_box->MaxEdge + pos
|
|
|
|
);
|
|
|
|
|
|
|
|
if(offsetted_box.intersectsWithLine(shootline_on_map))
|
|
|
|
{
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-03-25 14:13:25 -04:00
|
|
|
std::list<std::string> Client::getConnectedPlayerNames()
|
2011-12-03 03:01:14 -05:00
|
|
|
{
|
2013-03-25 14:13:25 -04:00
|
|
|
return m_env.getPlayerNames();
|
2011-12-03 03:01:14 -05:00
|
|
|
}
|
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
float Client::getAnimationTime()
|
2010-12-18 10:46:00 -05:00
|
|
|
{
|
2012-03-13 13:56:12 -04:00
|
|
|
return m_animation_time;
|
2010-12-18 10:46:00 -05:00
|
|
|
}
|
2010-11-26 18:02:21 -05:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
int Client::getCrackLevel()
|
2011-04-21 12:35:17 -04:00
|
|
|
{
|
2012-03-13 13:56:12 -04:00
|
|
|
return m_crack_level;
|
2011-04-21 12:35:17 -04:00
|
|
|
}
|
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
void Client::setCrack(int level, v3s16 pos)
|
2011-06-25 19:34:36 -04:00
|
|
|
{
|
2012-03-13 13:56:12 -04:00
|
|
|
int old_crack_level = m_crack_level;
|
|
|
|
v3s16 old_crack_pos = m_crack_pos;
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
m_crack_level = level;
|
|
|
|
m_crack_pos = pos;
|
2011-06-25 19:34:36 -04:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
if(old_crack_level >= 0 && (level < 0 || pos != old_crack_pos))
|
|
|
|
{
|
|
|
|
// remove old crack
|
|
|
|
addUpdateMeshTaskForNode(old_crack_pos, false, true);
|
|
|
|
}
|
|
|
|
if(level >= 0 && (old_crack_level < 0 || pos != old_crack_pos))
|
2011-06-25 19:34:36 -04:00
|
|
|
{
|
2012-03-13 13:56:12 -04:00
|
|
|
// add new crack
|
|
|
|
addUpdateMeshTaskForNode(pos, false, true);
|
2011-06-25 19:34:36 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
u16 Client::getHP()
|
|
|
|
{
|
|
|
|
Player *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
|
|
|
return player->hp;
|
2011-06-25 19:34:36 -04:00
|
|
|
}
|
|
|
|
|
2013-06-19 10:30:22 -04:00
|
|
|
u16 Client::getBreath()
|
|
|
|
{
|
|
|
|
Player *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
2013-07-19 13:50:33 -04:00
|
|
|
return player->getBreath();
|
2013-06-19 10:30:22 -04:00
|
|
|
}
|
|
|
|
|
2011-12-03 03:01:14 -05:00
|
|
|
bool Client::getChatMessage(std::wstring &message)
|
|
|
|
{
|
|
|
|
if(m_chat_queue.size() == 0)
|
|
|
|
return false;
|
2015-03-04 11:48:07 -05:00
|
|
|
message = m_chat_queue.front();
|
|
|
|
m_chat_queue.pop();
|
2011-12-03 03:01:14 -05:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::typeChatMessage(const std::wstring &message)
|
|
|
|
{
|
|
|
|
// Discard empty line
|
|
|
|
if(message == L"")
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Send to others
|
|
|
|
sendChatMessage(message);
|
|
|
|
|
|
|
|
// Show locally
|
|
|
|
if (message[0] == L'/')
|
|
|
|
{
|
2015-03-04 11:48:07 -05:00
|
|
|
m_chat_queue.push((std::wstring)L"issued command: " + message);
|
2011-12-03 03:01:14 -05:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
LocalPlayer *player = m_env.getLocalPlayer();
|
|
|
|
assert(player != NULL);
|
|
|
|
std::wstring name = narrow_to_wide(player->getName());
|
2015-03-04 11:48:07 -05:00
|
|
|
m_chat_queue.push((std::wstring)L"<" + name + L"> " + message);
|
2011-12-03 03:01:14 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
|
2010-12-19 09:51:45 -05:00
|
|
|
{
|
2011-04-03 19:05:12 -04:00
|
|
|
MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p);
|
|
|
|
if(b == NULL)
|
|
|
|
return;
|
2014-09-16 06:38:37 -04:00
|
|
|
|
2011-04-03 19:05:12 -04:00
|
|
|
/*
|
|
|
|
Create a task to update the mesh of the block
|
|
|
|
*/
|
2014-09-16 06:38:37 -04:00
|
|
|
|
2016-02-12 06:25:20 -05:00
|
|
|
MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders,
|
|
|
|
m_cache_use_tangent_vertices);
|
2014-09-16 06:38:37 -04:00
|
|
|
|
2010-12-19 09:51:45 -05:00
|
|
|
{
|
2011-04-03 19:05:12 -04:00
|
|
|
//TimeTaker timer("data fill");
|
2011-06-25 20:14:52 -04:00
|
|
|
// Release: ~0ms
|
|
|
|
// Debug: 1-6ms, avg=2ms
|
2012-03-13 13:56:12 -04:00
|
|
|
data->fill(b);
|
|
|
|
data->setCrack(m_crack_level, m_crack_pos);
|
2014-12-06 09:37:37 -05:00
|
|
|
data->setSmoothLighting(m_cache_smooth_lighting);
|
2010-12-19 09:51:45 -05:00
|
|
|
}
|
2014-09-16 06:38:37 -04:00
|
|
|
|
2011-04-03 19:05:12 -04:00
|
|
|
// Add task to queue
|
2015-06-29 05:06:03 -04:00
|
|
|
m_mesh_update_thread.enqueueUpdate(p, data, ack_to_server, urgent);
|
2011-04-03 19:05:12 -04:00
|
|
|
}
|
2010-12-19 09:51:45 -05:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server, bool urgent)
|
2011-04-03 19:05:12 -04:00
|
|
|
{
|
|
|
|
try{
|
2014-12-07 20:34:29 -05:00
|
|
|
addUpdateMeshTask(blockpos, ack_to_server, urgent);
|
2010-12-19 09:51:45 -05:00
|
|
|
}
|
2011-04-03 19:05:12 -04:00
|
|
|
catch(InvalidPositionException &e){}
|
2014-02-04 18:17:57 -05:00
|
|
|
|
2011-04-03 19:05:12 -04:00
|
|
|
// Leading edge
|
2013-04-23 22:12:24 -04:00
|
|
|
for (int i=0;i<6;i++)
|
|
|
|
{
|
|
|
|
try{
|
|
|
|
v3s16 p = blockpos + g_6dirs[i];
|
|
|
|
addUpdateMeshTask(p, false, urgent);
|
|
|
|
}
|
|
|
|
catch(InvalidPositionException &e){}
|
2012-03-13 13:56:12 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool urgent)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
v3s16 p = nodepos;
|
|
|
|
infostream<<"Client::addUpdateMeshTaskForNode(): "
|
|
|
|
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
|
|
|
|
<<std::endl;
|
|
|
|
}
|
|
|
|
|
2014-02-04 18:17:57 -05:00
|
|
|
v3s16 blockpos = getNodeBlockPos(nodepos);
|
2012-03-13 13:56:12 -04:00
|
|
|
v3s16 blockpos_relative = blockpos * MAP_BLOCKSIZE;
|
|
|
|
|
|
|
|
try{
|
2014-12-07 20:34:29 -05:00
|
|
|
addUpdateMeshTask(blockpos, ack_to_server, urgent);
|
2011-04-03 19:05:12 -04: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 05:37:49 -05:00
|
|
|
catch(InvalidPositionException &e) {}
|
2014-02-04 18:17:57 -05:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
// Leading edge
|
|
|
|
if(nodepos.X == blockpos_relative.X){
|
|
|
|
try{
|
|
|
|
v3s16 p = blockpos + v3s16(-1,0,0);
|
|
|
|
addUpdateMeshTask(p, false, urgent);
|
|
|
|
}
|
|
|
|
catch(InvalidPositionException &e){}
|
|
|
|
}
|
2014-02-04 18:17:57 -05:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
if(nodepos.Y == blockpos_relative.Y){
|
|
|
|
try{
|
|
|
|
v3s16 p = blockpos + v3s16(0,-1,0);
|
|
|
|
addUpdateMeshTask(p, false, urgent);
|
|
|
|
}
|
|
|
|
catch(InvalidPositionException &e){}
|
|
|
|
}
|
2014-02-04 18:17:57 -05:00
|
|
|
|
2012-03-13 13:56:12 -04:00
|
|
|
if(nodepos.Z == blockpos_relative.Z){
|
|
|
|
try{
|
|
|
|
v3s16 p = blockpos + v3s16(0,0,-1);
|
|
|
|
addUpdateMeshTask(p, false, urgent);
|
|
|
|
}
|
|
|
|
catch(InvalidPositionException &e){}
|
|
|
|
}
|
2011-04-03 19:05:12 -04:00
|
|
|
}
|
2010-12-19 09:51:45 -05:00
|
|
|
|
2011-04-21 12:35:17 -04:00
|
|
|
ClientEvent Client::getClientEvent()
|
|
|
|
{
|
2015-03-04 11:48:07 -05:00
|
|
|
ClientEvent event;
|
|
|
|
if(m_client_event_queue.size() == 0) {
|
2011-04-21 12:35:17 -04:00
|
|
|
event.type = CE_NONE;
|
|
|
|
}
|
2015-03-04 11:48:07 -05:00
|
|
|
else {
|
|
|
|
event = m_client_event_queue.front();
|
|
|
|
m_client_event_queue.pop();
|
|
|
|
}
|
|
|
|
return event;
|
2011-04-21 12:35:17 -04:00
|
|
|
}
|
|
|
|
|
Rewrite client media download and support hash-based remote download
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:
- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
2013-08-28 23:22:18 -04:00
|
|
|
float Client::mediaReceiveProgress()
|
|
|
|
{
|
|
|
|
if (m_media_downloader)
|
|
|
|
return m_media_downloader->getProgress();
|
|
|
|
else
|
|
|
|
return 1.0; // downloader only exists when not yet done
|
|
|
|
}
|
|
|
|
|
2015-03-15 02:25:22 -04:00
|
|
|
typedef struct TextureUpdateArgs {
|
|
|
|
IrrlichtDevice *device;
|
|
|
|
gui::IGUIEnvironment *guienv;
|
|
|
|
u32 last_time_ms;
|
|
|
|
u16 last_percent;
|
|
|
|
const wchar_t* text_base;
|
|
|
|
} TextureUpdateArgs;
|
|
|
|
|
|
|
|
void texture_update_progress(void *args, u32 progress, u32 max_progress)
|
|
|
|
{
|
|
|
|
TextureUpdateArgs* targs = (TextureUpdateArgs*) args;
|
|
|
|
u16 cur_percent = ceil(progress / (double) max_progress * 100.);
|
|
|
|
|
|
|
|
// update the loading menu -- if neccessary
|
|
|
|
bool do_draw = false;
|
|
|
|
u32 time_ms = targs->last_time_ms;
|
|
|
|
if (cur_percent != targs->last_percent) {
|
|
|
|
targs->last_percent = cur_percent;
|
|
|
|
time_ms = getTimeMs();
|
|
|
|
// only draw when the user will notice something:
|
|
|
|
do_draw = (time_ms - targs->last_time_ms > 100);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (do_draw) {
|
|
|
|
targs->last_time_ms = time_ms;
|
|
|
|
std::basic_stringstream<wchar_t> strm;
|
|
|
|
strm << targs->text_base << " " << targs->last_percent << "%...";
|
|
|
|
draw_load_screen(strm.str(), targs->device, targs->guienv, 0,
|
|
|
|
72 + (u16) ((18. / 100.) * (double) targs->last_percent));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Client::afterContentReceived(IrrlichtDevice *device)
|
2012-01-12 00:10:39 -05:00
|
|
|
{
|
2012-11-30 09:19:19 -05:00
|
|
|
infostream<<"Client::afterContentReceived() started"<<std::endl;
|
2015-03-06 05:21:51 -05:00
|
|
|
assert(m_itemdef_received); // pre-condition
|
|
|
|
assert(m_nodedef_received); // pre-condition
|
|
|
|
assert(mediaReceived()); // pre-condition
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2015-02-01 17:59:23 -05:00
|
|
|
const wchar_t* text = wgettext("Loading textures...");
|
2014-08-23 06:16:46 -04:00
|
|
|
|
2015-03-09 09:32:11 -04:00
|
|
|
// Clear cached pre-scaled 2D GUI images, as this cache
|
|
|
|
// might have images with the same name but different
|
|
|
|
// content from previous sessions.
|
|
|
|
guiScalingCacheClear(device->getVideoDriver());
|
|
|
|
|
2012-01-12 00:10:39 -05:00
|
|
|
// Rebuild inherited images and recreate textures
|
2012-11-30 09:19:19 -05:00
|
|
|
infostream<<"- Rebuilding images and textures"<<std::endl;
|
2014-08-23 06:16:46 -04:00
|
|
|
draw_load_screen(text,device, guienv, 0, 70);
|
2012-01-12 00:10:39 -05:00
|
|
|
m_tsrc->rebuildImagesAndTextures();
|
2014-08-23 06:16:46 -04:00
|
|
|
delete[] text;
|
2012-01-12 00:10:39 -05:00
|
|
|
|
2012-03-18 21:59:12 -04:00
|
|
|
// Rebuild shaders
|
2013-07-04 22:24:05 -04:00
|
|
|
infostream<<"- Rebuilding shaders"<<std::endl;
|
2014-08-23 06:16:46 -04:00
|
|
|
text = wgettext("Rebuilding shaders...");
|
2015-03-15 02:25:22 -04:00
|
|
|
draw_load_screen(text, device, guienv, 0, 71);
|
2012-03-18 21:59:12 -04:00
|
|
|
m_shsrc->rebuildShaders();
|
2014-08-23 06:16:46 -04:00
|
|
|
delete[] text;
|
2012-03-18 21:59:12 -04:00
|
|
|
|
2012-01-12 00:10:39 -05:00
|
|
|
// Update node aliases
|
2012-11-30 09:19:19 -05:00
|
|
|
infostream<<"- Updating node aliases"<<std::endl;
|
2014-08-23 06:16:46 -04:00
|
|
|
text = wgettext("Initializing nodes...");
|
2015-03-15 02:25:22 -04:00
|
|
|
draw_load_screen(text, device, guienv, 0, 72);
|
2012-01-12 00:10:39 -05:00
|
|
|
m_nodedef->updateAliases(m_itemdef);
|
2015-03-30 06:55:29 -04:00
|
|
|
std::string texture_path = g_settings->get("texture_path");
|
|
|
|
if (texture_path != "" && fs::IsDir(texture_path))
|
|
|
|
m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt");
|
2015-01-04 16:32:31 -05:00
|
|
|
m_nodedef->setNodeRegistrationStatus(true);
|
2015-04-16 04:12:26 -04:00
|
|
|
m_nodedef->runNodeResolveCallbacks();
|
2014-08-23 06:16:46 -04:00
|
|
|
delete[] text;
|
2012-01-12 00:10:39 -05:00
|
|
|
|
2014-05-14 17:19:31 -04:00
|
|
|
// Update node textures and assign shaders to each tile
|
2012-11-30 09:19:19 -05:00
|
|
|
infostream<<"- Updating node textures"<<std::endl;
|
2015-03-15 02:25:22 -04:00
|
|
|
TextureUpdateArgs tu_args;
|
|
|
|
tu_args.device = device;
|
|
|
|
tu_args.guienv = guienv;
|
|
|
|
tu_args.last_time_ms = getTimeMs();
|
|
|
|
tu_args.last_percent = 0;
|
|
|
|
tu_args.text_base = wgettext("Initializing nodes");
|
|
|
|
m_nodedef->updateTextures(this, texture_update_progress, &tu_args);
|
|
|
|
delete[] tu_args.text_base;
|
2012-01-12 00:10:39 -05:00
|
|
|
|
|
|
|
// Start mesh update thread after setting up content definitions
|
2012-11-30 09:19:19 -05:00
|
|
|
infostream<<"- Starting mesh update thread"<<std::endl;
|
2015-04-07 06:13:12 -04:00
|
|
|
m_mesh_update_thread.start();
|
2015-01-04 16:32:31 -05:00
|
|
|
|
2014-02-13 14:17:42 -05:00
|
|
|
m_state = LC_Ready;
|
|
|
|
sendReady();
|
2014-08-23 06:16:46 -04:00
|
|
|
text = wgettext("Done!");
|
|
|
|
draw_load_screen(text, device, guienv, 0, 100);
|
2012-11-30 09:19:19 -05:00
|
|
|
infostream<<"Client::afterContentReceived() done"<<std::endl;
|
2014-08-23 06:16:46 -04:00
|
|
|
delete[] text;
|
2012-01-12 00:10:39 -05:00
|
|
|
}
|
|
|
|
|
2011-10-17 10:18:50 -04:00
|
|
|
float Client::getRTT(void)
|
|
|
|
{
|
2014-02-13 14:17:42 -05:00
|
|
|
return m_con.getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
|
2011-10-17 10:18:50 -04:00
|
|
|
}
|
2011-04-21 12:35:17 -04:00
|
|
|
|
2014-04-25 19:15:46 -04:00
|
|
|
float Client::getCurRate(void)
|
|
|
|
{
|
|
|
|
return ( m_con.getLocalStat(con::CUR_INC_RATE) +
|
|
|
|
m_con.getLocalStat(con::CUR_DL_RATE));
|
|
|
|
}
|
|
|
|
|
|
|
|
float Client::getAvgRate(void)
|
|
|
|
{
|
|
|
|
return ( m_con.getLocalStat(con::AVG_INC_RATE) +
|
|
|
|
m_con.getLocalStat(con::AVG_DL_RATE));
|
|
|
|
}
|
|
|
|
|
2014-09-20 20:23:55 -04:00
|
|
|
void Client::makeScreenshot(IrrlichtDevice *device)
|
|
|
|
{
|
|
|
|
irr::video::IVideoDriver *driver = device->getVideoDriver();
|
|
|
|
irr::video::IImage* const raw_image = driver->createScreenShot();
|
|
|
|
|
2015-03-31 02:13:42 -04:00
|
|
|
if (!raw_image)
|
|
|
|
return;
|
2015-03-24 12:42:31 -04:00
|
|
|
|
2015-03-31 02:13:42 -04:00
|
|
|
time_t t = time(NULL);
|
|
|
|
struct tm *tm = localtime(&t);
|
2015-03-24 12:42:31 -04:00
|
|
|
|
2015-03-31 02:13:42 -04:00
|
|
|
char timetstamp_c[64];
|
2015-04-05 21:07:51 -04:00
|
|
|
strftime(timetstamp_c, sizeof(timetstamp_c), "%Y%m%d_%H%M%S", tm);
|
2015-03-24 12:42:31 -04:00
|
|
|
|
2015-03-31 02:13:42 -04:00
|
|
|
std::string filename_base = g_settings->get("screenshot_path")
|
|
|
|
+ DIR_DELIM
|
|
|
|
+ std::string("screenshot_")
|
|
|
|
+ std::string(timetstamp_c);
|
2016-03-07 17:09:07 -05:00
|
|
|
std::string filename_ext = "." + g_settings->get("screenshot_format");
|
2015-03-31 02:13:42 -04:00
|
|
|
std::string filename;
|
|
|
|
|
2016-03-07 17:09:07 -05:00
|
|
|
u32 quality = (u32)g_settings->getS32("screenshot_quality");
|
|
|
|
quality = MYMIN(MYMAX(quality, 0), 100) / 100.0 * 255;
|
|
|
|
|
2015-03-31 02:13:42 -04:00
|
|
|
// Try to find a unique filename
|
|
|
|
unsigned serial = 0;
|
|
|
|
|
|
|
|
while (serial < SCREENSHOT_MAX_SERIAL_TRIES) {
|
2015-04-05 21:07:51 -04:00
|
|
|
filename = filename_base + (serial > 0 ? ("_" + itos(serial)) : "") + filename_ext;
|
2015-03-31 02:13:42 -04:00
|
|
|
std::ifstream tmp(filename.c_str());
|
|
|
|
if (!tmp.good())
|
|
|
|
break; // File did not apparently exist, we'll go with it
|
|
|
|
serial++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (serial == SCREENSHOT_MAX_SERIAL_TRIES) {
|
|
|
|
infostream << "Could not find suitable filename for screenshot" << std::endl;
|
|
|
|
} else {
|
|
|
|
irr::video::IImage* const image =
|
|
|
|
driver->createImage(video::ECF_R8G8B8, raw_image->getDimension());
|
|
|
|
|
|
|
|
if (image) {
|
|
|
|
raw_image->copyTo(image);
|
2015-03-24 12:42:31 -04:00
|
|
|
|
2014-12-12 16:31:29 -05:00
|
|
|
std::ostringstream sstr;
|
2016-03-07 17:09:07 -05:00
|
|
|
if (driver->writeImageToFile(image, filename.c_str(), quality)) {
|
2014-09-20 20:23:55 -04:00
|
|
|
sstr << "Saved screenshot to '" << filename << "'";
|
|
|
|
} else {
|
|
|
|
sstr << "Failed to save screenshot '" << filename << "'";
|
|
|
|
}
|
2015-03-04 11:48:07 -05:00
|
|
|
m_chat_queue.push(narrow_to_wide(sstr.str()));
|
2014-12-12 16:31:29 -05:00
|
|
|
infostream << sstr.str() << std::endl;
|
2014-09-20 20:23:55 -04:00
|
|
|
image->drop();
|
|
|
|
}
|
|
|
|
}
|
2015-03-31 02:13:42 -04:00
|
|
|
|
|
|
|
raw_image->drop();
|
2014-09-20 20:23:55 -04:00
|
|
|
}
|
|
|
|
|
2011-11-14 14:41:30 -05:00
|
|
|
// IGameDef interface
|
|
|
|
// Under envlock
|
2012-01-12 00:10:39 -05:00
|
|
|
IItemDefManager* Client::getItemDefManager()
|
2011-11-14 14:41:30 -05:00
|
|
|
{
|
2012-01-12 00:10:39 -05:00
|
|
|
return m_itemdef;
|
2011-11-14 14:41:30 -05:00
|
|
|
}
|
|
|
|
INodeDefManager* Client::getNodeDefManager()
|
|
|
|
{
|
|
|
|
return m_nodedef;
|
|
|
|
}
|
2011-11-16 19:28:46 -05:00
|
|
|
ICraftDefManager* Client::getCraftDefManager()
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
//return m_craftdef;
|
|
|
|
}
|
2011-11-14 14:41:30 -05:00
|
|
|
ITextureSource* Client::getTextureSource()
|
|
|
|
{
|
|
|
|
return m_tsrc;
|
|
|
|
}
|
2012-03-18 21:59:12 -04:00
|
|
|
IShaderSource* Client::getShaderSource()
|
|
|
|
{
|
|
|
|
return m_shsrc;
|
|
|
|
}
|
2014-10-20 23:12:15 -04:00
|
|
|
scene::ISceneManager* Client::getSceneManager()
|
|
|
|
{
|
|
|
|
return m_device->getSceneManager();
|
|
|
|
}
|
2011-11-16 06:03:28 -05:00
|
|
|
u16 Client::allocateUnknownNodeId(const std::string &name)
|
|
|
|
{
|
2015-03-06 05:21:51 -05:00
|
|
|
errorstream << "Client::allocateUnknownNodeId(): "
|
|
|
|
<< "Client cannot allocate node IDs" << std::endl;
|
|
|
|
FATAL_ERROR("Client allocated unknown node");
|
|
|
|
|
2011-11-16 06:03:28 -05:00
|
|
|
return CONTENT_IGNORE;
|
|
|
|
}
|
2012-03-23 06:05:17 -04:00
|
|
|
ISoundManager* Client::getSoundManager()
|
|
|
|
{
|
2012-03-23 09:29:30 -04:00
|
|
|
return m_sound;
|
2012-03-23 06:05:17 -04:00
|
|
|
}
|
2012-03-23 14:23:03 -04:00
|
|
|
MtEventManager* Client::getEventManager()
|
|
|
|
{
|
|
|
|
return m_event;
|
|
|
|
}
|
2011-11-14 14:41:30 -05:00
|
|
|
|
2015-01-05 12:34:59 -05:00
|
|
|
ParticleManager* Client::getParticleManager()
|
|
|
|
{
|
|
|
|
return &m_particle_manager;
|
|
|
|
}
|
|
|
|
|
2014-01-06 06:24:06 -05:00
|
|
|
scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
|
|
|
|
{
|
2015-05-19 02:24:14 -04:00
|
|
|
StringMap::const_iterator it = m_mesh_data.find(filename);
|
|
|
|
if (it == m_mesh_data.end()) {
|
|
|
|
errorstream << "Client::getMesh(): Mesh not found: \"" << filename
|
|
|
|
<< "\"" << std::endl;
|
2014-01-06 06:24:06 -05:00
|
|
|
return NULL;
|
|
|
|
}
|
2015-05-19 02:24:14 -04:00
|
|
|
const std::string &data = it->second;
|
2014-01-06 06:24:06 -05:00
|
|
|
scene::ISceneManager *smgr = m_device->getSceneManager();
|
|
|
|
|
|
|
|
// Create the mesh, remove it from cache and return it
|
|
|
|
// This allows unique vertex colors and other properties for each instance
|
|
|
|
Buffer<char> data_rw(data.c_str(), data.size()); // Const-incorrect Irrlicht
|
|
|
|
io::IFileSystem *irrfs = m_device->getFileSystem();
|
2014-02-04 18:17:57 -05:00
|
|
|
io::IReadFile *rfile = irrfs->createMemoryReadFile(
|
2014-01-06 06:24:06 -05:00
|
|
|
*data_rw, data_rw.getSize(), filename.c_str());
|
2015-03-06 05:21:51 -05:00
|
|
|
FATAL_ERROR_IF(!rfile, "Could not create/open RAM file");
|
2014-02-04 18:17:57 -05:00
|
|
|
|
2014-01-06 06:24:06 -05:00
|
|
|
scene::IAnimatedMesh *mesh = smgr->getMesh(rfile);
|
|
|
|
rfile->drop();
|
|
|
|
// NOTE: By playing with Irrlicht refcounts, maybe we could cache a bunch
|
|
|
|
// of uniquely named instances and re-use them
|
|
|
|
mesh->grab();
|
|
|
|
smgr->getMeshCache()->removeMesh(mesh);
|
|
|
|
return mesh;
|
|
|
|
}
|