X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserver.cpp;h=778a932417f285b24edf3b80fe927068d1abba1e;hb=6c06330daf04ed1c390131755b64338ca7d79a7e;hp=6a1e8085b530b5c8f343239d511a30540085d5fe;hpb=009149a073ac02dd412af3c203979157976c0dd8;p=dragonfireclient.git diff --git a/src/server.cpp b/src/server.cpp index 6a1e8085b..778a93241 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "environment.h" #include "map.h" #include "jthread/jmutexautolock.h" -#include "main.h" #include "constants.h" #include "voxel.h" #include "config.h" @@ -222,12 +221,9 @@ Server::Server( infostream<<"- world: "<loadScript(scriptpath)) - throw ModError("Failed to load and run " + scriptpath); + if (!m_script->loadMod(script_path, BUILTIN_MOD_NAME)) { + throw ModError("Failed to load and run " + script_path); + } - // Print 'em - infostream<<"Server: Loading mods: "; + // Print mods + infostream << "Server: Loading mods: "; for(std::vector::iterator i = m_mods.begin(); i != m_mods.end(); i++){ const ModSpec &mod = *i; - infostream<::iterator i = m_mods.begin(); - i != m_mods.end(); i++){ + for (std::vector::iterator i = m_mods.begin(); + i != m_mods.end(); i++) { const ModSpec &mod = *i; - std::string scriptpath = mod.path + DIR_DELIM + "init.lua"; - infostream<<" ["<loadMod(scriptpath, mod.name); - if(!success){ - errorstream<<"Server: Failed to load and run " - <loadMod(script_path, mod.name)) { + errorstream << "Server: Failed to load and run " + << script_path << std::endl; + throw ModError("Failed to load and run " + script_path); } } @@ -340,7 +338,10 @@ Server::Server( m_nodedef->setNodeRegistrationStatus(true); // Perform pending node name resolutions - m_nodedef->runNodeResolverCallbacks(); + m_nodedef->runNodeResolveCallbacks(); + + // init the recipe hashes to speed up crafting + m_craftdef->initHashes(this); // Initialize Environment m_env = new ServerEnvironment(servermap, m_script, this, m_path_world); @@ -488,8 +489,16 @@ void Server::step(float dtime) } // Throw if fatal error occurred in thread std::string async_err = m_async_fatal_error.get(); - if(async_err != ""){ - throw ServerError(async_err); + if(async_err != "") { + if (m_simple_singleplayer_mode) { + throw ServerError(async_err); + } + else { + errorstream << "UNRECOVERABLE error occurred. Stopping server. " + << "Please fix the following error:" << std::endl + << async_err << std::endl; + FATAL_ERROR(async_err.c_str()); + } } } @@ -535,23 +544,18 @@ void Server::AsyncRunStep(bool initial_step) /* Update time of day and overall game time */ - { - JMutexAutoLock envlock(m_env_mutex); + m_env->setTimeOfDaySpeed(g_settings->getFloat("time_speed")); - m_env->setTimeOfDaySpeed(g_settings->getFloat("time_speed")); - - /* - Send to clients at constant intervals - */ + /* + Send to clients at constant intervals + */ - m_time_of_day_send_timer -= dtime; - if(m_time_of_day_send_timer < 0.0) - { - m_time_of_day_send_timer = g_settings->getFloat("time_send_interval"); - u16 time = m_env->getTimeOfDay(); - float time_speed = g_settings->getFloat("time_speed"); - SendTimeOfDay(PEER_ID_INEXISTENT, time, time_speed); - } + m_time_of_day_send_timer -= dtime; + if(m_time_of_day_send_timer < 0.0) { + m_time_of_day_send_timer = g_settings->getFloat("time_send_interval"); + u16 time = m_env->getTimeOfDay(); + float time_speed = g_settings->getFloat("time_speed"); + SendTimeOfDay(PEER_ID_INEXISTENT, time, time_speed); } { @@ -586,56 +590,6 @@ void Server::AsyncRunStep(bool initial_step) Do background stuff */ - /* - Handle players - */ - { - JMutexAutoLock lock(m_env_mutex); - - std::list clientids = m_clients.getClientIDs(); - - ScopeProfiler sp(g_profiler, "Server: handle players"); - - for(std::list::iterator - i = clientids.begin(); - i != clientids.end(); ++i) - { - PlayerSAO *playersao = getPlayerSAO(*i); - if(playersao == NULL) - continue; - - /* - Handle player HPs (die if hp=0) - */ - if(playersao->m_hp_not_sent && g_settings->getBool("enable_damage")) - { - if(playersao->getHP() == 0) - DiePlayer(*i); - else - SendPlayerHP(*i); - } - - /* - Send player breath if changed - */ - if(playersao->m_breath_not_sent) { - SendPlayerBreath(*i); - } - - /* - Send player inventories if necessary - */ - if(playersao->m_moved) { - SendMovePlayer(*i); - playersao->m_moved = false; - } - if(playersao->m_inventory_not_sent) { - UpdateCrafting(*i); - SendInventory(*i); - } - } - } - /* Transform liquids */ m_liquid_transform_timer += dtime; if(m_liquid_transform_timer >= m_liquid_transform_every) @@ -820,16 +774,11 @@ void Server::AsyncRunStep(bool initial_step) obj->m_known_by_count++; } - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, 0, client->peer_id); - pkt->putRawString(data_buffer.c_str(), data_buffer.size()); - - + u32 pktSize = SendActiveObjectRemoveAdd(client->peer_id, data_buffer); verbosestream << "Server: Sent object remove/add: " << removed_objects.size() << " removed, " << added_objects.size() << " added, " - << "packet size is " << pkt->getSize() << std::endl; - - Send(pkt); + << "packet size is " << pktSize << std::endl; } m_clients.Unlock(); } @@ -843,25 +792,22 @@ void Server::AsyncRunStep(bool initial_step) // Key = object id // Value = data sent by object - std::map* > buffered_messages; + std::map* > buffered_messages; // Get active object messages from environment - for(;;) - { + for(;;) { ActiveObjectMessage aom = m_env->getActiveObjectMessage(); - if(aom.id == 0) + if (aom.id == 0) break; - std::list* message_list = NULL; - std::map* >::iterator n; + std::vector* message_list = NULL; + std::map* >::iterator n; n = buffered_messages.find(aom.id); - if(n == buffered_messages.end()) - { - message_list = new std::list; + if (n == buffered_messages.end()) { + message_list = new std::vector; buffered_messages[aom.id] = message_list; } - else - { + else { message_list = n->second; } message_list->push_back(aom); @@ -870,28 +816,26 @@ void Server::AsyncRunStep(bool initial_step) m_clients.Lock(); std::map clients = m_clients.getClientList(); // Route data to every client - for(std::map::iterator + for (std::map::iterator i = clients.begin(); - i != clients.end(); ++i) - { + i != clients.end(); ++i) { RemoteClient *client = i->second; std::string reliable_data; std::string unreliable_data; // Go through all objects in message buffer - for(std::map* >::iterator + for (std::map* >::iterator j = buffered_messages.begin(); - j != buffered_messages.end(); ++j) - { + j != buffered_messages.end(); ++j) { // If object is not known by client, skip it u16 id = j->first; - if(client->m_known_objects.find(id) == client->m_known_objects.end()) + if (client->m_known_objects.find(id) == client->m_known_objects.end()) continue; + // Get message list of object - std::list* list = j->second; + std::vector* list = j->second; // Go through every message - for(std::list::iterator - k = list->begin(); k != list->end(); ++k) - { + for (std::vector::iterator + k = list->begin(); k != list->end(); ++k) { // Compose the full new data with header ActiveObjectMessage aom = *k; std::string new_data; @@ -913,28 +857,19 @@ void Server::AsyncRunStep(bool initial_step) Send them. */ if(reliable_data.size() > 0) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ACTIVE_OBJECT_MESSAGES, - 0, client->peer_id); - - pkt->putRawString(reliable_data.c_str(), reliable_data.size()); - Send(pkt); + SendActiveObjectMessages(client->peer_id, reliable_data); } if(unreliable_data.size() > 0) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ACTIVE_OBJECT_MESSAGES, - 0, client->peer_id); - - pkt->putRawString(unreliable_data.c_str(), unreliable_data.size()); - Send(pkt); + SendActiveObjectMessages(client->peer_id, unreliable_data, false); } } m_clients.Unlock(); // Clear buffered_messages - for(std::map* >::iterator + for(std::map* >::iterator i = buffered_messages.begin(); - i != buffered_messages.end(); ++i) - { + i != buffered_messages.end(); ++i) { delete i->second; } } @@ -961,83 +896,67 @@ void Server::AsyncRunStep(bool initial_step) while(m_unsent_map_edit_queue.size() != 0) { - MapEditEvent* event = m_unsent_map_edit_queue.pop_front(); + MapEditEvent* event = m_unsent_map_edit_queue.front(); + m_unsent_map_edit_queue.pop(); // Players far away from the change are stored here. // Instead of sending the changes, MapBlocks are set not sent // for them. - std::list far_players; + std::vector far_players; - if(event->type == MEET_ADDNODE || event->type == MEET_SWAPNODE) - { - //infostream<<"Server: MEET_ADDNODE"<type) { + case MEET_ADDNODE: + case MEET_SWAPNODE: prof.add("MEET_ADDNODE", 1); - if(disable_single_change_sending) - sendAddNode(event->p, event->n, event->already_known_by_peer, - &far_players, 5, event->type == MEET_ADDNODE); - else - sendAddNode(event->p, event->n, event->already_known_by_peer, - &far_players, 30, event->type == MEET_ADDNODE); - } - else if(event->type == MEET_REMOVENODE) - { - //infostream<<"Server: MEET_REMOVENODE"<p, event->n, event->already_known_by_peer, + &far_players, disable_single_change_sending ? 5 : 30, + event->type == MEET_ADDNODE); + break; + case MEET_REMOVENODE: prof.add("MEET_REMOVENODE", 1); - if(disable_single_change_sending) - sendRemoveNode(event->p, event->already_known_by_peer, - &far_players, 5); - else - sendRemoveNode(event->p, event->already_known_by_peer, - &far_players, 30); - } - else if(event->type == MEET_BLOCK_NODE_METADATA_CHANGED) - { - infostream<<"Server: MEET_BLOCK_NODE_METADATA_CHANGED"<p); - } - else if(event->type == MEET_OTHER) - { - infostream<<"Server: MEET_OTHER"<p, event->already_known_by_peer, + &far_players, disable_single_change_sending ? 5 : 30); + break; + case MEET_BLOCK_NODE_METADATA_CHANGED: + infostream << "Server: MEET_BLOCK_NODE_METADATA_CHANGED" << std::endl; + prof.add("MEET_BLOCK_NODE_METADATA_CHANGED", 1); + setBlockNotSent(event->p); + break; + case MEET_OTHER: + infostream << "Server: MEET_OTHER" << std::endl; prof.add("MEET_OTHER", 1); for(std::set::iterator i = event->modified_blocks.begin(); - i != event->modified_blocks.end(); ++i) - { + i != event->modified_blocks.end(); ++i) { setBlockNotSent(*i); } - } - else - { + break; + default: prof.add("unknown", 1); - infostream<<"WARNING: Server: Unknown MapEditEvent " - <<((u32)event->type)<type) << std::endl; + break; } /* Set blocks not sent to far players */ - if(!far_players.empty()) - { + if(!far_players.empty()) { // Convert list format to that wanted by SetBlocksNotSent std::map modified_blocks2; for(std::set::iterator i = event->modified_blocks.begin(); - i != event->modified_blocks.end(); ++i) - { + i != event->modified_blocks.end(); ++i) { modified_blocks2[*i] = m_env->getMap().getBlockNoCreateNoEx(*i); } + // Set blocks not sent - for(std::list::iterator + for(std::vector::iterator i = far_players.begin(); - i != far_players.end(); ++i) - { - u16 peer_id = *i; - RemoteClient *client = getClient(peer_id); - if(client==NULL) - continue; - client->SetBlocksNotSent(modified_blocks2); + i != far_players.end(); ++i) { + if(RemoteClient *client = getClient(*i)) + client->SetBlocksNotSent(modified_blocks2); } } @@ -1107,10 +1026,11 @@ void Server::Receive() DSTACK(__FUNCTION_NAME); SharedBuffer data; u16 peer_id; - u32 datasize; try { - datasize = m_con.Receive(peer_id,data); - ProcessData(*data, datasize, peer_id); + NetworkPacket pkt; + m_con.Receive(&pkt); + peer_id = pkt.getPeerId(); + ProcessData(&pkt); } catch(con::InvalidIncomingDataException &e) { infostream<<"Server::Receive(): " @@ -1124,7 +1044,7 @@ void Server::Receive() } catch(ClientStateError &e) { errorstream << "ProcessData: peer=" << peer_id << e.what() << std::endl; - DenyAccess(peer_id, L"Your client sent something server didn't expect." + DenyAccess_Legacy(peer_id, L"Your client sent something server didn't expect." L"Try reconnecting or updating your client"); } catch(con::PeerNotFoundException &e) { @@ -1157,13 +1077,13 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id) if(player && player->peer_id != 0) { errorstream<<"Server: "<getBool("enable_damage")) - SendPlayerHP(peer_id); + SendPlayerHPOrDie(peer_id, playersao->getHP() == 0); // Send Breath SendPlayerBreath(peer_id); // Show death screen if necessary - if(player->hp == 0) + if(player->isDead()) SendDeathscreen(peer_id, false, v3f(0,0,0)); // Note things in chat if not in simple singleplayer mode @@ -1240,13 +1158,14 @@ inline void Server::handleCommand(NetworkPacket* pkt) (this->*opHandle.handler)(pkt); } -void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) +void Server::ProcessData(NetworkPacket *pkt) { DSTACK(__FUNCTION_NAME); // Environment is locked first. JMutexAutoLock envlock(m_env_mutex); ScopeProfiler sp(g_profiler, "Server::ProcessData"); + u32 peer_id = pkt->getPeerId(); try { Address address = getPeerAddress(peer_id); @@ -1258,7 +1177,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) << addr_s << "; banned name was " << ban_name << std::endl; // This actually doesn't seem to transfer to the client - DenyAccess(peer_id, L"Your ip is banned. Banned name was " + DenyAccess_Legacy(peer_id, L"Your ip is banned. Banned name was " + narrow_to_wide(ban_name)); return; } @@ -1270,17 +1189,12 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) * respond for some time, your server was overloaded or * things like that. */ - infostream << "Server::ProcessData(): Cancelling: peer " + infostream << "Server::ProcessData(): Canceling: peer " << peer_id << " not found" << std::endl; return; } try { - if(datasize < 2) - return; - - NetworkPacket* pkt = new NetworkPacket(data, datasize, peer_id); - ToServerCommand command = (ToServerCommand) pkt->getCommand(); // Command must be handled into ToServerCommandHandler @@ -1291,7 +1205,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) if (toServerCommandTable[command].state == TOSERVER_STATE_NOT_CONNECTED) { handleCommand(pkt); - delete pkt; return; } @@ -1301,15 +1214,12 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) errorstream << "Server::ProcessData(): Cancelling: Peer" " serialization format invalid or not initialized." " Skipping incoming command=" << command << std::endl; - - delete pkt; return; } /* Handle commands related to client startup */ if (toServerCommandTable[command].state == TOSERVER_STATE_STARTUP) { handleCommand(pkt); - delete pkt; return; } @@ -1319,19 +1229,18 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) errorstream << "Got packet command: " << command << " for peer id " << peer_id << " but client isn't active yet. Dropping packet " << std::endl; - - delete pkt; return; } handleCommand(pkt); - delete pkt; - - } - catch(SendFailedException &e) { + } catch (SendFailedException &e) { errorstream << "Server::ProcessData(): SendFailedException: " << "what=" << e.what() << std::endl; + } catch (PacketError &e) { + actionstream << "Server::ProcessData(): PacketError: " + << "what=" << e.what() + << std::endl; } } @@ -1348,7 +1257,7 @@ void Server::onMapEditEvent(MapEditEvent *event) if(m_ignore_map_edit_events_area.contains(event->getArea())) return; MapEditEvent *e = event->clone(); - m_unsent_map_edit_queue.push_back(e); + m_unsent_map_edit_queue.push(e); } Inventory* Server::getInventory(const InventoryLocation &loc) @@ -1384,25 +1293,29 @@ Inventory* Server::getInventory(const InventoryLocation &loc) } break; default: - assert(0); + sanity_check(false); // abort + break; } return NULL; } -void Server::setInventoryModified(const InventoryLocation &loc) +void Server::setInventoryModified(const InventoryLocation &loc, bool playerSend) { switch(loc.type){ case InventoryLocation::UNDEFINED: break; case InventoryLocation::PLAYER: { + if (!playerSend) + return; + Player *player = m_env->getPlayer(loc.name.c_str()); if(!player) return; PlayerSAO *playersao = player->getPlayerSAO(); if(!playersao) return; - playersao->m_inventory_not_sent = true; - playersao->m_wielded_item_not_sent = true; + + SendInventory(playersao); } break; case InventoryLocation::NODEMETA: @@ -1422,22 +1335,21 @@ void Server::setInventoryModified(const InventoryLocation &loc) } break; default: - assert(0); + sanity_check(false); // abort + break; } } void Server::SetBlocksNotSent(std::map& block) { - std::list clients = m_clients.getClientIDs(); + std::vector clients = m_clients.getClientIDs(); m_clients.Lock(); // Set the modified blocks unsent for all the clients - for (std::list::iterator - i = clients.begin(); + for (std::vector::iterator i = clients.begin(); i != clients.end(); ++i) { - RemoteClient *client = m_clients.lockedGetClientNoEx(*i); - if (client != NULL) + if (RemoteClient *client = m_clients.lockedGetClientNoEx(*i)) client->SetBlocksNotSent(block); - } + } m_clients.Unlock(); } @@ -1451,7 +1363,7 @@ void Server::peerAdded(con::Peer *peer) c.type = con::PEER_ADDED; c.peer_id = peer->id; c.timeout = false; - m_peer_change_queue.push_back(c); + m_peer_change_queue.push(c); } void Server::deletingPeer(con::Peer *peer, bool timeout) @@ -1465,7 +1377,7 @@ void Server::deletingPeer(con::Peer *peer, bool timeout) c.type = con::PEER_REMOVED; c.peer_id = peer->id; c.timeout = timeout; - m_peer_change_queue.push_back(c); + m_peer_change_queue.push(c); } bool Server::getClientConInfo(u16 peer_id, con::rtt_stat_type type, float* retval) @@ -1514,7 +1426,8 @@ void Server::handlePeerChanges() { while(m_peer_change_queue.size() > 0) { - con::PeerChange c = m_peer_change_queue.pop_front(); + con::PeerChange c = m_peer_change_queue.front(); + m_peer_change_queue.pop(); verbosestream<<"Server: Handling peer change: " <<"id="<getFloat("movement_acceleration_default"); - *pkt << g_settings->getFloat("movement_acceleration_air"); - *pkt << g_settings->getFloat("movement_acceleration_fast"); - *pkt << g_settings->getFloat("movement_speed_walk"); - *pkt << g_settings->getFloat("movement_speed_crouch"); - *pkt << g_settings->getFloat("movement_speed_fast"); - *pkt << g_settings->getFloat("movement_speed_climb"); - *pkt << g_settings->getFloat("movement_speed_jump"); - *pkt << g_settings->getFloat("movement_liquid_fluidity"); - *pkt << g_settings->getFloat("movement_liquid_fluidity_smooth"); - *pkt << g_settings->getFloat("movement_liquid_sink"); - *pkt << g_settings->getFloat("movement_gravity"); + pkt << g_settings->getFloat("movement_acceleration_default"); + pkt << g_settings->getFloat("movement_acceleration_air"); + pkt << g_settings->getFloat("movement_acceleration_fast"); + pkt << g_settings->getFloat("movement_speed_walk"); + pkt << g_settings->getFloat("movement_speed_crouch"); + pkt << g_settings->getFloat("movement_speed_fast"); + pkt << g_settings->getFloat("movement_speed_climb"); + pkt << g_settings->getFloat("movement_speed_jump"); + pkt << g_settings->getFloat("movement_liquid_fluidity"); + pkt << g_settings->getFloat("movement_liquid_fluidity_smooth"); + pkt << g_settings->getFloat("movement_liquid_sink"); + pkt << g_settings->getFloat("movement_gravity"); - Send(pkt); + Send(&pkt); } void Server::SendHP(u16 peer_id, u8 hp) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_HP, 1, peer_id); - *pkt << hp; - Send(pkt); + NetworkPacket pkt(TOCLIENT_HP, 1, peer_id); + pkt << hp; + Send(&pkt); } void Server::SendBreath(u16 peer_id, u16 breath) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_BREATH, 2, peer_id); - *pkt << (u16) breath; - Send(pkt); + NetworkPacket pkt(TOCLIENT_BREATH, 2, peer_id); + pkt << (u16) breath; + Send(&pkt); } -void Server::SendAccessDenied(u16 peer_id,const std::wstring &reason) +void Server::SendAccessDenied(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ACCESS_DENIED, 0, peer_id); - *pkt << reason; - Send(pkt); + NetworkPacket pkt(TOCLIENT_ACCESS_DENIED, 1, peer_id); + pkt << (u8) reason; + + if (reason == SERVER_ACCESSDENIED_CUSTOM_STRING) { + pkt << custom_reason; + } + Send(&pkt); +} + +void Server::SendAccessDenied_Legacy(u16 peer_id,const std::wstring &reason) +{ + DSTACK(__FUNCTION_NAME); + + NetworkPacket pkt(TOCLIENT_ACCESS_DENIED_LEGACY, 0, peer_id); + pkt << reason; + Send(&pkt); } void Server::SendDeathscreen(u16 peer_id,bool set_camera_point_target, @@ -1600,9 +1526,9 @@ void Server::SendDeathscreen(u16 peer_id,bool set_camera_point_target, { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_DEATHSCREEN, 1 + sizeof(v3f), peer_id); - *pkt << set_camera_point_target << camera_point_target; - Send(pkt); + NetworkPacket pkt(TOCLIENT_DEATHSCREEN, 1 + sizeof(v3f), peer_id); + pkt << set_camera_point_target << camera_point_target; + Send(&pkt); } void Server::SendItemDef(u16 peer_id, @@ -1610,7 +1536,7 @@ void Server::SendItemDef(u16 peer_id, { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ITEMDEF, 0, peer_id); + NetworkPacket pkt(TOCLIENT_ITEMDEF, 0, peer_id); /* u16 command @@ -1621,13 +1547,13 @@ void Server::SendItemDef(u16 peer_id, itemdef->serialize(tmp_os, protocol_version); std::ostringstream tmp_os2(std::ios::binary); compressZlib(tmp_os.str(), tmp_os2); - pkt->putLongString(tmp_os2.str()); + pkt.putLongString(tmp_os2.str()); // Make data buffer verbosestream << "Server: Sending item definitions to id(" << peer_id - << "): size=" << pkt->getSize() << std::endl; + << "): size=" << pkt.getSize() << std::endl; - Send(pkt); + Send(&pkt); } void Server::SendNodeDef(u16 peer_id, @@ -1635,7 +1561,7 @@ void Server::SendNodeDef(u16 peer_id, { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_NODEDEF, 0, peer_id); + NetworkPacket pkt(TOCLIENT_NODEDEF, 0, peer_id); /* u16 command @@ -1647,55 +1573,52 @@ void Server::SendNodeDef(u16 peer_id, std::ostringstream tmp_os2(std::ios::binary); compressZlib(tmp_os.str(), tmp_os2); - pkt->putLongString(tmp_os2.str()); + pkt.putLongString(tmp_os2.str()); // Make data buffer verbosestream << "Server: Sending node definitions to id(" << peer_id - << "): size=" << pkt->getSize() << std::endl; + << "): size=" << pkt.getSize() << std::endl; - Send(pkt); + Send(&pkt); } /* Non-static send methods */ -void Server::SendInventory(u16 peer_id) +void Server::SendInventory(PlayerSAO* playerSAO) { DSTACK(__FUNCTION_NAME); - PlayerSAO *playersao = getPlayerSAO(peer_id); - assert(playersao); - - playersao->m_inventory_not_sent = false; + UpdateCrafting(playerSAO->getPlayer()); /* Serialize it */ - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_INVENTORY, 0, peer_id); + NetworkPacket pkt(TOCLIENT_INVENTORY, 0, playerSAO->getPeerID()); std::ostringstream os; - playersao->getInventory()->serialize(os); + playerSAO->getInventory()->serialize(os); std::string s = os.str(); - pkt->putRawString(s.c_str(), s.size()); - Send(pkt); + pkt.putRawString(s.c_str(), s.size()); + Send(&pkt); } void Server::SendChatMessage(u16 peer_id, const std::wstring &message) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_CHAT_MESSAGE, 0, peer_id); - *pkt << message; + NetworkPacket pkt(TOCLIENT_CHAT_MESSAGE, 0, peer_id); + pkt << message; if (peer_id != PEER_ID_INEXISTENT) { - Send(pkt); + Send(&pkt); } else { - m_clients.sendToAll(0,pkt,true); + m_clients.sendToAll(0, &pkt, true); } } @@ -1704,12 +1627,12 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec, { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_SHOW_FORMSPEC, 0 , peer_id); + NetworkPacket pkt(TOCLIENT_SHOW_FORMSPEC, 0 , peer_id); - pkt->putLongString(FORMSPEC_VERSION_STRING + formspec); - *pkt << formname; + pkt.putLongString(FORMSPEC_VERSION_STRING + formspec); + pkt << formname; - Send(pkt); + Send(&pkt); } // Spawns a particle on peer with peer_id @@ -1719,18 +1642,18 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_SPAWN_PARTICLE, 0, peer_id); + NetworkPacket pkt(TOCLIENT_SPAWN_PARTICLE, 0, peer_id); - *pkt << pos << velocity << acceleration << expirationtime + pkt << pos << velocity << acceleration << expirationtime << size << collisiondetection; - pkt->putLongString(texture); - *pkt << vertical; + pkt.putLongString(texture); + pkt << vertical; if (peer_id != PEER_ID_INEXISTENT) { - Send(pkt); + Send(&pkt); } else { - m_clients.sendToAll(0,pkt,true); + m_clients.sendToAll(0, &pkt, true); } } @@ -1741,21 +1664,21 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3 { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ADD_PARTICLESPAWNER, 0, peer_id); + NetworkPacket pkt(TOCLIENT_ADD_PARTICLESPAWNER, 0, peer_id); - *pkt << amount << spawntime << minpos << maxpos << minvel << maxvel + pkt << amount << spawntime << minpos << maxpos << minvel << maxvel << minacc << maxacc << minexptime << maxexptime << minsize << maxsize << collisiondetection; - pkt->putLongString(texture); + pkt.putLongString(texture); - *pkt << id << vertical; + pkt << id << vertical; if (peer_id != PEER_ID_INEXISTENT) { - Send(pkt); + Send(&pkt); } else { - m_clients.sendToAll(0, pkt, true); + m_clients.sendToAll(0, &pkt, true); } } @@ -1763,124 +1686,124 @@ void Server::SendDeleteParticleSpawner(u16 peer_id, u32 id) { DSTACK(__FUNCTION_NAME); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_DELETE_PARTICLESPAWNER, 2, peer_id); + NetworkPacket pkt(TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY, 2, peer_id); // Ugly error in this packet - *pkt << (u16) id; + pkt << (u16) id; if (peer_id != PEER_ID_INEXISTENT) { - Send(pkt); + Send(&pkt); } else { - m_clients.sendToAll(0, pkt, true); + m_clients.sendToAll(0, &pkt, true); } } void Server::SendHUDAdd(u16 peer_id, u32 id, HudElement *form) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_HUDADD, 0 , peer_id); + NetworkPacket pkt(TOCLIENT_HUDADD, 0 , peer_id); - *pkt << id << (u8) form->type << form->pos << form->name << form->scale + pkt << id << (u8) form->type << form->pos << form->name << form->scale << form->text << form->number << form->item << form->dir << form->align << form->offset << form->world_pos << form->size; - Send(pkt); + Send(&pkt); } void Server::SendHUDRemove(u16 peer_id, u32 id) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_HUDRM, 4, peer_id); - *pkt << id; - Send(pkt); + NetworkPacket pkt(TOCLIENT_HUDRM, 4, peer_id); + pkt << id; + Send(&pkt); } void Server::SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_HUDCHANGE, 0, peer_id); - *pkt << id << (u8) stat; + NetworkPacket pkt(TOCLIENT_HUDCHANGE, 0, peer_id); + pkt << id << (u8) stat; switch (stat) { case HUD_STAT_POS: case HUD_STAT_SCALE: case HUD_STAT_ALIGN: case HUD_STAT_OFFSET: - *pkt << *(v2f *) value; + pkt << *(v2f *) value; break; case HUD_STAT_NAME: case HUD_STAT_TEXT: - *pkt << *(std::string *) value; + pkt << *(std::string *) value; break; case HUD_STAT_WORLD_POS: - *pkt << *(v3f *) value; + pkt << *(v3f *) value; break; case HUD_STAT_SIZE: - *pkt << *(v2s32 *) value; + pkt << *(v2s32 *) value; break; case HUD_STAT_NUMBER: case HUD_STAT_ITEM: case HUD_STAT_DIR: default: - *pkt << *(u32 *) value; + pkt << *(u32 *) value; break; } - Send(pkt); + Send(&pkt); } void Server::SendHUDSetFlags(u16 peer_id, u32 flags, u32 mask) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_HUD_SET_FLAGS, 4 + 4, peer_id); + NetworkPacket pkt(TOCLIENT_HUD_SET_FLAGS, 4 + 4, peer_id); flags &= ~(HUD_FLAG_HEALTHBAR_VISIBLE | HUD_FLAG_BREATHBAR_VISIBLE); - *pkt << flags << mask; + pkt << flags << mask; - Send(pkt); + Send(&pkt); } void Server::SendHUDSetParam(u16 peer_id, u16 param, const std::string &value) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_HUD_SET_PARAM, 0, peer_id); - *pkt << param << value; - Send(pkt); + NetworkPacket pkt(TOCLIENT_HUD_SET_PARAM, 0, peer_id); + pkt << param << value; + Send(&pkt); } void Server::SendSetSky(u16 peer_id, const video::SColor &bgcolor, const std::string &type, const std::vector ¶ms) { - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_SET_SKY, 0, peer_id); - *pkt << bgcolor << type << (u16) params.size(); + NetworkPacket pkt(TOCLIENT_SET_SKY, 0, peer_id); + pkt << bgcolor << type << (u16) params.size(); for(size_t i=0; im_hp_not_sent = false; + // In some rare case, if the player is disconnected + // while Lua call l_punch, for example, this can be NULL + if (!playersao) + return; + SendHP(peer_id, playersao->getHP()); m_script->player_event(playersao,"health_changed"); // Send to other clients std::string str = gob_cmd_punched(playersao->readDamage(), playersao->getHP()); ActiveObjectMessage aom(playersao->getId(), true, str); - playersao->m_messages_out.push_back(aom); + playersao->m_messages_out.push(aom); } void Server::SendPlayerBreath(u16 peer_id) @@ -1904,8 +1830,8 @@ void Server::SendPlayerBreath(u16 peer_id) DSTACK(__FUNCTION_NAME); PlayerSAO *playersao = getPlayerSAO(peer_id); assert(playersao); - playersao->m_breath_not_sent = false; - m_script->player_event(playersao,"breath_changed"); + + m_script->player_event(playersao, "breath_changed"); SendBreath(peer_id, playersao->getBreath()); } @@ -1915,39 +1841,39 @@ void Server::SendMovePlayer(u16 peer_id) Player *player = m_env->getPlayer(peer_id); assert(player); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_MOVE_PLAYER, 0, peer_id); - *pkt << player->getPosition() << player->getPitch() << player->getYaw(); + NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, peer_id); + pkt << player->getPosition() << player->getPitch() << player->getYaw(); { v3f pos = player->getPosition(); f32 pitch = player->getPitch(); f32 yaw = player->getYaw(); - verbosestream<<"Server: Sending TOCLIENT_MOVE_PLAYER" - <<" pos=("<getPlayer(params.to_player.c_str()); @@ -2009,17 +1956,16 @@ s32 Server::playSound(const SimpleSoundSpec &spec, } dst_clients.push_back(player->peer_id); } - else - { - std::list clients = m_clients.getClientIDs(); + else { + std::vector clients = m_clients.getClientIDs(); - for(std::list::iterator - i = clients.begin(); i != clients.end(); ++i) - { + for(std::vector::iterator + i = clients.begin(); i != clients.end(); ++i) { Player *player = m_env->getPlayer(*i); if(!player) continue; - if(pos_exists){ + + if(pos_exists) { if(player->getPosition().getDistanceFrom(pos) > params.max_hear_distance) continue; @@ -2027,6 +1973,7 @@ s32 Server::playSound(const SimpleSoundSpec &spec, dst_clients.push_back(*i); } } + if(dst_clients.empty()) return -1; @@ -2036,19 +1983,16 @@ s32 Server::playSound(const SimpleSoundSpec &spec, m_playing_sounds[id] = ServerPlayingSound(); ServerPlayingSound &psound = m_playing_sounds[id]; psound.params = params; - for(std::list::iterator i = dst_clients.begin(); - i != dst_clients.end(); i++) - psound.clients.insert(*i); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_PLAY_SOUND, 0); - *pkt << id << spec.name << (float) (spec.gain * params.gain) + NetworkPacket pkt(TOCLIENT_PLAY_SOUND, 0); + pkt << id << spec.name << (float) (spec.gain * params.gain) << (u8) params.type << pos << params.object << params.loop; - for(std::list::iterator i = dst_clients.begin(); + + for(std::vector::iterator i = dst_clients.begin(); i != dst_clients.end(); i++) { - // Send as reliable - m_clients.send(*i, 0, pkt, true, false); + psound.clients.insert(*i); + m_clients.send(*i, 0, &pkt, true); } - delete pkt; return id; } void Server::stopSound(s32 handle) @@ -2060,33 +2004,31 @@ void Server::stopSound(s32 handle) return; ServerPlayingSound &psound = i->second; - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_STOP_SOUND, 4); - *pkt << handle; + NetworkPacket pkt(TOCLIENT_STOP_SOUND, 4); + pkt << handle; for(std::set::iterator i = psound.clients.begin(); i != psound.clients.end(); i++) { // Send as reliable - m_clients.send(*i, 0, pkt, true, false); + m_clients.send(*i, 0, &pkt, true); } - delete pkt; // Remove sound reference m_playing_sounds.erase(i); } void Server::sendRemoveNode(v3s16 p, u16 ignore_id, - std::list *far_players, float far_d_nodes) + std::vector *far_players, float far_d_nodes) { float maxd = far_d_nodes*BS; v3f p_f = intToFloat(p, BS); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_REMOVENODE, 6); - *pkt << p; + NetworkPacket pkt(TOCLIENT_REMOVENODE, 6); + pkt << p; - std::list clients = m_clients.getClientIDs(); - for(std::list::iterator - i = clients.begin(); + std::vector clients = m_clients.getClientIDs(); + for(std::vector::iterator i = clients.begin(); i != clients.end(); ++i) { - if(far_players) { + if (far_players) { // Get player if(Player *player = m_env->getPlayer(*i)) { // If player is far away, only set modified blocks not sent @@ -2099,46 +2041,38 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id, } // Send as reliable - m_clients.send(*i, 0, pkt, true, false); + m_clients.send(*i, 0, &pkt, true); } - // This loop needs the deletion of the packet here - delete pkt; } void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id, - std::list *far_players, float far_d_nodes, + std::vector *far_players, float far_d_nodes, bool remove_metadata) { float maxd = far_d_nodes*BS; v3f p_f = intToFloat(p, BS); - std::list clients = m_clients.getClientIDs(); - for(std::list::iterator - i = clients.begin(); - i != clients.end(); ++i) - { + std::vector clients = m_clients.getClientIDs(); + for(std::vector::iterator i = clients.begin(); + i != clients.end(); ++i) { - if(far_players) - { + if(far_players) { // Get player - Player *player = m_env->getPlayer(*i); - if(player) - { + if(Player *player = m_env->getPlayer(*i)) { // If player is far away, only set modified blocks not sent v3f player_pos = player->getPosition(); - if(player_pos.getDistanceFrom(p_f) > maxd) - { + if(player_pos.getDistanceFrom(p_f) > maxd) { far_players->push_back(*i); continue; } } } - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ADDNODE, 6 + 2 + 1 + 1 + 1); + NetworkPacket pkt(TOCLIENT_ADDNODE, 6 + 2 + 1 + 1 + 1); m_clients.Lock(); RemoteClient* client = m_clients.lockedGetClientNoEx(*i); if (client != 0) { - *pkt << p << n.param0 << n.param1 << n.param2 + pkt << p << n.param0 << n.param1 << n.param2 << (u8) (remove_metadata ? 0 : 1); if (!remove_metadata) { @@ -2152,19 +2086,17 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id, m_clients.Unlock(); // Send as reliable - if (pkt->getSize() > 0) - m_clients.send(*i, 0, pkt, true); + if (pkt.getSize() > 0) + m_clients.send(*i, 0, &pkt, true); } } void Server::setBlockNotSent(v3s16 p) { - std::list clients = m_clients.getClientIDs(); + std::vector clients = m_clients.getClientIDs(); m_clients.Lock(); - for(std::list::iterator - i = clients.begin(); - i != clients.end(); ++i) - { + for(std::vector::iterator i = clients.begin(); + i != clients.end(); ++i) { RemoteClient *client = m_clients.lockedGetClientNoEx(*i); client->SetBlockNotSent(p); } @@ -2186,12 +2118,11 @@ void Server::SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver, u16 net_proto block->serializeNetworkSpecific(os, net_proto_version); std::string s = os.str(); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_BLOCKDATA, - 2 + 2 + 2 + 2 + s.size(), peer_id); + NetworkPacket pkt(TOCLIENT_BLOCKDATA, 2 + 2 + 2 + 2 + s.size(), peer_id); - *pkt << p; - pkt->putRawString(s.c_str(), s.size()); - Send(pkt); + pkt << p; + pkt.putRawString(s.c_str(), s.size()); + Send(&pkt); } void Server::SendBlocks(float dtime) @@ -2210,13 +2141,11 @@ void Server::SendBlocks(float dtime) { ScopeProfiler sp(g_profiler, "Server: selecting blocks for sending"); - std::list clients = m_clients.getClientIDs(); + std::vector clients = m_clients.getClientIDs(); m_clients.Lock(); - for(std::list::iterator - i = clients.begin(); - i != clients.end(); ++i) - { + for(std::vector::iterator i = clients.begin(); + i != clients.end(); ++i) { RemoteClient *client = m_clients.lockedGetClientNoEx(*i, CS_Active); if (client == NULL) @@ -2273,9 +2202,9 @@ void Server::fillMediaCache() infostream<<"Server: Calculating media file checksums"< paths; + std::vector paths; for(std::vector::iterator i = m_mods.begin(); - i != m_mods.end(); i++){ + i != m_mods.end(); i++) { const ModSpec &mod = *i; paths.push_back(mod.path + DIR_DELIM + "textures"); paths.push_back(mod.path + DIR_DELIM + "sounds"); @@ -2285,19 +2214,18 @@ void Server::fillMediaCache() paths.push_back(porting::path_user + DIR_DELIM + "textures" + DIR_DELIM + "server"); // Collect media file information from paths into cache - for(std::list::iterator i = paths.begin(); - i != paths.end(); i++) - { + for(std::vector::iterator i = paths.begin(); + i != paths.end(); i++) { std::string mediapath = *i; std::vector dirlist = fs::GetDirListing(mediapath); - for(u32 j=0; jm_media[filename] = MediaInfo(filepath, sha1_base64); - verbosestream<<"Server: "< file_announcements; + std::vector file_announcements; - for(std::map::iterator i = m_media.begin(); + for (std::map::iterator i = m_media.begin(); i != m_media.end(); i++){ // Put in list file_announcements.push_back( @@ -2393,27 +2322,17 @@ void Server::sendMediaAnnouncement(u16 peer_id) // Make packet std::ostringstream os(std::ios_base::binary); - /* - u32 number of files - for each texture { - u16 length of name - string name - u16 length of sha1_digest - string sha1_digest - } - */ - - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ANNOUNCE_MEDIA, 0, peer_id); - *pkt << (u16) file_announcements.size(); + NetworkPacket pkt(TOCLIENT_ANNOUNCE_MEDIA, 0, peer_id); + pkt << (u16) file_announcements.size(); - for(std::list::iterator + for (std::vector::iterator j = file_announcements.begin(); j != file_announcements.end(); ++j) { - *pkt << j->name << j->sha1_digest; + pkt << j->name << j->sha1_digest; } - *pkt << g_settings->get("remote_media"); - Send(pkt); + pkt << g_settings->get("remote_media"); + Send(&pkt); } struct SendableMedia @@ -2431,7 +2350,7 @@ struct SendableMedia }; void Server::sendRequestedMedia(u16 peer_id, - const std::list &tosend) + const std::vector &tosend) { DSTACK(__FUNCTION_NAME); @@ -2443,14 +2362,13 @@ void Server::sendRequestedMedia(u16 peer_id, // Put 5kB in one bunch (this is not accurate) u32 bytes_per_bunch = 5000; - std::vector< std::list > file_bunches; - file_bunches.push_back(std::list()); + std::vector< std::vector > file_bunches; + file_bunches.push_back(std::vector()); u32 file_size_bunch_total = 0; - for(std::list::const_iterator i = tosend.begin(); - i != tosend.end(); ++i) - { + for(std::vector::const_iterator i = tosend.begin(); + i != tosend.end(); ++i) { const std::string &name = *i; if(m_media.find(name) == m_media.end()) { @@ -2497,7 +2415,7 @@ void Server::sendRequestedMedia(u16 peer_id, // Start next bunch if got enough data if(file_size_bunch_total >= bytes_per_bunch) { - file_bunches.push_back(std::list()); + file_bunches.push_back(std::vector()); file_size_bunch_total = 0; } @@ -2520,21 +2438,21 @@ void Server::sendRequestedMedia(u16 peer_id, } */ - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_MEDIA, 0, peer_id); - *pkt << num_bunches << i << (u32) file_bunches[i].size(); + NetworkPacket pkt(TOCLIENT_MEDIA, 4 + 0, peer_id); + pkt << num_bunches << i << (u32) file_bunches[i].size(); - for(std::list::iterator + for(std::vector::iterator j = file_bunches[i].begin(); j != file_bunches[i].end(); ++j) { - *pkt << j->name; - pkt->putLongString(j->data); + pkt << j->name; + pkt.putLongString(j->data); } verbosestream << "Server::sendRequestedMedia(): bunch " << i << "/" << num_bunches << " files=" << file_bunches[i].size() - << " size=" << pkt->getSize() << std::endl; - Send(pkt); + << " size=" << pkt.getSize() << std::endl; + Send(&pkt); } } @@ -2553,14 +2471,14 @@ void Server::sendDetachedInventory(const std::string &name, u16 peer_id) // Make data buffer std::string s = os.str(); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_DETACHED_INVENTORY, 0, peer_id); - pkt->putRawString(s.c_str(), s.size()); + NetworkPacket pkt(TOCLIENT_DETACHED_INVENTORY, 0, peer_id); + pkt.putRawString(s.c_str(), s.size()); if (peer_id != PEER_ID_INEXISTENT) { - Send(pkt); + Send(&pkt); } else { - m_clients.sendToAll(0, pkt, true); + m_clients.sendToAll(0, &pkt, true); } } @@ -2588,9 +2506,9 @@ void Server::DiePlayer(u16 peer_id) PlayerSAO *playersao = getPlayerSAO(peer_id); assert(playersao); - infostream<<"Server::DiePlayer(): Player " - <getPlayer()->getName() - <<" dies"<getPlayer()->getName() + << " dies" << std::endl; playersao->setHP(0); @@ -2608,29 +2526,82 @@ void Server::RespawnPlayer(u16 peer_id) PlayerSAO *playersao = getPlayerSAO(peer_id); assert(playersao); - infostream<<"Server::RespawnPlayer(): Player " - <getPlayer()->getName() - <<" respawns"<getPlayer()->getName() + << " respawns" << std::endl; playersao->setHP(PLAYER_MAX_HP); playersao->setBreath(PLAYER_MAX_BREATH); + SendPlayerHP(peer_id); + SendPlayerBreath(peer_id); + bool repositioned = m_script->on_respawnplayer(playersao); if(!repositioned){ - v3f pos = findSpawnPos(m_env->getServerMap()); + v3f pos = findSpawnPos(); + // setPos will send the new position to client playersao->setPos(pos); } } +void Server::DenySudoAccess(u16 peer_id) +{ + DSTACK(__FUNCTION_NAME); + + NetworkPacket pkt(TOCLIENT_DENY_SUDO_MODE, 0, peer_id); + Send(&pkt); +} + +void Server::DenyAccess(u16 peer_id, AccessDeniedCode reason, const std::string &custom_reason) +{ + DSTACK(__FUNCTION_NAME); + + SendAccessDenied(peer_id, reason, custom_reason); + m_clients.event(peer_id, CSE_SetDenied); + m_con.DisconnectPeer(peer_id); +} -void Server::DenyAccess(u16 peer_id, const std::wstring &reason) +// 13/03/15: remove this function when protocol version 25 will become +// the minimum version for MT users, maybe in 1 year +void Server::DenyAccess_Legacy(u16 peer_id, const std::wstring &reason) { DSTACK(__FUNCTION_NAME); - SendAccessDenied(peer_id, reason); + SendAccessDenied_Legacy(peer_id, reason); m_clients.event(peer_id, CSE_SetDenied); m_con.DisconnectPeer(peer_id); } +void Server::acceptAuth(u16 peer_id, bool forSudoMode) +{ + DSTACK(__FUNCTION_NAME); + + if (!forSudoMode) { + RemoteClient* client = getClient(peer_id, CS_Invalid); + + NetworkPacket resp_pkt(TOCLIENT_AUTH_ACCEPT, 1 + 6 + 8 + 4, peer_id); + + // Right now, the auth mechs don't change between login and sudo mode. + u32 sudo_auth_mechs = client->allowed_auth_mechs; + client->allowed_sudo_mechs = sudo_auth_mechs; + + resp_pkt << v3f(0,0,0) << (u64) m_env->getServerMap().getSeed() + << g_settings->getFloat("dedicated_server_step") + << sudo_auth_mechs; + + Send(&resp_pkt); + m_clients.event(peer_id, CSE_AuthAccept); + } else { + NetworkPacket resp_pkt(TOCLIENT_ACCEPT_SUDO_MODE, 1 + 6 + 8 + 4, peer_id); + + // We only support SRP right now + u32 sudo_auth_mechs = AUTH_MECHANISM_FIRST_SRP; + + resp_pkt << sudo_auth_mechs; + Send(&resp_pkt); + m_clients.event(peer_id, CSE_SudoSuccess); + } +} + void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason) { DSTACK(__FUNCTION_NAME); @@ -2683,26 +2654,24 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason) Print out action */ { - if(player != NULL && reason != CDR_DENY) - { + if(player != NULL && reason != CDR_DENY) { std::ostringstream os(std::ios_base::binary); - std::list clients = m_clients.getClientIDs(); + std::vector clients = m_clients.getClientIDs(); - for(std::list::iterator - i = clients.begin(); - i != clients.end(); ++i) - { + for(std::vector::iterator i = clients.begin(); + i != clients.end(); ++i) { // Get player Player *player = m_env->getPlayer(*i); if(!player) continue; + // Get name of player - os<getName()<<" "; + os << player->getName() << " "; } - actionstream<getName()<<" " - <<(reason==CDR_TIMEOUT?"times out.":"leaves game.") - <<" List of players: "<getName() << " " + << (reason == CDR_TIMEOUT ? "times out." : "leaves game.") + << " List of players: " << os.str() << std::endl; } } { @@ -2716,13 +2685,10 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason) SendChatMessage(PEER_ID_INEXISTENT,message); } -void Server::UpdateCrafting(u16 peer_id) +void Server::UpdateCrafting(Player* player) { DSTACK(__FUNCTION_NAME); - Player* player = m_env->getPlayer(peer_id); - assert(player); - // Get a preview for crafting ItemStack preview; InventoryLocation loc; @@ -2732,8 +2698,8 @@ void Server::UpdateCrafting(u16 peer_id) // Put the new preview in InventoryList *plist = player->inventory.getList("craftpreview"); - assert(plist); - assert(plist->getSize() >= 1); + sanity_check(plist); + sanity_check(plist->getSize() >= 1); plist->changeItem(0, preview); } @@ -2771,7 +2737,7 @@ std::wstring Server::getStatusString() std::wostringstream os(std::ios_base::binary); os< clients = m_clients.getClientIDs(); - for(std::list::iterator i = clients.begin(); - i != clients.end(); ++i) - { + std::vector clients = m_clients.getClientIDs(); + for(std::vector::iterator i = clients.begin(); + i != clients.end(); ++i) { // Get player Player *player = m_env->getPlayer(*i); // Get name of player @@ -2791,12 +2756,12 @@ std::wstring Server::getStatusString() name = narrow_to_wide(player->getName()); // Add name to information string if(!first) - os<getMap()))->isSavingEnabled() == false) os<get("motd") != "") @@ -2819,11 +2784,10 @@ bool Server::checkPriv(const std::string &name, const std::string &priv) void Server::reportPrivsModified(const std::string &name) { - if(name == ""){ - std::list clients = m_clients.getClientIDs(); - for(std::list::iterator - i = clients.begin(); - i != clients.end(); ++i){ + if(name == "") { + std::vector clients = m_clients.getClientIDs(); + for(std::vector::iterator i = clients.begin(); + i != clients.end(); ++i) { Player *player = m_env->getPlayer(*i); reportPrivsModified(player->getName()); } @@ -3123,7 +3087,7 @@ Inventory* Server::createDetachedInventory(const std::string &name) infostream<<"Server creating detached inventory \""<::iterator i = m_mods.begin(); + for(std::vector::const_iterator i = m_mods.begin(); i != m_mods.end(); i++){ const ModSpec &mod = *i; if(mod.name == modname) @@ -3258,10 +3222,9 @@ const ModSpec* Server::getModSpec(const std::string &modname) } return NULL; } -void Server::getModNames(std::list &modlist) +void Server::getModNames(std::vector &modlist) { - for(std::vector::iterator i = m_mods.begin(); i != m_mods.end(); i++) - { + for(std::vector::iterator i = m_mods.begin(); i != m_mods.end(); i++) { modlist.push_back(i->name); } } @@ -3270,23 +3233,24 @@ std::string Server::getBuiltinLuaPath() return porting::path_share + DIR_DELIM + "builtin"; } -v3f findSpawnPos(ServerMap &map) +v3f Server::findSpawnPos() { - //return v3f(50,50,50)*BS; - - v3s16 nodepos; + ServerMap &map = m_env->getServerMap(); + v3f nodeposf; + if (g_settings->getV3FNoEx("static_spawnpoint", nodeposf)) { + return nodeposf * BS; + } -#if 0 - nodepos = v2s16(0,0); - groundheight = 20; -#endif + // Default position is static_spawnpoint + // We will return it if we don't found a good place + v3s16 nodepos(nodeposf.X, nodeposf.Y, nodeposf.Z); -#if 1 s16 water_level = map.getWaterLevel(); + bool is_good = false; + // Try to find a good place a few times - for(s32 i=0; i<1000; i++) - { + for(s32 i = 0; i < 1000 && !is_good; i++) { s32 range = 1 + i; // We're going to try to throw the player to this position v2s16 nodepos2d = v2s16( @@ -3301,7 +3265,7 @@ v3f findSpawnPos(ServerMap &map) continue; nodepos = v3s16(nodepos2d.X, groundheight, nodepos2d.Y); - bool is_good = false; + s32 air_count = 0; for (s32 i = 0; i < 10; i++) { v3s16 blockpos = getNodeBlockPos(nodepos); @@ -3316,13 +3280,7 @@ v3f findSpawnPos(ServerMap &map) } nodepos.Y++; } - if(is_good){ - // Found a good place - //infostream<<"Searched through "<getServerMap()); + v3f pos = findSpawnPos(); player->setPosition(pos); // Make sure the player is saved