2010-11-29 19:13:04 +01:00
|
|
|
/*
|
2013-02-24 18:40:43 +01:00
|
|
|
Minetest
|
2013-02-24 19:38:45 +01:00
|
|
|
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
|
2010-11-29 19:13:04 +01:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
2012-06-05 16:56:56 +02:00
|
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
2010-11-29 19:13:04 +01:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2012-06-05 16:56:56 +02:00
|
|
|
GNU Lesser General Public License for more details.
|
2010-11-29 19:13:04 +01:00
|
|
|
|
2012-06-05 16:56:56 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
2010-11-29 19:13:04 +01:00
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
#ifndef CLIENT_HEADER
|
|
|
|
#define CLIENT_HEADER
|
|
|
|
|
[Patch 2/4] Network rework: packet writing, sending and cleanups
NetworkPacket.cpp:
* Remove some deprecated functions, we must use streaming interface
* m_data converted from u8* to std::vector<u8>
* Add an exporter to forge packet to Connection object
* implement operator << std::wstring. n
* implement operator << std::string
* dynamic resize when write packet content.
* fix string writing and performances.
* create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Reliability
* Transmit channel
* Implement putRawString for some ugly char (_INIT packet), and use it.
* Many packet read and write migrated
* Implement oldForgePacket to interface writing with current connection
* fix U8/char/bool writing
* fix string writing and performances.
* add some missing functions
* Use v3s16 read instead of reading x,y,z separately
* Add irr::video::SColor support into packets
* Add some missing handlers
* Add a template function to increase offset
* Throw a serialization error on packet reading (must be improved)
PacketFactories:
* Create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Create ClientCommandFactory, used by server to get useful informations about packet processing (sending).
Client.cpp:
* implement NetworkPacket ::Send interface.
* Move packet handlers to a dedicated file
* Remove Client::Send(SharedBuffer)
Server.cpp:
* implement NetworkPacket ::Send interface.
* Rewrite all packets using NetworkPacket
* Move packet handlers to a dedicated file
* Remove Server::Send(SharedBuffer)
ClientIface.cpp:
* Remove sendToAll(SharedBuffer<u8>)
Connection.hpp rework:
* Remove duplicate include
* Remove duplicate negation
* Remove a useless variable
* Improve code performance by using a m_peers_list instead of scanning m_peers map
* Remove Connection::Send(SharedBuffer)
* Fix useafterfree into NetworkPacket Sending
* Remove unused Connection::sendToAll
Test.cpp:
* Remove dead code
* Update tests to use NetworkPackets
Misc:
* add new wrappers to Send packets in client, using NetworkPacket
* Add NetworkPacket methods for Connection
* coding style fix
* dead code since changes cleanup
* Use v3s16 read instead of reading x,y,z separately in some packets
* Use different files to handle packets received by client and server
* Cleanup: Remove useless includes
ok @Zeno-
Tested by @Zeno- @VanessaE and @nerzhul on running servers
2015-01-16 11:37:49 +01:00
|
|
|
#include "network/connection.h"
|
2010-11-27 00:02:21 +01:00
|
|
|
#include "environment.h"
|
2012-06-17 03:00:31 +02:00
|
|
|
#include "irrlichttypes_extrabloated.h"
|
2013-09-16 05:00:01 +02:00
|
|
|
#include "jthread/jmutex.h"
|
2010-11-27 00:02:21 +01:00
|
|
|
#include <ostream>
|
2013-08-11 04:09:45 +02:00
|
|
|
#include <map>
|
2012-03-13 18:56:12 +01:00
|
|
|
#include <set>
|
|
|
|
#include <vector>
|
2011-02-20 23:45:14 +01:00
|
|
|
#include "clientobject.h"
|
2011-11-13 23:19:48 +01:00
|
|
|
#include "gamedef.h"
|
2011-12-06 14:21:56 +01:00
|
|
|
#include "inventorymanager.h"
|
2012-03-31 15:23:26 +02:00
|
|
|
#include "localplayer.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-29 05:22:18 +02:00
|
|
|
#include "hud.h"
|
2012-12-31 19:33:36 +01:00
|
|
|
#include "particles.h"
|
[Patch 2/4] Network rework: packet writing, sending and cleanups
NetworkPacket.cpp:
* Remove some deprecated functions, we must use streaming interface
* m_data converted from u8* to std::vector<u8>
* Add an exporter to forge packet to Connection object
* implement operator << std::wstring. n
* implement operator << std::string
* dynamic resize when write packet content.
* fix string writing and performances.
* create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Reliability
* Transmit channel
* Implement putRawString for some ugly char (_INIT packet), and use it.
* Many packet read and write migrated
* Implement oldForgePacket to interface writing with current connection
* fix U8/char/bool writing
* fix string writing and performances.
* add some missing functions
* Use v3s16 read instead of reading x,y,z separately
* Add irr::video::SColor support into packets
* Add some missing handlers
* Add a template function to increase offset
* Throw a serialization error on packet reading (must be improved)
PacketFactories:
* Create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Create ClientCommandFactory, used by server to get useful informations about packet processing (sending).
Client.cpp:
* implement NetworkPacket ::Send interface.
* Move packet handlers to a dedicated file
* Remove Client::Send(SharedBuffer)
Server.cpp:
* implement NetworkPacket ::Send interface.
* Rewrite all packets using NetworkPacket
* Move packet handlers to a dedicated file
* Remove Server::Send(SharedBuffer)
ClientIface.cpp:
* Remove sendToAll(SharedBuffer<u8>)
Connection.hpp rework:
* Remove duplicate include
* Remove duplicate negation
* Remove a useless variable
* Improve code performance by using a m_peers_list instead of scanning m_peers map
* Remove Connection::Send(SharedBuffer)
* Fix useafterfree into NetworkPacket Sending
* Remove unused Connection::sendToAll
Test.cpp:
* Remove dead code
* Update tests to use NetworkPackets
Misc:
* add new wrappers to Send packets in client, using NetworkPacket
* Add NetworkPacket methods for Connection
* coding style fix
* dead code since changes cleanup
* Use v3s16 read instead of reading x,y,z separately in some packets
* Use different files to handle packets received by client and server
* Cleanup: Remove useless includes
ok @Zeno-
Tested by @Zeno- @VanessaE and @nerzhul on running servers
2015-01-16 11:37:49 +01:00
|
|
|
#include "network/networkpacket.h"
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-06-26 01:34:36 +02:00
|
|
|
struct MeshMakeData;
|
2012-03-13 18:56:12 +01:00
|
|
|
class MapBlockMesh;
|
2011-11-15 20:00:39 +01:00
|
|
|
class IWritableTextureSource;
|
2012-03-19 02:59:12 +01:00
|
|
|
class IWritableShaderSource;
|
2012-01-12 06:10:39 +01:00
|
|
|
class IWritableItemDefManager;
|
2011-11-14 20:41:30 +01:00
|
|
|
class IWritableNodeDefManager;
|
2011-11-17 01:28:46 +01:00
|
|
|
//class IWritableCraftDefManager;
|
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-29 05:22:18 +02:00
|
|
|
class ClientMediaDownloader;
|
2012-03-15 23:25:18 +01:00
|
|
|
struct MapDrawControl;
|
2012-03-23 19:23:03 +01:00
|
|
|
class MtEventManager;
|
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-29 05:22:18 +02:00
|
|
|
struct PointedThing;
|
2014-10-09 14:02:02 +02:00
|
|
|
class Database;
|
|
|
|
class Server;
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-04-04 01:05:12 +02:00
|
|
|
struct QueuedMeshUpdate
|
|
|
|
{
|
|
|
|
v3s16 p;
|
|
|
|
MeshMakeData *data;
|
|
|
|
bool ack_block_to_server;
|
|
|
|
|
2011-06-26 01:34:36 +02:00
|
|
|
QueuedMeshUpdate();
|
|
|
|
~QueuedMeshUpdate();
|
2011-04-04 01:05:12 +02:00
|
|
|
};
|
|
|
|
|
2014-02-13 20:17:42 +01:00
|
|
|
enum LocalClientState {
|
|
|
|
LC_Created,
|
|
|
|
LC_Init,
|
|
|
|
LC_Ready
|
|
|
|
};
|
|
|
|
|
2011-04-04 01:05:12 +02:00
|
|
|
/*
|
|
|
|
A thread-safe queue of mesh update tasks
|
|
|
|
*/
|
|
|
|
class MeshUpdateQueue
|
|
|
|
{
|
|
|
|
public:
|
2011-06-26 01:34:36 +02:00
|
|
|
MeshUpdateQueue();
|
2011-04-04 01:05:12 +02:00
|
|
|
|
2011-06-26 01:34:36 +02:00
|
|
|
~MeshUpdateQueue();
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2011-04-04 01:05:12 +02:00
|
|
|
/*
|
|
|
|
peer_id=0 adds with nobody to send to
|
|
|
|
*/
|
2012-03-13 18:56:12 +01:00
|
|
|
void addBlock(v3s16 p, MeshMakeData *data,
|
|
|
|
bool ack_block_to_server, bool urgent);
|
2011-04-04 01:05:12 +02:00
|
|
|
|
|
|
|
// Returned pointer must be deleted
|
|
|
|
// Returns NULL if queue is empty
|
2011-06-26 01:34:36 +02:00
|
|
|
QueuedMeshUpdate * pop();
|
2011-04-04 01:05:12 +02:00
|
|
|
|
|
|
|
u32 size()
|
|
|
|
{
|
|
|
|
JMutexAutoLock lock(m_mutex);
|
|
|
|
return m_queue.size();
|
|
|
|
}
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2011-04-04 01:05:12 +02:00
|
|
|
private:
|
2012-03-13 18:56:12 +01:00
|
|
|
std::vector<QueuedMeshUpdate*> m_queue;
|
|
|
|
std::set<v3s16> m_urgents;
|
2011-04-04 01:05:12 +02:00
|
|
|
JMutex m_mutex;
|
|
|
|
};
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-04-04 01:05:12 +02:00
|
|
|
struct MeshUpdateResult
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2011-04-04 01:05:12 +02:00
|
|
|
v3s16 p;
|
2012-03-13 18:56:12 +01:00
|
|
|
MapBlockMesh *mesh;
|
2011-04-04 01:05:12 +02:00
|
|
|
bool ack_block_to_server;
|
|
|
|
|
|
|
|
MeshUpdateResult():
|
|
|
|
p(-1338,-1338,-1338),
|
|
|
|
mesh(NULL),
|
|
|
|
ack_block_to_server(false)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
};
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2013-12-03 23:32:03 +01:00
|
|
|
class MeshUpdateThread : public JThread
|
2011-04-04 01:05:12 +02:00
|
|
|
{
|
2010-11-27 00:02:21 +01:00
|
|
|
public:
|
|
|
|
|
2011-11-14 20:41:30 +01:00
|
|
|
MeshUpdateThread(IGameDef *gamedef):
|
|
|
|
m_gamedef(gamedef)
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void * Thread();
|
2011-04-04 01:05:12 +02:00
|
|
|
|
|
|
|
MeshUpdateQueue m_queue_in;
|
|
|
|
|
|
|
|
MutexedQueue<MeshUpdateResult> m_queue_out;
|
2011-11-13 23:19:48 +01:00
|
|
|
|
2011-11-14 20:41:30 +01:00
|
|
|
IGameDef *m_gamedef;
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2014-01-26 11:40:21 +01:00
|
|
|
v3s16 m_camera_offset;
|
2010-11-27 00:02:21 +01:00
|
|
|
};
|
|
|
|
|
2011-04-21 18:35:17 +02:00
|
|
|
enum ClientEventType
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
2011-04-21 18:35:17 +02:00
|
|
|
CE_NONE,
|
|
|
|
CE_PLAYER_DAMAGE,
|
2011-10-15 13:46:59 +02:00
|
|
|
CE_PLAYER_FORCE_MOVE,
|
|
|
|
CE_DEATHSCREEN,
|
2013-01-23 18:32:02 +01:00
|
|
|
CE_SHOW_FORMSPEC,
|
|
|
|
CE_SPAWN_PARTICLE,
|
|
|
|
CE_ADD_PARTICLESPAWNER,
|
2013-04-11 20:23:38 +02:00
|
|
|
CE_DELETE_PARTICLESPAWNER,
|
|
|
|
CE_HUDADD,
|
|
|
|
CE_HUDRM,
|
2013-05-02 22:52:50 +02:00
|
|
|
CE_HUDCHANGE,
|
|
|
|
CE_SET_SKY,
|
2013-10-18 10:53:19 +02:00
|
|
|
CE_OVERRIDE_DAY_NIGHT_RATIO,
|
2011-04-21 18:35:17 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ClientEvent
|
|
|
|
{
|
|
|
|
ClientEventType type;
|
|
|
|
union{
|
2015-01-19 05:29:19 +01:00
|
|
|
//struct{
|
|
|
|
//} none;
|
2011-04-21 18:35:17 +02:00
|
|
|
struct{
|
|
|
|
u8 amount;
|
|
|
|
} player_damage;
|
|
|
|
struct{
|
|
|
|
f32 pitch;
|
|
|
|
f32 yaw;
|
|
|
|
} player_force_move;
|
2011-10-15 13:46:59 +02:00
|
|
|
struct{
|
|
|
|
bool set_camera_point_target;
|
|
|
|
f32 camera_point_target_x;
|
|
|
|
f32 camera_point_target_y;
|
|
|
|
f32 camera_point_target_z;
|
|
|
|
} deathscreen;
|
2013-01-02 20:45:04 +01:00
|
|
|
struct{
|
2013-04-14 00:20:22 +02:00
|
|
|
std::string *formspec;
|
|
|
|
std::string *formname;
|
2013-01-02 20:45:04 +01:00
|
|
|
} show_formspec;
|
2015-01-19 05:29:19 +01:00
|
|
|
//struct{
|
|
|
|
//} textures_updated;
|
2013-01-23 18:32:02 +01:00
|
|
|
struct{
|
|
|
|
v3f *pos;
|
|
|
|
v3f *vel;
|
|
|
|
v3f *acc;
|
|
|
|
f32 expirationtime;
|
|
|
|
f32 size;
|
|
|
|
bool collisiondetection;
|
2013-04-22 20:35:10 +02:00
|
|
|
bool vertical;
|
2013-01-23 18:32:02 +01:00
|
|
|
std::string *texture;
|
|
|
|
} spawn_particle;
|
|
|
|
struct{
|
|
|
|
u16 amount;
|
|
|
|
f32 spawntime;
|
|
|
|
v3f *minpos;
|
|
|
|
v3f *maxpos;
|
|
|
|
v3f *minvel;
|
|
|
|
v3f *maxvel;
|
|
|
|
v3f *minacc;
|
|
|
|
v3f *maxacc;
|
|
|
|
f32 minexptime;
|
|
|
|
f32 maxexptime;
|
|
|
|
f32 minsize;
|
|
|
|
f32 maxsize;
|
|
|
|
bool collisiondetection;
|
2013-04-22 20:35:10 +02:00
|
|
|
bool vertical;
|
2013-01-23 18:32:02 +01:00
|
|
|
std::string *texture;
|
|
|
|
u32 id;
|
|
|
|
} add_particlespawner;
|
|
|
|
struct{
|
|
|
|
u32 id;
|
|
|
|
} delete_particlespawner;
|
2013-04-11 20:23:38 +02:00
|
|
|
struct{
|
2013-04-14 00:20:22 +02:00
|
|
|
u32 id;
|
|
|
|
u8 type;
|
|
|
|
v2f *pos;
|
|
|
|
std::string *name;
|
|
|
|
v2f *scale;
|
|
|
|
std::string *text;
|
|
|
|
u32 number;
|
|
|
|
u32 item;
|
|
|
|
u32 dir;
|
2013-04-22 11:53:55 +02:00
|
|
|
v2f *align;
|
2013-04-23 01:47:59 +02:00
|
|
|
v2f *offset;
|
2014-01-26 21:31:59 +01:00
|
|
|
v3f *world_pos;
|
2014-04-28 23:41:27 +02:00
|
|
|
v2s32 * size;
|
2013-04-11 20:23:38 +02:00
|
|
|
} hudadd;
|
|
|
|
struct{
|
|
|
|
u32 id;
|
|
|
|
} hudrm;
|
|
|
|
struct{
|
|
|
|
u32 id;
|
2013-04-14 00:20:22 +02:00
|
|
|
HudElementStat stat;
|
|
|
|
v2f *v2fdata;
|
|
|
|
std::string *sdata;
|
2013-04-11 20:23:38 +02:00
|
|
|
u32 data;
|
2014-01-26 21:31:59 +01:00
|
|
|
v3f *v3fdata;
|
2014-04-28 23:41:27 +02:00
|
|
|
v2s32 * v2s32data;
|
2013-04-11 20:23:38 +02:00
|
|
|
} hudchange;
|
2013-05-02 22:52:50 +02:00
|
|
|
struct{
|
|
|
|
video::SColor *bgcolor;
|
|
|
|
std::string *type;
|
|
|
|
std::vector<std::string> *params;
|
|
|
|
} set_sky;
|
2013-10-18 10:53:19 +02:00
|
|
|
struct{
|
|
|
|
bool do_override;
|
|
|
|
float ratio_f;
|
|
|
|
} override_day_night_ratio;
|
2011-04-21 18:35:17 +02:00
|
|
|
};
|
2010-11-27 00:02:21 +01:00
|
|
|
};
|
|
|
|
|
2013-08-11 04:09:45 +02:00
|
|
|
/*
|
|
|
|
Packet counter
|
|
|
|
*/
|
|
|
|
|
|
|
|
class PacketCounter
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
PacketCounter()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void add(u16 command)
|
|
|
|
{
|
|
|
|
std::map<u16, u16>::iterator n = m_packets.find(command);
|
|
|
|
if(n == m_packets.end())
|
|
|
|
{
|
|
|
|
m_packets[command] = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
n->second++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void clear()
|
|
|
|
{
|
|
|
|
for(std::map<u16, u16>::iterator
|
|
|
|
i = m_packets.begin();
|
|
|
|
i != m_packets.end(); ++i)
|
|
|
|
{
|
|
|
|
i->second = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void print(std::ostream &o)
|
|
|
|
{
|
|
|
|
for(std::map<u16, u16>::iterator
|
|
|
|
i = m_packets.begin();
|
|
|
|
i != m_packets.end(); ++i)
|
|
|
|
{
|
|
|
|
o<<"cmd "<<i->first
|
|
|
|
<<" count "<<i->second
|
|
|
|
<<std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
// command, count
|
|
|
|
std::map<u16, u16> m_packets;
|
|
|
|
};
|
|
|
|
|
2011-11-13 23:19:48 +01:00
|
|
|
class Client : public con::PeerHandler, public InventoryManager, public IGameDef
|
2010-11-27 00:02:21 +01:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
/*
|
2011-04-04 01:05:12 +02:00
|
|
|
NOTE: Nothing is thread-safe here.
|
2010-11-27 00:02:21 +01:00
|
|
|
*/
|
2011-04-04 01:05:12 +02:00
|
|
|
|
2010-12-19 18:11:05 +01:00
|
|
|
Client(
|
|
|
|
IrrlichtDevice *device,
|
|
|
|
const char *playername,
|
2011-05-20 21:28:03 +02:00
|
|
|
std::string password,
|
2011-11-13 23:19:48 +01:00
|
|
|
MapDrawControl &control,
|
2011-11-14 20:41:30 +01:00
|
|
|
IWritableTextureSource *tsrc,
|
2012-03-19 02:59:12 +01:00
|
|
|
IWritableShaderSource *shsrc,
|
2012-01-12 06:10:39 +01:00
|
|
|
IWritableItemDefManager *itemdef,
|
2012-03-23 14:29:30 +01:00
|
|
|
IWritableNodeDefManager *nodedef,
|
2012-03-23 19:23:03 +01:00
|
|
|
ISoundManager *sound,
|
2013-06-23 09:31:22 +02:00
|
|
|
MtEventManager *event,
|
|
|
|
bool ipv6
|
2011-11-13 23:19:48 +01:00
|
|
|
);
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
~Client();
|
2014-01-06 12:45:42 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
request all threads managed by client to be stopped
|
|
|
|
*/
|
|
|
|
void Stop();
|
|
|
|
|
|
|
|
|
|
|
|
bool isShutdown();
|
2015-01-30 15:33:23 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
/*
|
|
|
|
The name of the local player should already be set when
|
|
|
|
calling this, as it is sent in the initialization.
|
|
|
|
*/
|
2015-01-30 15:33:23 +01:00
|
|
|
void connect(Address address,
|
|
|
|
const std::string &address_name,
|
|
|
|
bool is_local_server);
|
2014-02-13 20:17:42 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
/*
|
|
|
|
Stuff that references the environment is valid only as
|
|
|
|
long as this is not called. (eg. Players)
|
|
|
|
If this throws a PeerNotFoundException, the connection has
|
|
|
|
timed out.
|
|
|
|
*/
|
|
|
|
void step(float dtime);
|
|
|
|
|
2015-01-12 17:01:41 +01:00
|
|
|
/*
|
|
|
|
* Command Handlers
|
|
|
|
*/
|
|
|
|
|
[Patch 2/4] Network rework: packet writing, sending and cleanups
NetworkPacket.cpp:
* Remove some deprecated functions, we must use streaming interface
* m_data converted from u8* to std::vector<u8>
* Add an exporter to forge packet to Connection object
* implement operator << std::wstring. n
* implement operator << std::string
* dynamic resize when write packet content.
* fix string writing and performances.
* create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Reliability
* Transmit channel
* Implement putRawString for some ugly char (_INIT packet), and use it.
* Many packet read and write migrated
* Implement oldForgePacket to interface writing with current connection
* fix U8/char/bool writing
* fix string writing and performances.
* add some missing functions
* Use v3s16 read instead of reading x,y,z separately
* Add irr::video::SColor support into packets
* Add some missing handlers
* Add a template function to increase offset
* Throw a serialization error on packet reading (must be improved)
PacketFactories:
* Create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Create ClientCommandFactory, used by server to get useful informations about packet processing (sending).
Client.cpp:
* implement NetworkPacket ::Send interface.
* Move packet handlers to a dedicated file
* Remove Client::Send(SharedBuffer)
Server.cpp:
* implement NetworkPacket ::Send interface.
* Rewrite all packets using NetworkPacket
* Move packet handlers to a dedicated file
* Remove Server::Send(SharedBuffer)
ClientIface.cpp:
* Remove sendToAll(SharedBuffer<u8>)
Connection.hpp rework:
* Remove duplicate include
* Remove duplicate negation
* Remove a useless variable
* Improve code performance by using a m_peers_list instead of scanning m_peers map
* Remove Connection::Send(SharedBuffer)
* Fix useafterfree into NetworkPacket Sending
* Remove unused Connection::sendToAll
Test.cpp:
* Remove dead code
* Update tests to use NetworkPackets
Misc:
* add new wrappers to Send packets in client, using NetworkPacket
* Add NetworkPacket methods for Connection
* coding style fix
* dead code since changes cleanup
* Use v3s16 read instead of reading x,y,z separately in some packets
* Use different files to handle packets received by client and server
* Cleanup: Remove useless includes
ok @Zeno-
Tested by @Zeno- @VanessaE and @nerzhul on running servers
2015-01-16 11:37:49 +01:00
|
|
|
void handleCommand(NetworkPacket* pkt);
|
|
|
|
|
|
|
|
void handleCommand_Null(NetworkPacket* pkt) {};
|
|
|
|
void handleCommand_Deprecated(NetworkPacket* pkt);
|
|
|
|
void handleCommand_Init(NetworkPacket* pkt);
|
|
|
|
void handleCommand_AccessDenied(NetworkPacket* pkt);
|
|
|
|
void handleCommand_RemoveNode(NetworkPacket* pkt);
|
|
|
|
void handleCommand_AddNode(NetworkPacket* pkt);
|
|
|
|
void handleCommand_BlockData(NetworkPacket* pkt);
|
|
|
|
void handleCommand_Inventory(NetworkPacket* pkt);
|
|
|
|
void handleCommand_TimeOfDay(NetworkPacket* pkt);
|
|
|
|
void handleCommand_ChatMessage(NetworkPacket* pkt);
|
|
|
|
void handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt);
|
|
|
|
void handleCommand_ActiveObjectMessages(NetworkPacket* pkt);
|
|
|
|
void handleCommand_Movement(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HP(NetworkPacket* pkt);
|
|
|
|
void handleCommand_Breath(NetworkPacket* pkt);
|
|
|
|
void handleCommand_MovePlayer(NetworkPacket* pkt);
|
|
|
|
void handleCommand_PlayerItem(NetworkPacket* pkt);
|
|
|
|
void handleCommand_DeathScreen(NetworkPacket* pkt);
|
|
|
|
void handleCommand_AnnounceMedia(NetworkPacket* pkt);
|
|
|
|
void handleCommand_Media(NetworkPacket* pkt);
|
|
|
|
void handleCommand_ToolDef(NetworkPacket* pkt);
|
|
|
|
void handleCommand_NodeDef(NetworkPacket* pkt);
|
|
|
|
void handleCommand_CraftItemDef(NetworkPacket* pkt);
|
|
|
|
void handleCommand_ItemDef(NetworkPacket* pkt);
|
|
|
|
void handleCommand_PlaySound(NetworkPacket* pkt);
|
|
|
|
void handleCommand_StopSound(NetworkPacket* pkt);
|
|
|
|
void handleCommand_Privileges(NetworkPacket* pkt);
|
|
|
|
void handleCommand_InventoryFormSpec(NetworkPacket* pkt);
|
|
|
|
void handleCommand_DetachedInventory(NetworkPacket* pkt);
|
|
|
|
void handleCommand_ShowFormSpec(NetworkPacket* pkt);
|
|
|
|
void handleCommand_SpawnParticle(NetworkPacket* pkt);
|
|
|
|
void handleCommand_AddParticleSpawner(NetworkPacket* pkt);
|
|
|
|
void handleCommand_DeleteParticleSpawner(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HudAdd(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HudRemove(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HudChange(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HudSetFlags(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HudSetParam(NetworkPacket* pkt);
|
|
|
|
void handleCommand_HudSetSky(NetworkPacket* pkt);
|
|
|
|
void handleCommand_OverrideDayNightRatio(NetworkPacket* pkt);
|
|
|
|
void handleCommand_LocalPlayerAnimations(NetworkPacket* pkt);
|
|
|
|
void handleCommand_EyeOffset(NetworkPacket* pkt);
|
2015-01-12 17:01:41 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
void ProcessData(u8 *data, u32 datasize, u16 sender_peer_id);
|
2015-01-12 17:01:41 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Returns true if something was received
|
2010-12-24 02:08:05 +01:00
|
|
|
bool AsyncProcessPacket();
|
2010-11-27 00:02:21 +01:00
|
|
|
bool AsyncProcessData();
|
[Patch 2/4] Network rework: packet writing, sending and cleanups
NetworkPacket.cpp:
* Remove some deprecated functions, we must use streaming interface
* m_data converted from u8* to std::vector<u8>
* Add an exporter to forge packet to Connection object
* implement operator << std::wstring. n
* implement operator << std::string
* dynamic resize when write packet content.
* fix string writing and performances.
* create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Reliability
* Transmit channel
* Implement putRawString for some ugly char (_INIT packet), and use it.
* Many packet read and write migrated
* Implement oldForgePacket to interface writing with current connection
* fix U8/char/bool writing
* fix string writing and performances.
* add some missing functions
* Use v3s16 read instead of reading x,y,z separately
* Add irr::video::SColor support into packets
* Add some missing handlers
* Add a template function to increase offset
* Throw a serialization error on packet reading (must be improved)
PacketFactories:
* Create ServerCommandFactory, used by client to get useful informations about packet processing (sending).
* Create ClientCommandFactory, used by server to get useful informations about packet processing (sending).
Client.cpp:
* implement NetworkPacket ::Send interface.
* Move packet handlers to a dedicated file
* Remove Client::Send(SharedBuffer)
Server.cpp:
* implement NetworkPacket ::Send interface.
* Rewrite all packets using NetworkPacket
* Move packet handlers to a dedicated file
* Remove Server::Send(SharedBuffer)
ClientIface.cpp:
* Remove sendToAll(SharedBuffer<u8>)
Connection.hpp rework:
* Remove duplicate include
* Remove duplicate negation
* Remove a useless variable
* Improve code performance by using a m_peers_list instead of scanning m_peers map
* Remove Connection::Send(SharedBuffer)
* Fix useafterfree into NetworkPacket Sending
* Remove unused Connection::sendToAll
Test.cpp:
* Remove dead code
* Update tests to use NetworkPackets
Misc:
* add new wrappers to Send packets in client, using NetworkPacket
* Add NetworkPacket methods for Connection
* coding style fix
* dead code since changes cleanup
* Use v3s16 read instead of reading x,y,z separately in some packets
* Use different files to handle packets received by client and server
* Cleanup: Remove useless includes
ok @Zeno-
Tested by @Zeno- @VanessaE and @nerzhul on running servers
2015-01-16 11:37:49 +01:00
|
|
|
void Send(NetworkPacket* pkt);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2011-11-29 16:15:18 +01:00
|
|
|
void interact(u8 action, const PointedThing& pointed);
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2012-06-01 19:51:15 +02:00
|
|
|
void sendNodemetaFields(v3s16 p, const std::string &formname,
|
|
|
|
const std::map<std::string, std::string> &fields);
|
2012-07-22 16:10:58 +02:00
|
|
|
void sendInventoryFields(const std::string &formname,
|
|
|
|
const std::map<std::string, std::string> &fields);
|
2010-12-22 15:30:23 +01:00
|
|
|
void sendInventoryAction(InventoryAction *a);
|
2010-12-23 21:35:53 +01:00
|
|
|
void sendChatMessage(const std::wstring &message);
|
2014-02-27 21:12:59 +01:00
|
|
|
void sendChangePassword(const std::wstring &oldpassword,
|
|
|
|
const std::wstring &newpassword);
|
2011-04-21 18:35:17 +02:00
|
|
|
void sendDamage(u8 damage);
|
2013-07-19 19:50:33 +02:00
|
|
|
void sendBreath(u16 breath);
|
2011-10-15 13:46:59 +02:00
|
|
|
void sendRespawn();
|
2014-02-13 20:17:42 +01:00
|
|
|
void sendReady();
|
2012-03-15 22:54:10 +01:00
|
|
|
|
|
|
|
ClientEnvironment& getEnv()
|
|
|
|
{ return m_env; }
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2012-03-15 22:54:10 +01:00
|
|
|
// Causes urgent mesh updates (unlike Map::add/removeNodeWithEvent)
|
2010-12-23 21:35:53 +01:00
|
|
|
void removeNode(v3s16 p);
|
2013-11-23 15:35:49 +01:00
|
|
|
void addNode(v3s16 p, MapNode n, bool remove_metadata = true);
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
void setPlayerControl(PlayerControl &control);
|
2011-08-10 18:31:44 +02:00
|
|
|
|
|
|
|
void selectPlayerItem(u16 item);
|
2011-11-29 16:15:18 +01:00
|
|
|
u16 getPlayerItem() const
|
|
|
|
{ return m_playeritem; }
|
2011-08-10 18:31:44 +02:00
|
|
|
|
2010-11-27 00:02:21 +01: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 getLocalInventoryUpdated();
|
|
|
|
// Copies the inventory of the local player to parameter
|
|
|
|
void getLocalInventory(Inventory &dst);
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2011-12-06 14:21:56 +01:00
|
|
|
/* InventoryManager interface */
|
|
|
|
Inventory* getInventory(const InventoryLocation &loc);
|
2011-04-04 14:13:19 +02:00
|
|
|
void inventoryAction(InventoryAction *a);
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Gets closest object pointed by the shootline
|
2011-04-07 23:47:14 +02:00
|
|
|
// Returns NULL if not found
|
|
|
|
ClientActiveObject * getSelectedActiveObject(
|
|
|
|
f32 max_d,
|
|
|
|
v3f from_pos_f_on_map,
|
|
|
|
core::line3d<f32> shootline_on_map
|
|
|
|
);
|
|
|
|
|
2013-03-25 19:13:25 +01:00
|
|
|
std::list<std::string> getConnectedPlayerNames();
|
2011-12-03 09:01:14 +01:00
|
|
|
|
2012-03-13 18:56:12 +01:00
|
|
|
float getAnimationTime();
|
|
|
|
|
|
|
|
int getCrackLevel();
|
|
|
|
void setCrack(int level, v3s16 pos);
|
|
|
|
|
2014-12-01 13:05:36 +01:00
|
|
|
void setHighlighted(v3s16 pos, bool show_higlighted);
|
2014-09-16 12:38:37 +02:00
|
|
|
v3s16 getHighlighted(){ return m_highlighted_pos; }
|
|
|
|
|
2011-04-21 18:35:17 +02:00
|
|
|
u16 getHP();
|
2013-06-19 16:30:22 +02:00
|
|
|
u16 getBreath();
|
2011-04-21 18:35:17 +02:00
|
|
|
|
2012-03-31 15:23:26 +02:00
|
|
|
bool checkPrivilege(const std::string &priv)
|
|
|
|
{ return (m_privileges.count(priv) != 0); }
|
2010-12-23 21:35:53 +01:00
|
|
|
|
2011-12-03 09:01:14 +01:00
|
|
|
bool getChatMessage(std::wstring &message);
|
|
|
|
void typeChatMessage(const std::wstring& message);
|
2010-12-23 21:35:53 +01:00
|
|
|
|
2011-02-28 01:01:40 +01:00
|
|
|
u64 getMapSeed(){ return m_map_seed; }
|
|
|
|
|
2012-03-13 18:56:12 +01:00
|
|
|
void addUpdateMeshTask(v3s16 blockpos, bool ack_to_server=false, bool urgent=false);
|
2011-04-04 01:05:12 +02:00
|
|
|
// Including blocks at appropriate edges
|
2012-03-13 18:56:12 +01:00
|
|
|
void addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server=false, bool urgent=false);
|
|
|
|
void addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server=false, bool urgent=false);
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2014-04-06 15:12:04 +02:00
|
|
|
void updateCameraOffset(v3s16 camera_offset)
|
|
|
|
{ m_mesh_update_thread.m_camera_offset = camera_offset; }
|
2011-04-04 01:05:12 +02:00
|
|
|
|
2011-04-21 18:35:17 +02:00
|
|
|
// Get event from queue. CE_NONE is returned if queue is empty.
|
|
|
|
ClientEvent getClientEvent();
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2011-11-15 22:58:56 +01:00
|
|
|
bool accessDenied()
|
2011-11-15 12:13:18 +01:00
|
|
|
{ return m_access_denied; }
|
2011-05-20 21:28:03 +02:00
|
|
|
|
2011-11-15 22:58:56 +01:00
|
|
|
std::wstring accessDeniedReason()
|
2011-11-15 12:13:18 +01:00
|
|
|
{ return m_access_denied_reason; }
|
2011-11-15 22:58:56 +01:00
|
|
|
|
2012-01-12 06:10:39 +01:00
|
|
|
bool itemdefReceived()
|
|
|
|
{ return m_itemdef_received; }
|
2011-11-15 22:58:56 +01:00
|
|
|
bool nodedefReceived()
|
|
|
|
{ return m_nodedef_received; }
|
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-29 05:22:18 +02:00
|
|
|
bool mediaReceived()
|
|
|
|
{ return m_media_downloader == NULL; }
|
|
|
|
|
|
|
|
float mediaReceiveProgress();
|
|
|
|
|
2013-05-11 16:02:41 +02:00
|
|
|
void afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font);
|
2012-01-12 06:10:39 +01:00
|
|
|
|
2011-10-17 16:18:50 +02:00
|
|
|
float getRTT(void);
|
2014-04-26 01:15:46 +02:00
|
|
|
float getCurRate(void);
|
|
|
|
float getAvgRate(void);
|
2011-10-17 16:18:50 +02:00
|
|
|
|
2011-11-13 23:19:48 +01:00
|
|
|
// IGameDef interface
|
2012-01-12 06:10:39 +01:00
|
|
|
virtual IItemDefManager* getItemDefManager();
|
2011-11-14 20:41:30 +01:00
|
|
|
virtual INodeDefManager* getNodeDefManager();
|
2011-11-17 01:28:46 +01:00
|
|
|
virtual ICraftDefManager* getCraftDefManager();
|
2011-11-14 20:41:30 +01:00
|
|
|
virtual ITextureSource* getTextureSource();
|
2012-03-19 02:59:12 +01:00
|
|
|
virtual IShaderSource* getShaderSource();
|
2014-10-21 05:12:15 +02:00
|
|
|
virtual scene::ISceneManager* getSceneManager();
|
2011-11-16 12:03:28 +01:00
|
|
|
virtual u16 allocateUnknownNodeId(const std::string &name);
|
2012-03-23 11:05:17 +01:00
|
|
|
virtual ISoundManager* getSoundManager();
|
2012-03-23 19:23:03 +01:00
|
|
|
virtual MtEventManager* getEventManager();
|
2015-01-05 18:34:59 +01:00
|
|
|
virtual ParticleManager* getParticleManager();
|
2012-03-31 15:23:26 +02:00
|
|
|
virtual bool checkLocalPrivilege(const std::string &priv)
|
|
|
|
{ return checkPrivilege(priv); }
|
2014-01-06 12:24:06 +01:00
|
|
|
virtual scene::IAnimatedMesh* getMesh(const std::string &filename);
|
2011-11-13 23:19:48 +01: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-29 05:22:18 +02:00
|
|
|
// The following set of functions is used by ClientMediaDownloader
|
2012-03-25 13:47:51 +02:00
|
|
|
// Insert a media file appropriately into the appropriate manager
|
|
|
|
bool loadMedia(const std::string &data, const std::string &filename);
|
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-29 05:22:18 +02:00
|
|
|
// Send a request for conventional media transfer
|
|
|
|
void request_media(const std::list<std::string> &file_requests);
|
|
|
|
// Send a notification that no conventional media transfer is needed
|
|
|
|
void received_media();
|
2012-12-14 12:30:17 +01:00
|
|
|
|
2014-02-13 20:17:42 +01:00
|
|
|
LocalClientState getState() { return m_state; }
|
|
|
|
|
2014-09-21 02:23:55 +02:00
|
|
|
void makeScreenshot(IrrlichtDevice *device);
|
|
|
|
|
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-29 05:22:18 +02:00
|
|
|
private:
|
2012-12-14 12:30:17 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
// Virtual methods from con::PeerHandler
|
|
|
|
void peerAdded(con::Peer *peer);
|
|
|
|
void deletingPeer(con::Peer *peer, bool timeout);
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2015-01-30 15:33:23 +01:00
|
|
|
void initLocalMapSaving(const Address &address,
|
|
|
|
const std::string &hostname,
|
|
|
|
bool is_local_server);
|
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
void ReceiveAll();
|
|
|
|
void Receive();
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2010-11-27 00:02:21 +01:00
|
|
|
void sendPlayerPos();
|
2011-08-10 21:43:40 +02:00
|
|
|
// Send the item number 'item' as player item to the server
|
|
|
|
void sendPlayerItem(u16 item);
|
2015-01-19 05:29:19 +01:00
|
|
|
|
2010-12-19 15:51:45 +01:00
|
|
|
float m_packetcounter_timer;
|
|
|
|
float m_connection_reinit_timer;
|
|
|
|
float m_avg_rtt_timer;
|
|
|
|
float m_playerpos_send_timer;
|
2011-04-21 18:35:17 +02:00
|
|
|
float m_ignore_damage_timer; // Used after server moves player
|
2011-06-26 23:27:17 +02:00
|
|
|
IntervalLimiter m_map_timer_and_unload_interval;
|
2010-12-19 15:51:45 +01:00
|
|
|
|
2011-11-14 20:41:30 +01:00
|
|
|
IWritableTextureSource *m_tsrc;
|
2012-03-19 02:59:12 +01:00
|
|
|
IWritableShaderSource *m_shsrc;
|
2012-01-12 06:10:39 +01:00
|
|
|
IWritableItemDefManager *m_itemdef;
|
2011-11-14 20:41:30 +01:00
|
|
|
IWritableNodeDefManager *m_nodedef;
|
2012-03-23 14:29:30 +01:00
|
|
|
ISoundManager *m_sound;
|
2012-03-23 19:23:03 +01:00
|
|
|
MtEventManager *m_event;
|
|
|
|
|
2015-01-05 18:34:59 +01:00
|
|
|
|
2011-04-04 01:05:12 +02:00
|
|
|
MeshUpdateThread m_mesh_update_thread;
|
2011-02-20 23:45:14 +01:00
|
|
|
ClientEnvironment m_env;
|
2015-01-05 18:34:59 +01:00
|
|
|
ParticleManager m_particle_manager;
|
2010-11-27 00:02:21 +01:00
|
|
|
con::Connection m_con;
|
|
|
|
IrrlichtDevice *m_device;
|
|
|
|
// Server serialization version
|
|
|
|
u8 m_server_ser_ver;
|
2011-11-29 16:15:18 +01:00
|
|
|
u16 m_playeritem;
|
2010-11-27 00:02:21 +01:00
|
|
|
bool m_inventory_updated;
|
2012-01-22 00:49:02 +01:00
|
|
|
Inventory *m_inventory_from_server;
|
|
|
|
float m_inventory_from_server_age;
|
2012-12-20 18:19:49 +01:00
|
|
|
std::set<v3s16> m_active_blocks;
|
2010-11-27 16:18:34 +01:00
|
|
|
PacketCounter m_packetcounter;
|
2014-12-01 13:05:36 +01:00
|
|
|
bool m_show_highlighted;
|
2012-03-13 18:56:12 +01:00
|
|
|
// Block mesh animation parameters
|
|
|
|
float m_animation_time;
|
|
|
|
int m_crack_level;
|
|
|
|
v3s16 m_crack_pos;
|
2014-09-16 12:38:37 +02:00
|
|
|
v3s16 m_highlighted_pos;
|
2010-12-19 15:51:45 +01:00
|
|
|
// 0 <= m_daynight_i < DAYNIGHT_CACHE_COUNT
|
|
|
|
//s32 m_daynight_i;
|
|
|
|
//u32 m_daynight_ratio;
|
2010-12-23 21:35:53 +01:00
|
|
|
Queue<std::wstring> m_chat_queue;
|
2011-02-28 01:01:40 +01:00
|
|
|
// The seed returned by the server in TOCLIENT_INIT is stored here
|
|
|
|
u64 m_map_seed;
|
2011-05-20 21:28:03 +02:00
|
|
|
std::string m_password;
|
|
|
|
bool m_access_denied;
|
2011-05-29 20:11:16 +02:00
|
|
|
std::wstring m_access_denied_reason;
|
2011-04-21 18:35:17 +02:00
|
|
|
Queue<ClientEvent> m_client_event_queue;
|
2012-01-12 06:10:39 +01:00
|
|
|
bool m_itemdef_received;
|
2011-11-15 22:58:56 +01:00
|
|
|
bool m_nodedef_received;
|
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-29 05:22:18 +02:00
|
|
|
ClientMediaDownloader *m_media_downloader;
|
2012-03-16 15:34:30 +01:00
|
|
|
|
|
|
|
// time_of_day speed approximation for old protocol
|
|
|
|
bool m_time_of_day_set;
|
|
|
|
float m_last_time_of_day_f;
|
|
|
|
float m_time_of_day_update_timer;
|
2012-03-24 18:01:26 +01:00
|
|
|
|
2012-11-26 21:31:21 +01:00
|
|
|
// An interval for generally sending object positions and stuff
|
|
|
|
float m_recommended_send_interval;
|
|
|
|
|
2012-03-24 18:01:26 +01:00
|
|
|
// Sounds
|
|
|
|
float m_removed_sounds_check_timer;
|
|
|
|
// Mapping from server sound ids to our sound ids
|
|
|
|
std::map<s32, int> m_sounds_server_to_client;
|
|
|
|
// And the other way!
|
|
|
|
std::map<int, s32> m_sounds_client_to_server;
|
|
|
|
// And relations to objects
|
|
|
|
std::map<int, u16> m_sounds_to_objects;
|
2010-11-27 00:02:21 +01:00
|
|
|
|
2012-03-31 15:23:26 +02:00
|
|
|
// Privileges
|
|
|
|
std::set<std::string> m_privileges;
|
2012-07-24 19:57:17 +02:00
|
|
|
|
|
|
|
// Detached inventories
|
|
|
|
// key = name
|
|
|
|
std::map<std::string, Inventory*> m_detached_inventories;
|
2014-01-06 12:24:06 +01:00
|
|
|
|
|
|
|
// Storage for mesh data for creating multiple instances of the same mesh
|
|
|
|
std::map<std::string, std::string> m_mesh_data;
|
2014-02-13 20:17:42 +01:00
|
|
|
|
|
|
|
// own state
|
|
|
|
LocalClientState m_state;
|
2014-10-09 14:02:02 +02:00
|
|
|
|
|
|
|
// Used for saving server map to disk client-side
|
|
|
|
Database *localdb;
|
|
|
|
Server *localserver;
|
2014-12-06 15:37:37 +01:00
|
|
|
|
2015-02-11 08:45:49 +01:00
|
|
|
// TODO: Add callback to update these when g_settings changes
|
2014-12-06 15:37:37 +01:00
|
|
|
bool m_cache_smooth_lighting;
|
2015-02-11 08:45:49 +01:00
|
|
|
bool m_cache_enable_shaders;
|
2012-03-31 15:23:26 +02:00
|
|
|
};
|
2010-12-19 18:11:05 +01:00
|
|
|
|
|
|
|
#endif // !CLIENT_HEADER
|