51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "client.h"
#include <iostream>
#include <algorithm>
-#include "clientserver.h"
+#include <sstream>
+#include <IFileSystem.h>
#include "jthread/jmutexautolock.h"
+#include "util/directiontables.h"
+#include "util/pointedthing.h"
+#include "util/serialize.h"
+#include "util/string.h"
+#include "client.h"
+#include "network/clientopcodes.h"
#include "main.h"
-#include <sstream>
#include "filesys.h"
#include "porting.h"
-#include "mapsector.h"
#include "mapblock_mesh.h"
#include "mapblock.h"
#include "settings.h"
#include "gettext.h"
#include "log.h"
#include "nodemetadata.h"
-#include "nodedef.h"
#include "itemdef.h"
#include "shader.h"
-#include <IFileSystem.h>
-#include "base64.h"
#include "clientmap.h"
#include "clientmedia.h"
#include "sound.h"
-#include "util/string.h"
#include "IMeshCache.h"
-#include "serialization.h"
-#include "util/serialize.h"
#include "config.h"
-#include "util/directiontables.h"
-#include "util/pointedthing.h"
#include "version.h"
+#include "drawscene.h"
+#include "database-sqlite3.h"
+#include "serialization.h"
+
+extern gui::IGUIEnvironment* guienv;
/*
QueuedMeshUpdate
/*
MeshUpdateQueue
*/
-
+
MeshUpdateQueue::MeshUpdateQueue()
{
}
{
DSTACK(__FUNCTION_NAME);
- assert(data);
+ assert(data); // pre-condition
JMutexAutoLock lock(m_mutex);
return;
}
}
-
+
/*
Add the block
*/
log_register_thread("MeshUpdateThread");
DSTACK(__FUNCTION_NAME);
-
+
BEGIN_DEBUG_EXCEPTION_HANDLER
+ porting::setThreadName("MeshUpdateThread");
+
while(!StopRequested())
{
- /*// Wait for output queue to flush.
- // Allow 2 in queue, this makes less frametime jitter.
- // Umm actually, there is no much difference
- if(m_queue_out.size() >= 2)
- {
- sleep_ms(3);
- continue;
- }*/
-
QueuedMeshUpdate *q = m_queue_in.pop();
if(q == NULL)
{
ScopeProfiler sp(g_profiler, "Client: Mesh making");
- MapBlockMesh *mesh_new = new MapBlockMesh(q->data);
+ MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset);
if(mesh_new->getMesh()->getMeshBufferCount() == 0)
{
delete mesh_new;
r.mesh = mesh_new;
r.ack_block_to_server = q->ack_block_to_server;
- /*infostream<<"MeshUpdateThread: Processed "
- <<"("<<q->p.X<<","<<q->p.Y<<","<<q->p.Z<<")"
- <<std::endl;*/
-
m_queue_out.push_back(r);
delete q;
MtEventManager *event,
bool ipv6
):
+ 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),
m_tsrc(tsrc),
m_shsrc(shsrc),
m_itemdef(itemdef),
device->getSceneManager(),
tsrc, this, device
),
+ m_particle_manager(&m_env),
m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
m_device(device),
m_server_ser_ver(SER_FMT_VER_INVALID),
m_inventory_updated(false),
m_inventory_from_server(NULL),
m_inventory_from_server_age(0.0),
+ m_show_highlighted(false),
m_animation_time(0),
m_crack_level(-1),
m_crack_pos(0,0,0),
+ m_highlighted_pos(0,0,0),
m_map_seed(0),
m_password(password),
m_access_denied(false),
m_last_time_of_day_f(-1),
m_time_of_day_update_timer(0),
m_recommended_send_interval(0.1),
- m_removed_sounds_check_timer(0)
+ m_removed_sounds_check_timer(0),
+ m_state(LC_Created),
+ m_localdb(NULL)
{
- m_packetcounter_timer = 0.0;
- //m_delete_unused_sectors_timer = 0.0;
- m_connection_reinit_timer = 0.0;
- m_avg_rtt_timer = 0.0;
- m_playerpos_send_timer = 0.0;
- m_ignore_damage_timer = 0.0;
-
- /*
- Add local player
- */
- {
- Player *player = new LocalPlayer(this);
+ // Add local player
+ m_env.addPlayer(new LocalPlayer(this, playername));
- player->updateName(playername);
+ m_cache_save_interval = g_settings->getU16("server_map_save_interval");
- m_env.addPlayer(player);
- }
+ m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
+ m_cache_enable_shaders = g_settings->getBool("enable_shaders");
}
void Client::Stop()
{
//request all client managed threads to stop
m_mesh_update_thread.Stop();
+ // Save local server map
+ if (m_localdb) {
+ infostream << "Local map saving ended." << std::endl;
+ m_localdb->endSave();
+ }
}
bool Client::isShutdown()
Client::~Client()
{
- {
- //JMutexAutoLock conlock(m_con_mutex); //bulk comment-out
- m_con.Disconnect();
- }
+ m_con.Disconnect();
m_mesh_update_thread.Stop();
m_mesh_update_thread.Wait();
delete m_inventory_from_server;
// Delete detached inventories
- {
- for(std::map<std::string, Inventory*>::iterator
- i = m_detached_inventories.begin();
- i != m_detached_inventories.end(); i++){
- delete i->second;
- }
+ for(std::map<std::string, Inventory*>::iterator
+ i = m_detached_inventories.begin();
+ i != m_detached_inventories.end(); i++){
+ delete i->second;
}
// cleanup 3d model meshes on client shutdown
}
}
-void Client::connect(Address address)
+void Client::connect(Address address,
+ const std::string &address_name,
+ bool is_local_server)
{
DSTACK(__FUNCTION_NAME);
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- m_con.SetTimeoutMs(0);
- m_con.Connect(address);
-}
-bool Client::connectedAndInitialized()
-{
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
+ initLocalMapSaving(address, address_name, is_local_server);
- if(m_con.Connected() == false)
- return false;
-
- if(m_server_ser_ver == SER_FMT_VER_INVALID)
- return false;
-
- return true;
+ m_con.SetTimeoutMs(0);
+ m_con.Connect(address);
}
void Client::step(float dtime)
{
DSTACK(__FUNCTION_NAME);
-
+
// Limit a bit
if(dtime > 2.0)
dtime = 2.0;
-
+
if(m_ignore_damage_timer > dtime)
m_ignore_damage_timer -= dtime;
else
m_ignore_damage_timer = 0.0;
-
+
m_animation_time += dtime;
if(m_animation_time > 60.0)
m_animation_time -= 60.0;
m_time_of_day_update_timer += dtime;
-
- //infostream<<"Client steps "<<dtime<<std::endl;
- {
- //TimeTaker timer("ReceiveAll()", m_device);
- // 0ms
- ReceiveAll();
- }
-
- {
- //TimeTaker timer("m_con_mutex + m_con.RunTimeouts()", m_device);
- // 0ms
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- m_con.RunTimeouts(dtime);
- }
+ ReceiveAll();
/*
Packet counter
if(counter <= 0.0)
{
counter = 20.0;
-
- infostream<<"Client packetcounter (20s):"<<std::endl;
+
+ infostream << "Client packetcounter (" << m_packetcounter_timer
+ << "):"<<std::endl;
m_packetcounter.print(infostream);
m_packetcounter.clear();
}
}
-
- // Get connection status
- bool connected = connectedAndInitialized();
-
-#if 0
- {
- /*
- Delete unused sectors
-
- NOTE: This jams the game for a while because deleting sectors
- clear caches
- */
-
- float &counter = m_delete_unused_sectors_timer;
- counter -= dtime;
- if(counter <= 0.0)
- {
- // 3 minute interval
- //counter = 180.0;
- counter = 60.0;
-
- //JMutexAutoLock lock(m_env_mutex); //bulk comment-out
-
- core::list<v3s16> deleted_blocks;
-
- float delete_unused_sectors_timeout =
- g_settings->getFloat("client_delete_unused_sectors_timeout");
-
- // Delete sector blocks
- /*u32 num = m_env.getMap().unloadUnusedData
- (delete_unused_sectors_timeout,
- true, &deleted_blocks);*/
-
- // Delete whole sectors
- m_env.getMap().unloadUnusedData
- (delete_unused_sectors_timeout,
- &deleted_blocks);
-
- if(deleted_blocks.size() > 0)
- {
- /*infostream<<"Client: Deleted blocks of "<<num
- <<" unused sectors"<<std::endl;*/
- /*infostream<<"Client: Deleted "<<num
- <<" unused sectors"<<std::endl;*/
-
- /*
- Send info to server
- */
- // Env is locked so con can be locked.
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-
- core::list<v3s16>::Iterator i = deleted_blocks.begin();
- core::list<v3s16> sendlist;
- for(;;)
- {
- if(sendlist.size() == 255 || i == deleted_blocks.end())
- {
- if(sendlist.size() == 0)
- break;
- /*
- [0] u16 command
- [2] u8 count
- [3] v3s16 pos_0
- [3+6] v3s16 pos_1
- ...
- */
- u32 replysize = 2+1+6*sendlist.size();
- SharedBuffer<u8> reply(replysize);
- writeU16(&reply[0], TOSERVER_DELETEDBLOCKS);
- reply[2] = sendlist.size();
- u32 k = 0;
- for(core::list<v3s16>::Iterator
- j = sendlist.begin();
- j != sendlist.end(); j++)
- {
- writeV3S16(&reply[2+1+6*k], *j);
- k++;
- }
- m_con.Send(PEER_ID_SERVER, 1, reply, true);
-
- if(i == deleted_blocks.end())
- break;
-
- sendlist.clear();
- }
-
- sendlist.push_back(*i);
- i++;
- }
- }
- }
+ // 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;
}
-#endif
-
- if(connected == false)
- {
+ else if(m_state == LC_Created) {
float &counter = m_connection_reinit_timer;
counter -= dtime;
- if(counter <= 0.0)
- {
+ if(counter <= 0.0) {
counter = 2.0;
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
- Player *myplayer = m_env.getLocalPlayer();
- assert(myplayer != NULL);
-
+ Player *myplayer = m_env.getLocalPlayer();
+ FATAL_ERROR_IF(myplayer == NULL, "Local player not found in environment.");
+
// Send TOSERVER_INIT
// [0] u16 TOSERVER_INIT
// [2] u8 SER_FMT_VER_HIGHEST_READ
// [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)
- SharedBuffer<u8> data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2+2);
- writeU16(&data[0], TOSERVER_INIT);
- writeU8(&data[2], SER_FMT_VER_HIGHEST_READ);
- memset((char*)&data[3], 0, PLAYERNAME_SIZE);
- snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName());
+ char pName[PLAYERNAME_SIZE];
+ char pPassword[PASSWORD_SIZE];
+
+ snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName());
+ snprintf(pPassword, PASSWORD_SIZE, "%s", m_password.c_str());
- /*infostream<<"Client: sending initial password hash: \""<<m_password<<"\""
- <<std::endl;*/
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_INIT,
+ 1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2);
- memset((char*)&data[23], 0, PASSWORD_SIZE);
- snprintf((char*)&data[23], PASSWORD_SIZE, "%s", m_password.c_str());
-
- writeU16(&data[51], CLIENT_PROTOCOL_VERSION_MIN);
- writeU16(&data[53], CLIENT_PROTOCOL_VERSION_MAX);
+ *pkt << (u8) SER_FMT_VER_HIGHEST_READ;
+ pkt->putRawString(pName,PLAYERNAME_SIZE);
+ pkt->putRawString(pPassword, PASSWORD_SIZE);
+ *pkt << (u16) CLIENT_PROTOCOL_VERSION_MIN << (u16) CLIENT_PROTOCOL_VERSION_MAX;
- // Send as unreliable
- Send(1, data, false);
+ Send(pkt);
}
// Not connected, return
/*
Do stuff if connected
*/
-
+
/*
Run Map's timers and unload unused data
*/
const float map_timer_and_unload_dtime = 5.25;
- if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime))
- {
+ if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) {
ScopeProfiler sp(g_profiler, "Client: map timer and unload");
- std::list<v3s16> deleted_blocks;
+ std::vector<v3s16> deleted_blocks;
m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
g_settings->getFloat("client_unload_unused_data_timeout"),
&deleted_blocks);
-
- /*if(deleted_blocks.size() > 0)
- infostream<<"Client: Unloaded "<<deleted_blocks.size()
- <<" unused blocks"<<std::endl;*/
-
+
/*
Send info to server
NOTE: This loop is intentionally iterated the way it is.
*/
- std::list<v3s16>::iterator i = deleted_blocks.begin();
- std::list<v3s16> sendlist;
- for(;;)
- {
- if(sendlist.size() == 255 || i == deleted_blocks.end())
- {
- if(sendlist.size() == 0)
+ std::vector<v3s16>::iterator i = deleted_blocks.begin();
+ std::vector<v3s16> sendlist;
+ for(;;) {
+ if(sendlist.size() == 255 || i == deleted_blocks.end()) {
+ if(sendlist.empty())
break;
/*
[0] u16 command
[3+6] v3s16 pos_1
...
*/
- u32 replysize = 2+1+6*sendlist.size();
- SharedBuffer<u8> reply(replysize);
- writeU16(&reply[0], TOSERVER_DELETEDBLOCKS);
- reply[2] = sendlist.size();
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_DELETEDBLOCKS, 1 + sizeof(v3s16) * sendlist.size());
+
+ *pkt << (u8) sendlist.size();
+
u32 k = 0;
- for(std::list<v3s16>::iterator
+ for(std::vector<v3s16>::iterator
j = sendlist.begin();
- j != sendlist.end(); ++j)
- {
- writeV3S16(&reply[2+1+6*k], *j);
+ j != sendlist.end(); ++j) {
+ *pkt << *j;
k++;
}
- m_con.Send(PEER_ID_SERVER, 2, reply, true);
+
+ Send(pkt);
if(i == deleted_blocks.end())
break;
/*
Handle environment
*/
- {
- // 0ms
- //JMutexAutoLock lock(m_env_mutex); //bulk comment-out
+ // Control local player (0ms)
+ LocalPlayer *player = m_env.getLocalPlayer();
+ assert(player != NULL);
+ player->applyControl(dtime);
- // Control local player (0ms)
- LocalPlayer *player = m_env.getLocalPlayer();
- assert(player != NULL);
- player->applyControl(dtime);
+ // Step environment
+ m_env.step(dtime);
- //TimeTaker envtimer("env step", m_device);
- // Step environment
- m_env.step(dtime);
-
- /*
- 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;
- m_client_event_queue.push_back(event);
- }
- }
- else if(event.type == CEE_PLAYER_BREATH)
- {
- u16 breath = event.player_breath.amount;
- sendBreath(breath);
+ /*
+ 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;
+ m_client_event_queue.push(event);
}
}
+ else if(event.type == CEE_PLAYER_BREATH) {
+ u16 breath = event.player_breath.amount;
+ sendBreath(breath);
+ }
}
/*
Print some info
*/
- {
- float &counter = m_avg_rtt_timer;
- counter += dtime;
- if(counter >= 10)
- {
- counter = 0.0;
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- // connectedAndInitialized() is true, peer exists.
- float avg_rtt = m_con.GetPeerAvgRTT(PEER_ID_SERVER);
- infostream<<"Client: avg_rtt="<<avg_rtt<<std::endl;
- }
+ 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;
}
/*
{
float &counter = m_playerpos_send_timer;
counter += dtime;
- if(counter >= m_recommended_send_interval)
+ if((m_state == LC_Ready) && (counter >= m_recommended_send_interval))
{
counter = 0.0;
sendPlayerPos();
Replace updated meshes
*/
{
- //JMutexAutoLock lock(m_env_mutex); //bulk comment-out
-
- //TimeTaker timer("** Processing mesh update result queue");
- // 0ms
-
- /*infostream<<"Mesh update result queue size is "
- <<m_mesh_update_thread.m_queue_out.size()
- <<std::endl;*/
-
int num_processed_meshes = 0;
while(!m_mesh_update_thread.m_queue_out.empty())
{
num_processed_meshes++;
MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
- if(block)
- {
- //JMutexAutoLock lock(block->mesh_mutex);
-
+ if(block) {
// Delete the old mesh
if(block->mesh != NULL)
{
} else {
delete r.mesh;
}
- if(r.ack_block_to_server)
- {
- /*infostream<<"Client: ACK block ("<<r.p.X<<","<<r.p.Y
- <<","<<r.p.Z<<")"<<std::endl;*/
+
+ if(r.ack_block_to_server) {
/*
Acknowledge block
+ [0] u8 count
+ [1] v3s16 pos_0
*/
- /*
- [0] u16 command
- [2] u8 count
- [3] v3s16 pos_0
- [3+6] v3s16 pos_1
- ...
- */
- u32 replysize = 2+1+6;
- SharedBuffer<u8> reply(replysize);
- writeU16(&reply[0], TOSERVER_GOTBLOCKS);
- reply[2] = 1;
- writeV3S16(&reply[3], r.p);
- // Send as reliable
- m_con.Send(PEER_ID_SERVER, 2, reply, true);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_GOTBLOCKS, 1 + 6);
+ *pkt << (u8) 1 << r.p;
+ Send(pkt);
}
}
+
if(num_processed_meshes > 0)
g_profiler->graphAdd("num_processed_meshes", num_processed_meshes);
}
if (m_media_downloader && m_media_downloader->isStarted()) {
m_media_downloader->step(this);
if (m_media_downloader->isDone()) {
+ received_media();
delete m_media_downloader;
m_media_downloader = NULL;
}
m_sound->updateSoundPosition(client_id, pos);
}
}
-
+
/*
Handle removed remotely initiated sounds
*/
m_removed_sounds_check_timer += dtime;
- if(m_removed_sounds_check_timer >= 2.32)
- {
+ if(m_removed_sounds_check_timer >= 2.32) {
m_removed_sounds_check_timer = 0;
// Find removed sounds and clear references to them
std::set<s32> removed_server_ids;
for(std::map<s32, int>::iterator
i = m_sounds_server_to_client.begin();
- i != m_sounds_server_to_client.end();)
- {
+ i != m_sounds_server_to_client.end();) {
s32 server_id = i->first;
int client_id = i->second;
i++;
- if(!m_sound->soundExists(client_id)){
+ if(!m_sound->soundExists(client_id)) {
m_sounds_server_to_client.erase(server_id);
m_sounds_client_to_server.erase(client_id);
m_sounds_to_objects.erase(client_id);
removed_server_ids.insert(server_id);
}
}
+
// Sync to server
- if(removed_server_ids.size() != 0)
- {
- std::ostringstream os(std::ios_base::binary);
- writeU16(os, TOSERVER_REMOVED_SOUNDS);
- writeU16(os, removed_server_ids.size());
+ if(!removed_server_ids.empty()) {
+ size_t server_ids = removed_server_ids.size();
+ assert(server_ids <= 0xFFFF);
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_REMOVED_SOUNDS, 2 + server_ids * 4);
+
+ *pkt << (u16) (server_ids & 0xFFFF);
+
for(std::set<s32>::iterator i = removed_server_ids.begin();
i != removed_server_ids.end(); i++)
- writeS32(os, *i);
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(1, data, true);
+ *pkt << *i;
+
+ Send(pkt);
}
}
+
+ // Write server map
+ if (m_localdb && m_localdb_save_interval.step(dtime,
+ m_cache_save_interval)) {
+ m_localdb->endSave();
+ m_localdb->beginSave();
+ }
}
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());
-
+
std::string name;
const char *image_ext[] = {
// Create an irrlicht memory file
io::IReadFile *rfile = irrfs->createMemoryReadFile(
*data_rw, data_rw.getSize(), "_tempreadfile");
- assert(rfile);
+
+ FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file.");
+
// Read image
video::IImage *img = vdrv->createImageFromFile(rfile);
if(!img){
string name
}
*/
-void Client::request_media(const std::list<std::string> &file_requests)
+void Client::request_media(const std::vector<std::string> &file_requests)
{
std::ostringstream os(std::ios_base::binary);
writeU16(os, TOSERVER_REQUEST_MEDIA);
- writeU16(os, file_requests.size());
+ size_t file_requests_size = file_requests.size();
+
+ FATAL_ERROR_IF(file_requests_size > 0xFFFF, "Unsupported number of file requests");
+
+ // Packet dynamicly resized
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_REQUEST_MEDIA, 2 + 0);
+
+ *pkt << (u16) (file_requests_size & 0xFFFF);
- for(std::list<std::string>::const_iterator i = file_requests.begin();
+ for(std::vector<std::string>::const_iterator i = file_requests.begin();
i != file_requests.end(); ++i) {
- os<<serializeString(*i);
+ *pkt << (*i);
}
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(1, data, true);
+ Send(pkt);
+
infostream<<"Client: Sending media request list to server ("
- <<file_requests.size()<<" files)"<<std::endl;
+ <<file_requests.size()<<" files. packet size)"<<std::endl;
}
void Client::received_media()
{
- // notify server we received everything
- std::ostringstream os(std::ios_base::binary);
- writeU16(os, TOSERVER_RECEIVED_MEDIA);
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(1, data, true);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_RECEIVED_MEDIA, 0);
+ Send(pkt);
infostream<<"Client: Notifying server that we received all media"
<<std::endl;
}
+void Client::initLocalMapSaving(const Address &address,
+ const std::string &hostname,
+ bool is_local_server)
+{
+ if (!g_settings->getBool("enable_local_map_saving") || is_local_server) {
+ return;
+ }
+
+ const std::string world_path = porting::path_user
+ + DIR_DELIM + "worlds"
+ + DIR_DELIM + "server_"
+ + hostname + "_" + to_string(address.getPort());
+
+ fs::CreateAllDirs(world_path);
+
+ m_localdb = new Database_SQLite3(world_path);
+ m_localdb->beginSave();
+ actionstream << "Local map saving started, map will be saved at '" << world_path << "'" << std::endl;
+}
+
void Client::ReceiveAll()
{
DSTACK(__FUNCTION_NAME);
// process
if(porting::getTimeMs() > start_ms + 100)
break;
-
- try{
+
+ try {
Receive();
g_profiler->graphAdd("client_received_packets", 1);
}
- catch(con::NoIncomingDataException &e)
- {
+ catch(con::NoIncomingDataException &e) {
break;
}
- catch(con::InvalidIncomingDataException &e)
- {
+ catch(con::InvalidIncomingDataException &e) {
infostream<<"Client::ReceiveAll(): "
"InvalidIncomingDataException: what()="
<<e.what()<<std::endl;
DSTACK(__FUNCTION_NAME);
SharedBuffer<u8> data;
u16 sender_peer_id;
- u32 datasize;
- {
- //TimeTaker t1("con mutex and receive", m_device);
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- datasize = m_con.Receive(sender_peer_id, data);
- }
- //TimeTaker t1("ProcessData", m_device);
+ u32 datasize = m_con.Receive(sender_peer_id, data);
ProcessData(*data, datasize, sender_peer_id);
}
+inline void Client::handleCommand(NetworkPacket* pkt)
+{
+ const ToClientCommandHandler& opHandle = toClientCommandTable[pkt->getCommand()];
+ (this->*opHandle.handler)(pkt);
+}
+
/*
sender_peer_id given to this shall be quaranteed to be a valid peer
*/
DSTACK(__FUNCTION_NAME);
// Ignore packets that don't even fit a command
- if(datasize < 2)
- {
+ if(datasize < 2) {
m_packetcounter.add(60000);
return;
}
- ToClientCommand command = (ToClientCommand)readU16(&data[0]);
+ NetworkPacket* pkt = new NetworkPacket(data, datasize, sender_peer_id);
+
+ ToClientCommand command = (ToClientCommand) pkt->getCommand();
//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;
+ if(sender_peer_id != PEER_ID_SERVER) {
+ infostream << "Client::ProcessData(): Discarding data not "
+ "coming from server: peer_id=" << sender_peer_id
+ << std::endl;
+ delete pkt;
return;
}
- u8 ser_version = m_server_ser_ver;
-
- //infostream<<"Client received command="<<(int)command<<std::endl;
-
- if(command == TOCLIENT_INIT)
- {
- if(datasize < 3)
- return;
-
- u8 deployed = data[2];
-
- infostream<<"Client: TOCLIENT_INIT received with "
- "deployed="<<((int)deployed&0xff)<<std::endl;
-
- if(!ser_ver_supported(deployed))
- {
- infostream<<"Client: TOCLIENT_INIT: Server sent "
- <<"unsupported ser_fmt_ver"<<std::endl;
- return;
- }
-
- m_server_ser_ver = deployed;
-
- // Get player position
- v3s16 playerpos_s16(0, BS*2+BS*20, 0);
- if(datasize >= 2+1+6)
- playerpos_s16 = readV3S16(&data[2+1]);
- v3f playerpos_f = intToFloat(playerpos_s16, BS) - v3f(0, BS/2, 0);
-
- { //envlock
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
- // Set player position
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- player->setPosition(playerpos_f);
- }
-
- if(datasize >= 2+1+6+8)
- {
- // Get map seed
- m_map_seed = readU64(&data[2+1+6]);
- infostream<<"Client: received map seed: "<<m_map_seed<<std::endl;
- }
-
- if(datasize >= 2+1+6+8+4)
- {
- // Get map seed
- m_recommended_send_interval = readF1000(&data[2+1+6+8]);
- infostream<<"Client: received recommended send interval "
- <<m_recommended_send_interval<<std::endl;
- }
-
- // Reply to server
- u32 replysize = 2;
- SharedBuffer<u8> reply(replysize);
- writeU16(&reply[0], TOSERVER_INIT2);
- // Send as reliable
- m_con.Send(PEER_ID_SERVER, 1, reply, true);
-
- return;
+ // Command must be handled into ToClientCommandHandler
+ if (command >= TOCLIENT_NUM_MSG_TYPES) {
+ infostream << "Client: Ignoring unknown command "
+ << command << std::endl;
}
- if(command == TOCLIENT_ACCESS_DENIED)
- {
- // The server didn't like our password. Note, this needs
- // to be processed even if the serialisation format has
- // not been agreed yet, the same as TOCLIENT_INIT.
- m_access_denied = true;
- m_access_denied_reason = L"Unknown";
- if(datasize >= 4)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- m_access_denied_reason = deSerializeWideString(is);
- }
+ /*
+ * 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) {
+ handleCommand(pkt);
+ delete pkt;
return;
}
- if(ser_version == SER_FMT_VER_INVALID)
- {
- infostream<<"Client: Server serialization"
+ if(m_server_ser_ver == SER_FMT_VER_INVALID) {
+ infostream << "Client: Server serialization"
" format invalid or not initialized."
- " Skipping incoming command="<<command<<std::endl;
+ " Skipping incoming command=" << command << std::endl;
+ delete pkt;
return;
}
-
- // Just here to avoid putting the two if's together when
- // making some copypasta
- {}
-
- if(command == TOCLIENT_REMOVENODE)
- {
- if(datasize < 8)
- return;
- v3s16 p;
- p.X = readS16(&data[2]);
- p.Y = readS16(&data[4]);
- p.Z = readS16(&data[6]);
-
- //TimeTaker t1("TOCLIENT_REMOVENODE");
-
- removeNode(p);
- }
- else if(command == TOCLIENT_ADDNODE)
- {
- if(datasize < 8 + MapNode::serializedLength(ser_version))
- return;
-
- v3s16 p;
- p.X = readS16(&data[2]);
- p.Y = readS16(&data[4]);
- p.Z = readS16(&data[6]);
-
- //TimeTaker t1("TOCLIENT_ADDNODE");
-
- MapNode n;
- n.deSerialize(&data[8], ser_version);
-
- bool remove_metadata = true;
- u32 index = 8 + MapNode::serializedLength(ser_version);
- if ((datasize >= index+1) && data[index]){
- remove_metadata = false;
- }
-
- addNode(p, n, remove_metadata);
- }
- else if(command == TOCLIENT_BLOCKDATA)
- {
- // Ignore too small packet
- if(datasize < 8)
- return;
-
- v3s16 p;
- p.X = readS16(&data[2]);
- p.Y = readS16(&data[4]);
- p.Z = readS16(&data[6]);
-
- /*infostream<<"Client: Thread: BLOCKDATA for ("
- <<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
- /*infostream<<"Client: Thread: BLOCKDATA for ("
- <<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-
- std::string datastring((char*)&data[8], datasize-8);
- std::istringstream istr(datastring, std::ios_base::binary);
-
- MapSector *sector;
- MapBlock *block;
-
- v2s16 p2d(p.X, p.Z);
- sector = m_env.getMap().emergeSector(p2d);
-
- assert(sector->getPos() == p2d);
-
- //TimeTaker timer("MapBlock deSerialize");
- // 0ms
-
- block = sector->getBlockNoCreateNoEx(p.Y);
- if(block)
- {
- /*
- Update an existing block
- */
- //infostream<<"Updating"<<std::endl;
- block->deSerialize(istr, ser_version, false);
- block->deSerializeNetworkSpecific(istr);
- }
- else
- {
- /*
- Create a new block
- */
- //infostream<<"Creating new"<<std::endl;
- block = new MapBlock(&m_env.getMap(), p, this);
- block->deSerialize(istr, ser_version, false);
- block->deSerializeNetworkSpecific(istr);
- sector->insertBlock(block);
- }
-
-#if 0
- /*
- Acknowledge block
- */
- /*
- [0] u16 command
- [2] u8 count
- [3] v3s16 pos_0
- [3+6] v3s16 pos_1
- ...
- */
- u32 replysize = 2+1+6;
- SharedBuffer<u8> reply(replysize);
- writeU16(&reply[0], TOSERVER_GOTBLOCKS);
- reply[2] = 1;
- writeV3S16(&reply[3], p);
- // Send as reliable
- m_con.Send(PEER_ID_SERVER, 1, reply, true);
-#endif
-
- /*
- Add it to mesh update queue and set it to be acknowledged after update.
- */
- //infostream<<"Adding mesh update task for received block"<<std::endl;
- addUpdateMeshTaskWithEdge(p, true);
- }
- else if(command == TOCLIENT_INVENTORY)
- {
- if(datasize < 3)
- return;
-
- //TimeTaker t1("Parsing TOCLIENT_INVENTORY", m_device);
-
- { //envlock
- //TimeTaker t2("mutex locking", m_device);
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- //t2.stop();
-
- //TimeTaker t3("istringstream init", m_device);
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- //t3.stop();
-
- //TimeTaker t4("player get", m_device);
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- //t4.stop();
-
- //TimeTaker t1("inventory.deSerialize()", m_device);
- player->inventory.deSerialize(is);
- //t1.stop();
-
- m_inventory_updated = true;
-
- delete m_inventory_from_server;
- m_inventory_from_server = new Inventory(player->inventory);
- m_inventory_from_server_age = 0.0;
-
- //infostream<<"Client got player inventory:"<<std::endl;
- //player->inventory.print(infostream);
- }
- }
- else if(command == TOCLIENT_TIME_OF_DAY)
- {
- if(datasize < 4)
- return;
-
- u16 time_of_day = readU16(&data[2]);
- time_of_day = time_of_day % 24000;
- //infostream<<"Client: time_of_day="<<time_of_day<<std::endl;
- float time_speed = 0;
- if(datasize >= 2 + 2 + 4){
- time_speed = readF1000(&data[4]);
- } else {
- // Old message; try to approximate speed of time by ourselves
- float time_of_day_f = (float)time_of_day / 24000.0;
- float tod_diff_f = 0;
- if(time_of_day_f < 0.2 && m_last_time_of_day_f > 0.8)
- tod_diff_f = time_of_day_f - m_last_time_of_day_f + 1.0;
- else
- tod_diff_f = time_of_day_f - m_last_time_of_day_f;
- m_last_time_of_day_f = time_of_day_f;
- float time_diff = m_time_of_day_update_timer;
- m_time_of_day_update_timer = 0;
- if(m_time_of_day_set){
- time_speed = 3600.0*24.0 * tod_diff_f / time_diff;
- infostream<<"Client: Measured time_of_day speed (old format): "
- <<time_speed<<" tod_diff_f="<<tod_diff_f
- <<" time_diff="<<time_diff<<std::endl;
- }
- }
-
- // Update environment
- m_env.setTimeOfDay(time_of_day);
- m_env.setTimeOfDaySpeed(time_speed);
- m_time_of_day_set = true;
-
- u32 dr = m_env.getDayNightRatio();
- verbosestream<<"Client: time_of_day="<<time_of_day
- <<" time_speed="<<time_speed
- <<" dr="<<dr<<std::endl;
- }
- else if(command == TOCLIENT_CHAT_MESSAGE)
- {
- /*
- u16 command
- u16 length
- wstring message
- */
- u8 buf[6];
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- // Read stuff
- is.read((char*)buf, 2);
- u16 len = readU16(buf);
-
- std::wstring message;
- for(u16 i=0; i<len; i++)
- {
- is.read((char*)buf, 2);
- message += (wchar_t)readU16(buf);
- }
-
- /*infostream<<"Client received chat message: "
- <<wide_to_narrow(message)<<std::endl;*/
-
- m_chat_queue.push_back(message);
- }
- else if(command == TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD)
- {
- //if(g_settings->getBool("enable_experimental"))
- {
- /*
- u16 command
- u16 count of removed objects
- for all removed objects {
- u16 id
- }
- u16 count of added objects
- for all added objects {
- u16 id
- u8 type
- u32 initialization data length
- string initialization data
- }
- */
-
- char buf[6];
- // Get all data except the command number
- std::string datastring((char*)&data[2], datasize-2);
- // Throw them in an istringstream
- std::istringstream is(datastring, std::ios_base::binary);
-
- // Read stuff
-
- // Read removed objects
- is.read(buf, 2);
- u16 removed_count = readU16((u8*)buf);
- for(u16 i=0; i<removed_count; i++)
- {
- is.read(buf, 2);
- u16 id = readU16((u8*)buf);
- // Remove it
- {
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- m_env.removeActiveObject(id);
- }
- }
-
- // Read added objects
- is.read(buf, 2);
- u16 added_count = readU16((u8*)buf);
- for(u16 i=0; i<added_count; i++)
- {
- is.read(buf, 2);
- u16 id = readU16((u8*)buf);
- is.read(buf, 1);
- u8 type = readU8((u8*)buf);
- std::string data = deSerializeLongString(is);
- // Add it
- {
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- m_env.addActiveObject(id, type, data);
- }
- }
- }
- }
- else if(command == TOCLIENT_ACTIVE_OBJECT_MESSAGES)
- {
- //if(g_settings->getBool("enable_experimental"))
- {
- /*
- u16 command
- for all objects
- {
- u16 id
- u16 message length
- string message
- }
- */
- char buf[6];
- // Get all data except the command number
- std::string datastring((char*)&data[2], datasize-2);
- // Throw them in an istringstream
- std::istringstream is(datastring, std::ios_base::binary);
-
- while(is.eof() == false)
- {
- // Read stuff
- is.read(buf, 2);
- u16 id = readU16((u8*)buf);
- if(is.eof())
- break;
- is.read(buf, 2);
- u16 message_size = readU16((u8*)buf);
- std::string message;
- message.reserve(message_size);
- for(u16 i=0; i<message_size; i++)
- {
- is.read(buf, 1);
- message.append(buf, 1);
- }
- // Pass on to the environment
- {
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
- m_env.processActiveObjectMessage(id, message);
- }
- }
- }
- }
- else if(command == TOCLIENT_MOVEMENT)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
-
- player->movement_acceleration_default = readF1000(is) * BS;
- player->movement_acceleration_air = readF1000(is) * BS;
- player->movement_acceleration_fast = readF1000(is) * BS;
- player->movement_speed_walk = readF1000(is) * BS;
- player->movement_speed_crouch = readF1000(is) * BS;
- player->movement_speed_fast = readF1000(is) * BS;
- player->movement_speed_climb = readF1000(is) * BS;
- player->movement_speed_jump = readF1000(is) * BS;
- player->movement_liquid_fluidity = readF1000(is) * BS;
- player->movement_liquid_fluidity_smooth = readF1000(is) * BS;
- player->movement_liquid_sink = readF1000(is) * BS;
- player->movement_gravity = readF1000(is) * BS;
- }
- else if(command == TOCLIENT_HP)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- u8 oldhp = player->hp;
- u8 hp = readU8(is);
- player->hp = hp;
-
- if(hp < oldhp)
- {
- // Add to ClientEvent queue
- ClientEvent event;
- event.type = CE_PLAYER_DAMAGE;
- event.player_damage.amount = oldhp - hp;
- m_client_event_queue.push_back(event);
- }
- }
- else if(command == TOCLIENT_BREATH)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- u16 breath = readU16(is);
- player->setBreath(breath) ;
- }
- else if(command == TOCLIENT_MOVE_PLAYER)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- v3f pos = readV3F1000(is);
- f32 pitch = readF1000(is);
- f32 yaw = readF1000(is);
- player->setPosition(pos);
- /*player->setPitch(pitch);
- player->setYaw(yaw);*/
-
- infostream<<"Client got TOCLIENT_MOVE_PLAYER"
- <<" pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"
- <<" pitch="<<pitch
- <<" yaw="<<yaw
- <<std::endl;
-
- /*
- Add to ClientEvent queue.
- This has to be sent to the main program because otherwise
- it would just force the pitch and yaw values to whatever
- the camera points to.
- */
- ClientEvent event;
- event.type = CE_PLAYER_FORCE_MOVE;
- event.player_force_move.pitch = pitch;
- event.player_force_move.yaw = yaw;
- m_client_event_queue.push_back(event);
-
- // Ignore damage for a few seconds, so that the player doesn't
- // get damage from falling on ground
- m_ignore_damage_timer = 3.0;
- }
- else if(command == TOCLIENT_PLAYERITEM)
- {
- infostream<<"Client: WARNING: Ignoring TOCLIENT_PLAYERITEM"<<std::endl;
- }
- else if(command == TOCLIENT_DEATHSCREEN)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- bool set_camera_point_target = readU8(is);
- v3f camera_point_target = readV3F1000(is);
-
- ClientEvent event;
- event.type = CE_DEATHSCREEN;
- event.deathscreen.set_camera_point_target = set_camera_point_target;
- event.deathscreen.camera_point_target_x = camera_point_target.X;
- event.deathscreen.camera_point_target_y = camera_point_target.Y;
- event.deathscreen.camera_point_target_z = camera_point_target.Z;
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_ANNOUNCE_MEDIA)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- int num_files = readU16(is);
-
- infostream<<"Client: Received media announcement: packet size: "
- <<datasize<<std::endl;
-
- if (m_media_downloader == NULL ||
- m_media_downloader->isStarted()) {
- const char *problem = m_media_downloader ?
- "we already saw another announcement" :
- "all media has been received already";
- errorstream<<"Client: Received media announcement but "
- <<problem<<"! "
- <<" files="<<num_files
- <<" size="<<datasize<<std::endl;
- return;
- }
-
- // Mesh update thread must be stopped while
- // updating content definitions
- assert(!m_mesh_update_thread.IsRunning());
-
- for(int i=0; i<num_files; i++)
- {
- std::string name = deSerializeString(is);
- std::string sha1_base64 = deSerializeString(is);
- std::string sha1_raw = base64_decode(sha1_base64);
- m_media_downloader->addFile(name, sha1_raw);
- }
-
- std::vector<std::string> remote_media;
- try {
- Strfnd sf(deSerializeString(is));
- while(!sf.atend()) {
- std::string baseurl = trim(sf.next(","));
- if(baseurl != "")
- m_media_downloader->addRemoteServer(baseurl);
- }
- }
- catch(SerializationError) {
- // not supported by server or turned off
- }
-
- m_media_downloader->step(this);
- if (m_media_downloader->isDone()) {
- // might be done already if all media is in the cache
- delete m_media_downloader;
- m_media_downloader = NULL;
- }
- }
- else if(command == TOCLIENT_MEDIA)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- /*
- u16 command
- u16 total number of file bunches
- u16 index of this bunch
- u32 number of files in this bunch
- for each file {
- u16 length of name
- string name
- u32 length of data
- data
- }
- */
- int num_bunches = readU16(is);
- int bunch_i = readU16(is);
- u32 num_files = readU32(is);
- infostream<<"Client: Received files: bunch "<<bunch_i<<"/"
- <<num_bunches<<" files="<<num_files
- <<" size="<<datasize<<std::endl;
-
- if (num_files == 0)
- return;
-
- if (m_media_downloader == NULL ||
- !m_media_downloader->isStarted()) {
- const char *problem = m_media_downloader ?
- "media has not been requested" :
- "all media has been received already";
- errorstream<<"Client: Received media but "
- <<problem<<"! "
- <<" bunch "<<bunch_i<<"/"<<num_bunches
- <<" files="<<num_files
- <<" size="<<datasize<<std::endl;
- return;
- }
-
- // Mesh update thread must be stopped while
- // updating content definitions
- assert(!m_mesh_update_thread.IsRunning());
- for(u32 i=0; i<num_files; i++){
- std::string name = deSerializeString(is);
- std::string data = deSerializeLongString(is);
- m_media_downloader->conventionalTransferDone(
- name, data, this);
- }
-
- if (m_media_downloader->isDone()) {
- delete m_media_downloader;
- m_media_downloader = NULL;
- }
- }
- else if(command == TOCLIENT_TOOLDEF)
- {
- infostream<<"Client: WARNING: Ignoring TOCLIENT_TOOLDEF"<<std::endl;
- }
- else if(command == TOCLIENT_NODEDEF)
- {
- infostream<<"Client: Received node definitions: packet size: "
- <<datasize<<std::endl;
-
- // Mesh update thread must be stopped while
- // updating content definitions
- assert(!m_mesh_update_thread.IsRunning());
-
- // Decompress node definitions
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
- std::ostringstream tmp_os;
- decompressZlib(tmp_is, tmp_os);
-
- // Deserialize node definitions
- std::istringstream tmp_is2(tmp_os.str());
- m_nodedef->deSerialize(tmp_is2);
- m_nodedef_received = true;
- }
- else if(command == TOCLIENT_CRAFTITEMDEF)
- {
- infostream<<"Client: WARNING: Ignoring TOCLIENT_CRAFTITEMDEF"<<std::endl;
- }
- else if(command == TOCLIENT_ITEMDEF)
- {
- infostream<<"Client: Received item definitions: packet size: "
- <<datasize<<std::endl;
-
- // Mesh update thread must be stopped while
- // updating content definitions
- assert(!m_mesh_update_thread.IsRunning());
-
- // Decompress item definitions
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
- std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
- std::ostringstream tmp_os;
- decompressZlib(tmp_is, tmp_os);
-
- // Deserialize node definitions
- std::istringstream tmp_is2(tmp_os.str());
- m_itemdef->deSerialize(tmp_is2);
- m_itemdef_received = true;
- }
- else if(command == TOCLIENT_PLAY_SOUND)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- s32 server_id = readS32(is);
- std::string name = deSerializeString(is);
- float gain = readF1000(is);
- int type = readU8(is); // 0=local, 1=positional, 2=object
- v3f pos = readV3F1000(is);
- u16 object_id = readU16(is);
- bool loop = readU8(is);
- // Start playing
- int client_id = -1;
- switch(type){
- case 0: // local
- client_id = m_sound->playSound(name, loop, gain);
- break;
- case 1: // positional
- client_id = m_sound->playSoundAt(name, loop, gain, pos);
- break;
- case 2: { // object
- ClientActiveObject *cao = m_env.getActiveObject(object_id);
- if(cao)
- pos = cao->getPosition();
- client_id = m_sound->playSoundAt(name, loop, gain, pos);
- // TODO: Set up sound to move with object
- break; }
- default:
- break;
- }
- if(client_id != -1){
- m_sounds_server_to_client[server_id] = client_id;
- m_sounds_client_to_server[client_id] = server_id;
- if(object_id != 0)
- m_sounds_to_objects[client_id] = object_id;
- }
- }
- else if(command == TOCLIENT_STOP_SOUND)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- s32 server_id = readS32(is);
- std::map<s32, int>::iterator i =
- m_sounds_server_to_client.find(server_id);
- if(i != m_sounds_server_to_client.end()){
- int client_id = i->second;
- m_sound->stopSound(client_id);
- }
- }
- else if(command == TOCLIENT_PRIVILEGES)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- m_privileges.clear();
- infostream<<"Client: Privileges updated: ";
- u16 num_privileges = readU16(is);
- for(u16 i=0; i<num_privileges; i++){
- std::string priv = deSerializeString(is);
- m_privileges.insert(priv);
- infostream<<priv<<" ";
- }
- infostream<<std::endl;
- }
- else if(command == TOCLIENT_INVENTORY_FORMSPEC)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- // Store formspec in LocalPlayer
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
- player->inventory_formspec = deSerializeLongString(is);
- }
- else if(command == TOCLIENT_DETACHED_INVENTORY)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- std::string name = deSerializeString(is);
-
- infostream<<"Client: Detached inventory update: \""<<name<<"\""<<std::endl;
-
- Inventory *inv = NULL;
- if(m_detached_inventories.count(name) > 0)
- inv = m_detached_inventories[name];
- else{
- inv = new Inventory(m_itemdef);
- m_detached_inventories[name] = inv;
- }
- inv->deSerialize(is);
- }
- else if(command == TOCLIENT_SHOW_FORMSPEC)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- std::string formspec = deSerializeLongString(is);
- std::string formname = deSerializeString(is);
-
- ClientEvent event;
- event.type = CE_SHOW_FORMSPEC;
- // pointer is required as event is a struct only!
- // adding a std:string to a struct isn't possible
- event.show_formspec.formspec = new std::string(formspec);
- event.show_formspec.formname = new std::string(formname);
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_SPAWN_PARTICLE)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- v3f pos = readV3F1000(is);
- v3f vel = readV3F1000(is);
- v3f acc = readV3F1000(is);
- float expirationtime = readF1000(is);
- float size = readF1000(is);
- bool collisiondetection = readU8(is);
- std::string texture = deSerializeLongString(is);
- bool vertical = false;
- try {
- vertical = readU8(is);
- } catch (...) {}
-
- ClientEvent event;
- event.type = CE_SPAWN_PARTICLE;
- event.spawn_particle.pos = new v3f (pos);
- event.spawn_particle.vel = new v3f (vel);
- event.spawn_particle.acc = new v3f (acc);
-
- event.spawn_particle.expirationtime = expirationtime;
- event.spawn_particle.size = size;
- event.spawn_particle.collisiondetection =
- collisiondetection;
- event.spawn_particle.vertical = vertical;
- event.spawn_particle.texture = new std::string(texture);
-
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_ADD_PARTICLESPAWNER)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u16 amount = readU16(is);
- float spawntime = readF1000(is);
- v3f minpos = readV3F1000(is);
- v3f maxpos = readV3F1000(is);
- v3f minvel = readV3F1000(is);
- v3f maxvel = readV3F1000(is);
- v3f minacc = readV3F1000(is);
- v3f maxacc = readV3F1000(is);
- float minexptime = readF1000(is);
- float maxexptime = readF1000(is);
- float minsize = readF1000(is);
- float maxsize = readF1000(is);
- bool collisiondetection = readU8(is);
- std::string texture = deSerializeLongString(is);
- u32 id = readU32(is);
- bool vertical = false;
- try {
- vertical = readU8(is);
- } catch (...) {}
-
- ClientEvent event;
- event.type = CE_ADD_PARTICLESPAWNER;
- event.add_particlespawner.amount = amount;
- event.add_particlespawner.spawntime = spawntime;
-
- event.add_particlespawner.minpos = new v3f (minpos);
- event.add_particlespawner.maxpos = new v3f (maxpos);
- event.add_particlespawner.minvel = new v3f (minvel);
- event.add_particlespawner.maxvel = new v3f (maxvel);
- event.add_particlespawner.minacc = new v3f (minacc);
- event.add_particlespawner.maxacc = new v3f (maxacc);
-
- event.add_particlespawner.minexptime = minexptime;
- event.add_particlespawner.maxexptime = maxexptime;
- event.add_particlespawner.minsize = minsize;
- event.add_particlespawner.maxsize = maxsize;
- event.add_particlespawner.collisiondetection = collisiondetection;
- event.add_particlespawner.vertical = vertical;
- event.add_particlespawner.texture = new std::string(texture);
- event.add_particlespawner.id = id;
-
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_DELETE_PARTICLESPAWNER)
- {
- std::string datastring((char*)&data[2], datasize-2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u32 id = readU16(is);
-
- ClientEvent event;
- event.type = CE_DELETE_PARTICLESPAWNER;
- event.delete_particlespawner.id = id;
-
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_HUDADD)
- {
- std::string datastring((char *)&data[2], datasize - 2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u32 id = readU32(is);
- u8 type = readU8(is);
- v2f pos = readV2F1000(is);
- std::string name = deSerializeString(is);
- v2f scale = readV2F1000(is);
- std::string text = deSerializeString(is);
- u32 number = readU32(is);
- u32 item = readU32(is);
- u32 dir = readU32(is);
- v2f align = readV2F1000(is);
- v2f offset = readV2F1000(is);
-
- ClientEvent event;
- event.type = CE_HUDADD;
- event.hudadd.id = id;
- event.hudadd.type = type;
- event.hudadd.pos = new v2f(pos);
- event.hudadd.name = new std::string(name);
- event.hudadd.scale = new v2f(scale);
- event.hudadd.text = new std::string(text);
- event.hudadd.number = number;
- event.hudadd.item = item;
- event.hudadd.dir = dir;
- event.hudadd.align = new v2f(align);
- event.hudadd.offset = new v2f(offset);
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_HUDRM)
- {
- std::string datastring((char *)&data[2], datasize - 2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u32 id = readU32(is);
-
- ClientEvent event;
- event.type = CE_HUDRM;
- event.hudrm.id = id;
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_HUDCHANGE)
- {
- std::string sdata;
- v2f v2fdata;
- u32 intdata = 0;
-
- std::string datastring((char *)&data[2], datasize - 2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- u32 id = readU32(is);
- u8 stat = (HudElementStat)readU8(is);
-
- if (stat == HUD_STAT_POS || stat == HUD_STAT_SCALE ||
- stat == HUD_STAT_ALIGN || stat == HUD_STAT_OFFSET)
- v2fdata = readV2F1000(is);
- else if (stat == HUD_STAT_NAME || stat == HUD_STAT_TEXT)
- sdata = deSerializeString(is);
- else
- intdata = readU32(is);
-
- ClientEvent event;
- event.type = CE_HUDCHANGE;
- event.hudchange.id = id;
- event.hudchange.stat = (HudElementStat)stat;
- event.hudchange.v2fdata = new v2f(v2fdata);
- event.hudchange.sdata = new std::string(sdata);
- event.hudchange.data = intdata;
- m_client_event_queue.push_back(event);
- }
- else if(command == TOCLIENT_HUD_SET_FLAGS)
- {
- std::string datastring((char *)&data[2], datasize - 2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
-
- u32 flags = readU32(is);
- u32 mask = readU32(is);
-
- player->hud_flags &= ~mask;
- player->hud_flags |= flags;
- }
- else if(command == TOCLIENT_HUD_SET_PARAM)
- {
- std::string datastring((char *)&data[2], datasize - 2);
- std::istringstream is(datastring, std::ios_base::binary);
-
- Player *player = m_env.getLocalPlayer();
- assert(player != NULL);
+ /*
+ Handle runtime commands
+ */
- u16 param = readU16(is);
- std::string value = deSerializeString(is);
-
- if(param == HUD_PARAM_HOTBAR_ITEMCOUNT && value.size() == 4){
- s32 hotbar_itemcount = readS32((u8*) value.c_str());
- if(hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX)
- player->hud_hotbar_itemcount = hotbar_itemcount;
- } else if (param == HUD_PARAM_HOTBAR_IMAGE) {
- ((LocalPlayer *) player)->hotbar_image = value;
- } else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {
- ((LocalPlayer *) player)->hotbar_selected_image = value;
- }
- }
- else
- {
- infostream<<"Client: Ignoring unknown command "
- <<command<<std::endl;
- }
+ handleCommand(pkt);
+ delete pkt;
}
-void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable)
+void Client::Send(NetworkPacket* pkt)
{
- //JMutexAutoLock lock(m_con_mutex); //bulk comment-out
- m_con.Send(PEER_ID_SERVER, channelnum, data, reliable);
+ m_con.Send(PEER_ID_SERVER,
+ serverCommandFactoryTable[pkt->getCommand()].channel,
+ pkt,
+ serverCommandFactoryTable[pkt->getCommand()].reliable);
+ delete pkt;
}
void Client::interact(u8 action, const PointedThing& pointed)
{
- if(connectedAndInitialized() == false){
- infostream<<"Client::interact() "
+ if(m_state != LC_Ready) {
+ errorstream << "Client::interact() "
"cancelled (not connected)"
- <<std::endl;
+ << std::endl;
return;
}
- std::ostringstream os(std::ios_base::binary);
-
/*
[0] u16 command
[2] u8 action
3: place block or item (to abovesurface)
4: use item
*/
- writeU16(os, TOSERVER_INTERACT);
- writeU8(os, action);
- writeU16(os, getPlayerItem());
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_INTERACT, 1 + 2 + 0);
+
+ *pkt << action;
+ *pkt << (u16)getPlayerItem();
+
std::ostringstream tmp_os(std::ios::binary);
pointed.serialize(tmp_os);
- os<<serializeLongString(tmp_os.str());
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+ pkt->putLongString(tmp_os.str());
- // Send as reliable
- Send(0, data, true);
+ Send(pkt);
}
void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
const std::map<std::string, std::string> &fields)
{
- std::ostringstream os(std::ios_base::binary);
+ size_t fields_size = fields.size();
+
+ FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of nodemeta fields");
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_NODEMETA_FIELDS, 0);
+
+ *pkt << p << formname << (u16) (fields_size & 0xFFFF);
- writeU16(os, TOSERVER_NODEMETA_FIELDS);
- writeV3S16(os, p);
- os<<serializeString(formname);
- writeU16(os, fields.size());
for(std::map<std::string, std::string>::const_iterator
- i = fields.begin(); i != fields.end(); i++){
+ i = fields.begin(); i != fields.end(); i++) {
const std::string &name = i->first;
const std::string &value = i->second;
- os<<serializeString(name);
- os<<serializeLongString(value);
+ *pkt << name;
+ pkt->putLongString(value);
}
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+ Send(pkt);
}
-
+
void Client::sendInventoryFields(const std::string &formname,
const std::map<std::string, std::string> &fields)
{
- std::ostringstream os(std::ios_base::binary);
+ size_t fields_size = fields.size();
+ FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of inventory fields");
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_INVENTORY_FIELDS, 0);
+ *pkt << formname << (u16) (fields_size & 0xFFFF);
- writeU16(os, TOSERVER_INVENTORY_FIELDS);
- os<<serializeString(formname);
- writeU16(os, fields.size());
for(std::map<std::string, std::string>::const_iterator
- i = fields.begin(); i != fields.end(); i++){
- const std::string &name = i->first;
+ i = fields.begin(); i != fields.end(); i++) {
+ const std::string &name = i->first;
const std::string &value = i->second;
- os<<serializeString(name);
- os<<serializeLongString(value);
+ *pkt << name;
+ pkt->putLongString(value);
}
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+ Send(pkt);
}
void Client::sendInventoryAction(InventoryAction *a)
{
std::ostringstream os(std::ios_base::binary);
- u8 buf[12];
-
- // Write command
- writeU16(buf, TOSERVER_INVENTORY_ACTION);
- os.write((char*)buf, 2);
a->serialize(os);
-
+
// Make data buffer
std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_INVENTORY_ACTION, s.size());
+ pkt->putRawString(s.c_str(),s.size());
+
+ Send(pkt);
}
void Client::sendChatMessage(const std::wstring &message)
{
- std::ostringstream os(std::ios_base::binary);
- u8 buf[12];
-
- // Write command
- writeU16(buf, TOSERVER_CHAT_MESSAGE);
- os.write((char*)buf, 2);
-
- // Write length
- writeU16(buf, message.size());
- os.write((char*)buf, 2);
-
- // Write string
- for(u32 i=0; i<message.size(); i++)
- {
- u16 w = message[i];
- writeU16(buf, w);
- os.write((char*)buf, 2);
- }
-
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_CHAT_MESSAGE, 2 + message.size() * sizeof(u16));
+
+ *pkt << message;
+
+ Send(pkt);
}
-void Client::sendChangePassword(const std::wstring oldpassword,
- const std::wstring newpassword)
+void Client::sendChangePassword(const std::wstring &oldpassword,
+ const std::wstring &newpassword)
{
Player *player = m_env.getLocalPlayer();
if(player == NULL)
std::string oldpwd = translatePassword(playername, oldpassword);
std::string newpwd = translatePassword(playername, newpassword);
- std::ostringstream os(std::ios_base::binary);
- u8 buf[2+PASSWORD_SIZE*2];
- /*
- [0] u16 TOSERVER_PASSWORD
- [2] u8[28] old password
- [30] u8[28] new password
- */
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_PASSWORD, 2 * PASSWORD_SIZE);
- writeU16(buf, TOSERVER_PASSWORD);
- for(u32 i=0;i<PASSWORD_SIZE-1;i++)
- {
- buf[2+i] = i<oldpwd.length()?oldpwd[i]:0;
- buf[30+i] = i<newpwd.length()?newpwd[i]:0;
+ for(u8 i = 0; i < PASSWORD_SIZE; i++) {
+ *pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0);
}
- buf[2+PASSWORD_SIZE-1] = 0;
- buf[30+PASSWORD_SIZE-1] = 0;
- os.write((char*)buf, 2+PASSWORD_SIZE*2);
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+ for(u8 i = 0; i < PASSWORD_SIZE; i++) {
+ *pkt << (u8) (i < newpwd.length() ? newpwd[i] : 0);
+ }
+
+ Send(pkt);
}
void Client::sendDamage(u8 damage)
{
DSTACK(__FUNCTION_NAME);
- std::ostringstream os(std::ios_base::binary);
- writeU16(os, TOSERVER_DAMAGE);
- writeU8(os, damage);
-
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_DAMAGE, sizeof(u8));
+ *pkt << damage;
+ Send(pkt);
}
void Client::sendBreath(u16 breath)
{
DSTACK(__FUNCTION_NAME);
- std::ostringstream os(std::ios_base::binary);
- writeU16(os, TOSERVER_BREATH);
- writeU16(os, breath);
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_BREATH, sizeof(u16));
+ *pkt << breath;
+ Send(pkt);
}
void Client::sendRespawn()
{
DSTACK(__FUNCTION_NAME);
- std::ostringstream os(std::ios_base::binary);
- writeU16(os, TOSERVER_RESPAWN);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_RESPAWN, 0);
+ Send(pkt);
+}
- // Make data buffer
- std::string s = os.str();
- SharedBuffer<u8> data((u8*)s.c_str(), s.size());
- // Send as reliable
- Send(0, data, true);
+void Client::sendReady()
+{
+ DSTACK(__FUNCTION_NAME);
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_CLIENT_READY,
+ 1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(minetest_version_hash));
+
+ *pkt << (u8) VERSION_MAJOR << (u8) VERSION_MINOR << (u8) VERSION_PATCH_ORIG
+ << (u8) 0 << (u16) strlen(minetest_version_hash);
+
+ pkt->putRawString(minetest_version_hash, (u16) strlen(minetest_version_hash));
+ Send(pkt);
}
void Client::sendPlayerPos()
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
LocalPlayer *myplayer = m_env.getLocalPlayer();
if(myplayer == NULL)
return;
// Save bandwidth by only updating position when something changed
- if(myplayer->last_position == myplayer->getPosition() &&
- myplayer->last_speed == myplayer->getSpeed() &&
- myplayer->last_pitch == myplayer->getPitch() &&
- myplayer->last_yaw == myplayer->getYaw() &&
+ if(myplayer->last_position == myplayer->getPosition() &&
+ myplayer->last_speed == myplayer->getSpeed() &&
+ myplayer->last_pitch == myplayer->getPitch() &&
+ myplayer->last_yaw == myplayer->getYaw() &&
myplayer->last_keyPressed == myplayer->keyPressed)
return;
- myplayer->last_position = myplayer->getPosition();
- myplayer->last_speed = myplayer->getSpeed();
- myplayer->last_pitch = myplayer->getPitch();
- myplayer->last_yaw = myplayer->getYaw();
+ myplayer->last_position = myplayer->getPosition();
+ myplayer->last_speed = myplayer->getSpeed();
+ myplayer->last_pitch = myplayer->getPitch();
+ myplayer->last_yaw = myplayer->getYaw();
myplayer->last_keyPressed = myplayer->keyPressed;
u16 our_peer_id;
//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
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;
- // Check that an existing peer_id is the same as the connection's
+
assert(myplayer->peer_id == our_peer_id);
-
- v3f pf = myplayer->getPosition();
+
+ v3f pf = myplayer->getPosition();
+ v3f sf = myplayer->getSpeed();
+ s32 pitch = myplayer->getPitch() * 100;
+ s32 yaw = myplayer->getYaw() * 100;
+ u32 keyPressed = myplayer->keyPressed;
+
v3s32 position(pf.X*100, pf.Y*100, pf.Z*100);
- v3f sf = myplayer->getSpeed();
v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100);
- s32 pitch = myplayer->getPitch() * 100;
- s32 yaw = myplayer->getYaw() * 100;
- u32 keyPressed=myplayer->keyPressed;
/*
Format:
- [0] u16 command
- [2] v3s32 position*100
- [2+12] v3s32 speed*100
- [2+12+12] s32 pitch*100
- [2+12+12+4] s32 yaw*100
- [2+12+12+4+4] u32 keyPressed
+ [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
*/
- SharedBuffer<u8> data(2+12+12+4+4+4);
- writeU16(&data[0], TOSERVER_PLAYERPOS);
- writeV3S32(&data[2], position);
- writeV3S32(&data[2+12], speed);
- writeS32(&data[2+12+12], pitch);
- writeS32(&data[2+12+12+4], yaw);
- writeU32(&data[2+12+12+4+4], keyPressed);
- // Send as unreliable
- Send(0, data, false);
+
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
+
+ *pkt << position << speed << pitch << yaw << keyPressed;
+
+ Send(pkt);
}
void Client::sendPlayerItem(u16 item)
// Set peer id if not set already
if(myplayer->peer_id == PEER_ID_INEXISTENT)
myplayer->peer_id = our_peer_id;
- // Check that an existing peer_id is the same as the connection's
assert(myplayer->peer_id == our_peer_id);
- SharedBuffer<u8> data(2+2);
- writeU16(&data[0], TOSERVER_PLAYERITEM);
- writeU16(&data[2], item);
+ NetworkPacket* pkt = new NetworkPacket(TOSERVER_PLAYERITEM, 2);
+
+ *pkt << item;
- // Send as reliable
- Send(0, data, true);
+ Send(pkt);
}
void Client::removeNode(v3s16 p)
{
std::map<v3s16, MapBlock*> modified_blocks;
- try
- {
- //TimeTaker t("removeNodeAndUpdate", m_device);
+ try {
m_env.getMap().removeNodeAndUpdate(p, modified_blocks);
}
- catch(InvalidPositionException &e)
- {
+ catch(InvalidPositionException &e) {
}
-
- // add urgent task to update the modified node
- addUpdateMeshTaskForNode(p, false, true);
- for(std::map<v3s16, MapBlock * >::iterator
+ for(std::map<v3s16, MapBlock *>::iterator
i = modified_blocks.begin();
- i != modified_blocks.end(); ++i)
- {
- addUpdateMeshTaskWithEdge(i->first);
+ i != modified_blocks.end(); ++i) {
+ addUpdateMeshTaskWithEdge(i->first, false, true);
}
}
void Client::addNode(v3s16 p, MapNode n, bool remove_metadata)
{
- TimeTaker timer1("Client::addNode()");
+ //TimeTaker timer1("Client::addNode()");
std::map<v3s16, MapBlock*> modified_blocks;
- try
- {
+ try {
//TimeTaker timer3("Client::addNode(): addNodeAndUpdate");
m_env.getMap().addNodeAndUpdate(p, n, modified_blocks, remove_metadata);
}
- catch(InvalidPositionException &e)
- {}
-
- for(std::map<v3s16, MapBlock * >::iterator
+ catch(InvalidPositionException &e) {
+ }
+
+ for(std::map<v3s16, MapBlock *>::iterator
i = modified_blocks.begin();
- i != modified_blocks.end(); ++i)
- {
- addUpdateMeshTaskWithEdge(i->first);
+ i != modified_blocks.end(); ++i) {
+ addUpdateMeshTaskWithEdge(i->first, false, true);
}
}
-
+
void Client::setPlayerControl(PlayerControl &control)
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
LocalPlayer *player = m_env.getLocalPlayer();
assert(player != NULL);
player->control = control;
void Client::selectPlayerItem(u16 item)
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
m_playeritem = item;
m_inventory_updated = true;
sendPlayerItem(item);
// updated from the server. If it is true, it is set to false.
bool Client::getLocalInventoryUpdated()
{
- // m_inventory_updated is behind envlock
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
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)
{
- //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
Player *player = m_env.getLocalPlayer();
assert(player != NULL);
dst = player->inventory;
}
break;
default:
- assert(0);
+ FATAL_ERROR("Invalid inventory location type.");
}
return NULL;
}
+
void Client::inventoryAction(InventoryAction *a)
{
/*
m_env.getActiveObjects(from_pos_f_on_map, max_d, objects);
- //infostream<<"Collected "<<objects.size()<<" nearby objects"<<std::endl;
-
// Sort them.
// After this, the closest object is the first in the array.
std::sort(objects.begin(), objects.end());
- for(u32 i=0; i<objects.size(); i++)
+ for(unsigned int i=0; i<objects.size(); i++)
{
ClientActiveObject *obj = objects[i].obj;
-
+
core::aabbox3d<f32> *selection_box = obj->getSelectionBox();
if(selection_box == NULL)
continue;
if(offsetted_box.intersectsWithLine(shootline_on_map))
{
- //infostream<<"Returning selected object"<<std::endl;
return obj;
}
}
- //infostream<<"No object selected; returning NULL."<<std::endl;
return NULL;
}
-void Client::printDebugInfo(std::ostream &os)
-{
- //JMutexAutoLock lock1(m_fetchblock_mutex);
- /*JMutexAutoLock lock2(m_incoming_queue_mutex);
-
- os<<"m_incoming_queue.getSize()="<<m_incoming_queue.getSize()
- //<<", m_fetchblock_history.size()="<<m_fetchblock_history.size()
- //<<", m_opt_not_found_history.size()="<<m_opt_not_found_history.size()
- <<std::endl;*/
-}
-
std::list<std::string> Client::getConnectedPlayerNames()
{
return m_env.getPlayerNames();
return m_crack_level;
}
+void Client::setHighlighted(v3s16 pos, bool show_highlighted)
+{
+ m_show_highlighted = show_highlighted;
+ v3s16 old_highlighted_pos = m_highlighted_pos;
+ m_highlighted_pos = pos;
+ addUpdateMeshTaskForNode(old_highlighted_pos, false, true);
+ addUpdateMeshTaskForNode(m_highlighted_pos, false, true);
+}
+
void Client::setCrack(int level, v3s16 pos)
{
int old_crack_level = m_crack_level;
{
if(m_chat_queue.size() == 0)
return false;
- message = m_chat_queue.pop_front();
+ message = m_chat_queue.front();
+ m_chat_queue.pop();
return true;
}
// Show locally
if (message[0] == L'/')
{
- m_chat_queue.push_back(
- (std::wstring)L"issued command: "+message);
+ m_chat_queue.push((std::wstring)L"issued command: " + message);
}
else
{
LocalPlayer *player = m_env.getLocalPlayer();
assert(player != NULL);
std::wstring name = narrow_to_wide(player->getName());
- m_chat_queue.push_back(
- (std::wstring)L"<"+name+L"> "+message);
+ m_chat_queue.push((std::wstring)L"<" + name + L"> " + message);
}
}
void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
{
- /*infostream<<"Client::addUpdateMeshTask(): "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<" ack_to_server="<<ack_to_server
- <<" urgent="<<urgent
- <<std::endl;*/
-
MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p);
if(b == NULL)
return;
-
+
/*
Create a task to update the mesh of the block
*/
-
- MeshMakeData *data = new MeshMakeData(this);
-
+
+ MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders);
+
{
//TimeTaker timer("data fill");
// Release: ~0ms
// Debug: 1-6ms, avg=2ms
data->fill(b);
data->setCrack(m_crack_level, m_crack_pos);
- data->setSmoothLighting(g_settings->getBool("smooth_lighting"));
+ data->setHighlighted(m_highlighted_pos, m_show_highlighted);
+ data->setSmoothLighting(m_cache_smooth_lighting);
}
- // Debug wait
- //while(m_mesh_update_thread.m_queue_in.size() > 0) sleep_ms(10);
-
// Add task to queue
m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent);
-
- /*infostream<<"Mesh update input queue size is "
- <<m_mesh_update_thread.m_queue_in.size()
- <<std::endl;*/
}
void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server, bool urgent)
{
- /*{
- v3s16 p = blockpos;
- infostream<<"Client::addUpdateMeshTaskWithEdge(): "
- <<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
- <<std::endl;
- }*/
-
try{
- v3s16 p = blockpos + v3s16(0,0,0);
- //MapBlock *b = m_env.getMap().getBlockNoCreate(p);
- addUpdateMeshTask(p, ack_to_server, urgent);
+ addUpdateMeshTask(blockpos, ack_to_server, urgent);
}
catch(InvalidPositionException &e){}
+
// Leading edge
for (int i=0;i<6;i++)
{
<<std::endl;
}
- v3s16 blockpos = getNodeBlockPos(nodepos);
+ v3s16 blockpos = getNodeBlockPos(nodepos);
v3s16 blockpos_relative = blockpos * MAP_BLOCKSIZE;
try{
- v3s16 p = blockpos + v3s16(0,0,0);
- addUpdateMeshTask(p, ack_to_server, urgent);
+ addUpdateMeshTask(blockpos, ack_to_server, urgent);
}
- catch(InvalidPositionException &e){}
+ catch(InvalidPositionException &e) {}
+
// Leading edge
if(nodepos.X == blockpos_relative.X){
try{
}
catch(InvalidPositionException &e){}
}
+
if(nodepos.Y == blockpos_relative.Y){
try{
v3s16 p = blockpos + v3s16(0,-1,0);
}
catch(InvalidPositionException &e){}
}
+
if(nodepos.Z == blockpos_relative.Z){
try{
v3s16 p = blockpos + v3s16(0,0,-1);
ClientEvent Client::getClientEvent()
{
- if(m_client_event_queue.size() == 0)
- {
- ClientEvent event;
+ ClientEvent event;
+ if(m_client_event_queue.size() == 0) {
event.type = CE_NONE;
- return event;
}
- return m_client_event_queue.pop_front();
+ else {
+ event = m_client_event_queue.front();
+ m_client_event_queue.pop();
+ }
+ return event;
}
float Client::mediaReceiveProgress()
return 1.0; // downloader only exists when not yet done
}
-void draw_load_screen(const std::wstring &text,
- IrrlichtDevice* device, gui::IGUIFont* font,
- float dtime=0 ,int percent=0, bool clouds=true);
void Client::afterContentReceived(IrrlichtDevice *device, gui::IGUIFont* font)
{
infostream<<"Client::afterContentReceived() started"<<std::endl;
- assert(m_itemdef_received);
- assert(m_nodedef_received);
- assert(mediaReceived());
-
+ assert(m_itemdef_received); // pre-condition
+ assert(m_nodedef_received); // pre-condition
+ assert(mediaReceived()); // pre-condition
+
+ const wchar_t* text = wgettext("Loading textures...");
+
// Rebuild inherited images and recreate textures
infostream<<"- Rebuilding images and textures"<<std::endl;
+ draw_load_screen(text,device, guienv, 0, 70);
m_tsrc->rebuildImagesAndTextures();
+ delete[] text;
// Rebuild shaders
infostream<<"- Rebuilding shaders"<<std::endl;
+ text = wgettext("Rebuilding shaders...");
+ draw_load_screen(text, device, guienv, 0, 75);
m_shsrc->rebuildShaders();
+ delete[] text;
// Update node aliases
infostream<<"- Updating node aliases"<<std::endl;
+ text = wgettext("Initializing nodes...");
+ draw_load_screen(text, device, guienv, 0, 80);
m_nodedef->updateAliases(m_itemdef);
+ m_nodedef->setNodeRegistrationStatus(true);
+ m_nodedef->runNodeResolverCallbacks();
+ delete[] text;
- // Update node textures
+ // Update node textures and assign shaders to each tile
infostream<<"- Updating node textures"<<std::endl;
- m_nodedef->updateTextures(m_tsrc);
+ m_nodedef->updateTextures(this);
// Preload item textures and meshes if configured to
if(g_settings->getBool("preload_item_visuals"))
{
verbosestream<<"Updating item textures and meshes"<<std::endl;
- wchar_t* text = wgettext("Item textures...");
- draw_load_screen(text,device,font,0,0);
+ text = wgettext("Item textures...");
+ draw_load_screen(text, device, guienv, 0, 0);
std::set<std::string> names = m_itemdef->getAll();
size_t size = names.size();
size_t count = 0;
int percent = 0;
for(std::set<std::string>::const_iterator
- i = names.begin(); i != names.end(); ++i){
+ i = names.begin(); i != names.end(); ++i)
+ {
// Asking for these caches the result
m_itemdef->getInventoryTexture(*i, this);
m_itemdef->getWieldMesh(*i, this);
count++;
- percent = count*100/size;
- if (count%50 == 0) // only update every 50 item
- draw_load_screen(text,device,font,0,percent);
+ percent = (count * 100 / size * 0.2) + 80;
+ draw_load_screen(text, device, guienv, 0, percent);
}
delete[] text;
}
// Start mesh update thread after setting up content definitions
infostream<<"- Starting mesh update thread"<<std::endl;
m_mesh_update_thread.Start();
-
+
+ m_state = LC_Ready;
+ sendReady();
+ text = wgettext("Done!");
+ draw_load_screen(text, device, guienv, 0, 100);
infostream<<"Client::afterContentReceived() done"<<std::endl;
+ delete[] text;
}
float Client::getRTT(void)
{
- try{
- return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
- } catch(con::PeerNotFoundException &e){
- return 1337;
+ return m_con.getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
+}
+
+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));
+}
+
+void Client::makeScreenshot(IrrlichtDevice *device)
+{
+ irr::video::IVideoDriver *driver = device->getVideoDriver();
+ irr::video::IImage* const raw_image = driver->createScreenShot();
+ if (raw_image) {
+ irr::video::IImage* const image = driver->createImage(video::ECF_R8G8B8,
+ raw_image->getDimension());
+
+ if (image) {
+ raw_image->copyTo(image);
+ irr::c8 filename[256];
+ snprintf(filename, sizeof(filename),
+ (std::string("%s") + DIR_DELIM + "screenshot_%u.png").c_str(),
+ g_settings->get("screenshot_path").c_str(),
+ device->getTimer()->getRealTime());
+ std::ostringstream sstr;
+ if (driver->writeImageToFile(image, filename)) {
+ sstr << "Saved screenshot to '" << filename << "'";
+ } else {
+ sstr << "Failed to save screenshot '" << filename << "'";
+ }
+ m_chat_queue.push(narrow_to_wide(sstr.str()));
+ infostream << sstr.str() << std::endl;
+ image->drop();
+ }
+ raw_image->drop();
}
}
{
return m_shsrc;
}
+scene::ISceneManager* Client::getSceneManager()
+{
+ return m_device->getSceneManager();
+}
u16 Client::allocateUnknownNodeId(const std::string &name)
{
- errorstream<<"Client::allocateUnknownNodeId(): "
- <<"Client cannot allocate node IDs"<<std::endl;
- assert(0);
+ errorstream << "Client::allocateUnknownNodeId(): "
+ << "Client cannot allocate node IDs" << std::endl;
+ FATAL_ERROR("Client allocated unknown node");
+
return CONTENT_IGNORE;
}
ISoundManager* Client::getSoundManager()
return m_event;
}
+ParticleManager* Client::getParticleManager()
+{
+ return &m_particle_manager;
+}
+
scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
{
std::map<std::string, std::string>::const_iterator i =
<<std::endl;
return NULL;
}
- const std::string &data = i->second;
+ const std::string &data = i->second;
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();
- io::IReadFile *rfile = irrfs->createMemoryReadFile(
+ io::IReadFile *rfile = irrfs->createMemoryReadFile(
*data_rw, data_rw.getSize(), filename.c_str());
- assert(rfile);
+ FATAL_ERROR_IF(!rfile, "Could not create/open RAM file");
+
scene::IAnimatedMesh *mesh = smgr->getMesh(rfile);
rfile->drop();
// NOTE: By playing with Irrlicht refcounts, maybe we could cache a bunch
smgr->getMeshCache()->removeMesh(mesh);
return mesh;
}
-
projects / oweals / minetest.git / blobdiff