X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientiface.cpp;h=bb740d9f35469a0e6de7d2bfa8028e7799f94186;hb=ee9a442ecc26f2623a1b085344d37636342973eb;hp=47730343c60ed4fb6d36bd925d69b4f45ade67a8;hpb=0dada51a550c5eb52faf700dcbde4cee22a6bc70;p=dragonfireclient.git diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 47730343c..bb740d9f3 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -18,19 +18,19 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include - #include "clientiface.h" -#include "util/numeric.h" +#include "network/connection.h" +#include "network/serveropcodes.h" #include "remoteplayer.h" #include "settings.h" #include "mapblock.h" -#include "network/connection.h" #include "serverenvironment.h" #include "map.h" #include "emerge.h" #include "content_sao.h" // TODO this is used for cleanup of only #include "log.h" #include "util/srp.h" +#include "face_position_cache.h" const char *ClientInterface::statenames[] = { "Invalid", @@ -66,9 +66,6 @@ void RemoteClient::GetNextBlocks ( float dtime, std::vector &dest) { - DSTACK(FUNCTION_NAME); - - // Increment timers m_nothing_to_send_pause_timer -= dtime; m_nearest_unsent_reset_timer += dtime; @@ -78,11 +75,11 @@ void RemoteClient::GetNextBlocks ( RemotePlayer *player = env->getPlayer(peer_id); // This can happen sometimes; clients and players are not in perfect sync. - if (player == NULL) + if (!player) return; PlayerSAO *sao = player->getPlayerSAO(); - if (sao == NULL) + if (!sao) return; // Won't send anything if already sending @@ -94,7 +91,7 @@ void RemoteClient::GetNextBlocks ( } v3f playerpos = sao->getBasePosition(); - v3f playerspeed = player->getSpeed(); + const v3f &playerspeed = player->getSpeed(); v3f playerspeeddir(0,0,0); if(playerspeed.getLength() > 1.0*BS) playerspeeddir = playerspeed / playerspeed.getLength(); @@ -197,6 +194,9 @@ void RemoteClient::GetNextBlocks ( s32 nearest_sent_d = -1; //bool queue_is_full = false; + const v3s16 cam_pos_nodes = floatToInt(camera_pos, BS); + const bool occ_cull = g_settings->getBool("server_side_occlusion_culling"); + s16 d; for(d = d_start; d <= d_max; d++) { /* @@ -235,9 +235,9 @@ void RemoteClient::GetNextBlocks ( continue; /* - Do not go over-limit + Do not go over max mapgen limit */ - if (blockpos_over_limit(p)) + if (blockpos_over_max_limit(p)) continue; // If this is true, inexistent block will be made from scratch @@ -249,8 +249,8 @@ void RemoteClient::GetNextBlocks ( FOV setting. The default of 72 degrees is fine. */ - if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight) == false) - { + f32 dist; + if (!isBlockInSight(p, camera_pos, camera_dir, camera_fov, d_blocks_in_sight, &dist)) { continue; } @@ -271,25 +271,17 @@ void RemoteClient::GetNextBlocks ( bool surely_not_found_on_disk = false; bool block_is_invalid = false; - if(block != NULL) - { + if (block) { // Reset usage timer, this block will be of use in the future. block->resetUsageTimer(); // Block is dummy if data doesn't exist. // It means it has been not found from disk and not generated - if(block->isDummy()) - { + if (block->isDummy()) { surely_not_found_on_disk = true; } - // Block is valid if lighting is up-to-date and data exists - if(block->isValid() == false) - { - block_is_invalid = true; - } - - if(block->isGenerated() == false) + if (!block->isGenerated()) block_is_invalid = true; /* @@ -299,19 +291,22 @@ void RemoteClient::GetNextBlocks ( Block is near ground level if night-time mesh differs from day-time mesh. */ - if(d >= d_opt) - { - if(block->getDayNightDiff() == false) + if (d >= d_opt) { + if (!block->getDayNightDiff()) continue; } + + if (occ_cull && !block_is_invalid && + env->getMap().isBlockOccluded(block, cam_pos_nodes)) { + continue; + } } /* If block has been marked to not exist on disk (dummy) and generating new ones is not wanted, skip block. */ - if(generate == false && surely_not_found_on_disk == true) - { + if (!generate && surely_not_found_on_disk) { // get next one. continue; } @@ -340,7 +335,7 @@ void RemoteClient::GetNextBlocks ( /* Add block to send queue */ - PrioritySortedBlockTransfer q((float)d, p, peer_id); + PrioritySortedBlockTransfer q((float)dist, p, peer_id); dest.push_back(q); @@ -412,11 +407,8 @@ void RemoteClient::SetBlocksNotSent(std::map &blocks) m_nearest_unsent_d = 0; m_nothing_to_send_pause_timer = 0; - for(std::map::iterator - i = blocks.begin(); - i != blocks.end(); ++i) - { - v3s16 p = i->first; + for (auto &block : blocks) { + v3s16 p = block.first; m_blocks_modified.insert(p); if(m_blocks_sending.find(p) != m_blocks_sending.end()) @@ -462,8 +454,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event) { case CSE_AuthAccept: m_state = CS_AwaitingInit2; - if ((chosen_mech == AUTH_MECHANISM_SRP) - || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD)) + if (chosen_mech == AUTH_MECHANISM_SRP) srp_verifier_delete((SRPVerifier *) auth_data); chosen_mech = AUTH_MECHANISM_NONE; break; @@ -472,8 +463,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event) break; case CSE_SetDenied: m_state = CS_Denied; - if ((chosen_mech == AUTH_MECHANISM_SRP) - || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD)) + if (chosen_mech == AUTH_MECHANISM_SRP) srp_verifier_delete((SRPVerifier *) auth_data); chosen_mech = AUTH_MECHANISM_NONE; break; @@ -551,8 +541,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event) break; case CSE_SudoSuccess: m_state = CS_SudoMode; - if ((chosen_mech == AUTH_MECHANISM_SRP) - || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD)) + if (chosen_mech == AUTH_MECHANISM_SRP) srp_verifier_delete((SRPVerifier *) auth_data); chosen_mech = AUTH_MECHANISM_NONE; break; @@ -587,12 +576,12 @@ void RemoteClient::notifyEvent(ClientStateEvent event) } } -u32 RemoteClient::uptime() +u64 RemoteClient::uptime() const { - return getTime(PRECISION_SECONDS) - m_connection_time; + return porting::getTimeS() - m_connection_time; } -ClientInterface::ClientInterface(con::Connection* con) +ClientInterface::ClientInterface(const std::shared_ptr & con) : m_con(con), m_env(NULL), @@ -608,10 +597,9 @@ ClientInterface::~ClientInterface() { MutexAutoLock clientslock(m_clients_mutex); - for (UNORDERED_MAP::iterator i = m_clients.begin(); - i != m_clients.end(); ++i) { + for (auto &client_it : m_clients) { // Delete client - delete i->second; + delete client_it.second; } } } @@ -621,15 +609,24 @@ std::vector ClientInterface::getClientIDs(ClientState min_state) std::vector reply; MutexAutoLock clientslock(m_clients_mutex); - for(UNORDERED_MAP::iterator i = m_clients.begin(); - i != m_clients.end(); ++i) { - if (i->second->getState() >= min_state) - reply.push_back(i->second->peer_id); + for (const auto &m_client : m_clients) { + if (m_client.second->getState() >= min_state) + reply.push_back(m_client.second->peer_id); } return reply; } +/** + * Verify if user limit was reached. + * User limit count all clients from HelloSent state (MT protocol user) to Active state + * @return true if user limit was reached + */ +bool ClientInterface::isUserLimitReached() +{ + return getClientIDs(CS_HelloSent).size() >= g_settings->getU16("max_users"); +} + void ClientInterface::step(float dtime) { m_print_info_timer += dtime; @@ -642,7 +639,7 @@ void ClientInterface::step(float dtime) void ClientInterface::UpdatePlayerList() { - if (m_env != NULL) { + if (m_env) { std::vector clients = getClientIDs(); m_clients_names.clear(); @@ -650,8 +647,8 @@ void ClientInterface::UpdatePlayerList() if(!clients.empty()) infostream<<"Players:"<::iterator i = clients.begin(); i != clients.end(); ++i) { - RemotePlayer *player = m_env->getPlayer(*i); + for (u16 i : clients) { + RemotePlayer *player = m_env->getPlayer(i); if (player == NULL) continue; @@ -660,12 +657,12 @@ void ClientInterface::UpdatePlayerList() { MutexAutoLock clientslock(m_clients_mutex); - RemoteClient* client = lockedGetClientNoEx(*i); - if(client != NULL) + RemoteClient* client = lockedGetClientNoEx(i); + if (client) client->PrintInfo(infostream); } - m_clients_names.push_back(player->getName()); + m_clients_names.emplace_back(player->getName()); } } } @@ -676,24 +673,49 @@ void ClientInterface::send(u16 peer_id, u8 channelnum, m_con->Send(peer_id, channelnum, pkt, reliable); } -void ClientInterface::sendToAll(u16 channelnum, - NetworkPacket* pkt, bool reliable) +void ClientInterface::sendToAll(NetworkPacket *pkt) { MutexAutoLock clientslock(m_clients_mutex); - for(UNORDERED_MAP::iterator i = m_clients.begin(); - i != m_clients.end(); ++i) { - RemoteClient *client = i->second; + for (auto &client_it : m_clients) { + RemoteClient *client = client_it.second; if (client->net_proto_version != 0) { - m_con->Send(client->peer_id, channelnum, pkt, reliable); + m_con->Send(client->peer_id, + clientCommandFactoryTable[pkt->getCommand()].channel, pkt, + clientCommandFactoryTable[pkt->getCommand()].reliable); } } } +void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacypkt, + u16 min_proto_ver) +{ + MutexAutoLock clientslock(m_clients_mutex); + for (auto &client_it : m_clients) { + RemoteClient *client = client_it.second; + NetworkPacket *pkt_to_send = nullptr; + + if (client->net_proto_version >= min_proto_ver) { + pkt_to_send = pkt; + } else if (client->net_proto_version != 0) { + pkt_to_send = legacypkt; + } else { + warningstream << "Client with unhandled version to handle: '" + << client->net_proto_version << "'"; + continue; + } + + m_con->Send(client->peer_id, + clientCommandFactoryTable[pkt_to_send->getCommand()].channel, + pkt_to_send, + clientCommandFactoryTable[pkt_to_send->getCommand()].reliable); + } +} + RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min) { MutexAutoLock clientslock(m_clients_mutex); - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::const_iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. if (n == m_clients.end()) @@ -701,13 +723,13 @@ RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min) if (n->second->getState() >= state_min) return n->second; - else - return NULL; + + return NULL; } RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min) { - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::const_iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. if (n == m_clients.end()) @@ -715,14 +737,14 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat if (n->second->getState() >= state_min) return n->second; - else - return NULL; + + return NULL; } ClientState ClientInterface::getClientState(u16 peer_id) { MutexAutoLock clientslock(m_clients_mutex); - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::const_iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. if (n == m_clients.end()) @@ -734,7 +756,7 @@ ClientState ClientInterface::getClientState(u16 peer_id) void ClientInterface::setPlayerName(u16 peer_id,std::string name) { MutexAutoLock clientslock(m_clients_mutex); - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. if (n != m_clients.end()) @@ -746,7 +768,7 @@ void ClientInterface::DeleteClient(u16 peer_id) MutexAutoLock conlock(m_clients_mutex); // Error check - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // The client may not exist; clients are immediately removed if their // access is denied, and this event occurs later then. if (n == m_clients.end()) @@ -758,12 +780,8 @@ void ClientInterface::DeleteClient(u16 peer_id) //TODO this should be done by client destructor!!! RemoteClient *client = n->second; // Handle objects - for(std::set::iterator - i = client->m_known_objects.begin(); - i != client->m_known_objects.end(); ++i) - { + for (u16 id : client->m_known_objects) { // Get object - u16 id = *i; ServerActiveObject* obj = m_env->getActiveObject(id); if(obj && obj->m_known_by_count > 0) @@ -780,7 +798,7 @@ void ClientInterface::CreateClient(u16 peer_id) MutexAutoLock conlock(m_clients_mutex); // Error check - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // The client shouldn't already exist if (n != m_clients.end()) return; @@ -796,7 +814,7 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event) MutexAutoLock clientlock(m_clients_mutex); // Error check - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // No client to deliver event if (n == m_clients.end()) @@ -817,7 +835,7 @@ u16 ClientInterface::getProtocolVersion(u16 peer_id) MutexAutoLock conlock(m_clients_mutex); // Error check - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // No client to get version if (n == m_clients.end()) @@ -831,7 +849,7 @@ void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch MutexAutoLock conlock(m_clients_mutex); // Error check - UNORDERED_MAP::iterator n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // No client to set versions if (n == m_clients.end())