X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientiface.cpp;h=a55e0f7b55907795522118464d04f32a48893164;hb=3d66622772e66154b7624957a27f9be54c4c7c28;hp=2468ef3334874ae160a3a9daafcac7afb9a1a625;hpb=e258675eabc874d31bc9c6cf49e4bbc1f7f3f417;p=dragonfireclient.git diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 2468ef333..a55e0f7b5 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -17,66 +17,125 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include "clientiface.h" -#include "player.h" +#include "network/connection.h" +#include "network/serveropcodes.h" +#include "remoteplayer.h" #include "settings.h" #include "mapblock.h" -#include "connection.h" -#include "environment.h" +#include "serverenvironment.h" #include "map.h" #include "emerge.h" -#include "serverobject.h" // TODO this is used for cleanup of only +#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", + "Disconnecting", + "Denied", + "Created", + "AwaitingInit2", + "HelloSent", + "InitDone", + "DefinitionsSent", + "Active", + "SudoMode", +}; + + + +std::string ClientInterface::state2Name(ClientState state) +{ + return statenames[state]; +} -#include "util/numeric.h" +RemoteClient::RemoteClient() : + m_max_simul_sends(g_settings->getU16("max_simultaneous_block_sends_per_client")), + m_min_time_from_building( + g_settings->getFloat("full_block_send_enable_min_time_from_building")), + m_max_send_distance(g_settings->getS16("max_block_send_distance")), + m_block_optimize_distance(g_settings->getS16("block_send_optimize_distance")), + m_max_gen_distance(g_settings->getS16("max_block_generate_distance")), + m_occ_cull(g_settings->getBool("server_side_occlusion_culling")) +{ +} -#include "main.h" // for g_settings +void RemoteClient::ResendBlockIfOnWire(v3s16 p) +{ + // if this block is on wire, mark it for sending again as soon as possible + if (m_blocks_sending.find(p) != m_blocks_sending.end()) { + SetBlockNotSent(p); + } +} + +LuaEntitySAO *getAttachedObject(PlayerSAO *sao, ServerEnvironment *env) +{ + if (!sao->isAttached()) + return nullptr; + + int id; + std::string bone; + v3f dummy; + sao->getAttachment(&id, &bone, &dummy, &dummy); + ServerActiveObject *ao = env->getActiveObject(id); + while (id && ao) { + ao->getAttachment(&id, &bone, &dummy, &dummy); + if (id) + ao = env->getActiveObject(id); + } + return dynamic_cast(ao); +} -void RemoteClient::GetNextBlocks( +void RemoteClient::GetNextBlocks ( ServerEnvironment *env, EmergeManager * emerge, float dtime, std::vector &dest) { - DSTACK(__FUNCTION_NAME); - - // Increment timers m_nothing_to_send_pause_timer -= dtime; m_nearest_unsent_reset_timer += dtime; - if(m_nothing_to_send_pause_timer >= 0) + if (m_nothing_to_send_pause_timer >= 0) return; - Player *player = env->getPlayer(peer_id); + 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) return; // Won't send anything if already sending - if(m_blocks_sending.size() >= g_settings->getU16 - ("max_simultaneous_block_sends_per_client")) - { + if (m_blocks_sending.size() >= m_max_simul_sends) { //infostream<<"Not sending any blocks, Queue full."<getPosition(); - v3f playerspeed = player->getSpeed(); + v3f playerpos = sao->getBasePosition(); + // if the player is attached, get the velocity from the attached object + LuaEntitySAO *lsao = getAttachedObject(sao, env); + const v3f &playerspeed = lsao? lsao->getVelocity() : player->getSpeed(); v3f playerspeeddir(0,0,0); - if(playerspeed.getLength() > 1.0*BS) + if (playerspeed.getLength() > 1.0f * BS) playerspeeddir = playerspeed / playerspeed.getLength(); // Predict to next block - v3f playerpos_predicted = playerpos + playerspeeddir*MAP_BLOCKSIZE*BS; + v3f playerpos_predicted = playerpos + playerspeeddir * (MAP_BLOCKSIZE * BS); v3s16 center_nodepos = floatToInt(playerpos_predicted, BS); v3s16 center = getNodeBlockPos(center_nodepos); // Camera position and direction - v3f camera_pos = player->getEyePosition(); + v3f camera_pos = sao->getEyePosition(); v3f camera_dir = v3f(0,0,1); - camera_dir.rotateYZBy(player->getPitch()); - camera_dir.rotateXZBy(player->getYaw()); + camera_dir.rotateYZBy(sao->getLookPitch()); + camera_dir.rotateXZBy(sao->getRotation().Y); /*infostream<<"camera_dir=("< 20.0) - { - m_nearest_unsent_reset_timer = 0; + if (m_nearest_unsent_reset_timer > 20.0f) { + m_nearest_unsent_reset_timer = 0.0f; m_nearest_unsent_d = 0; //infostream<<"Resetting m_nearest_unsent_d for " // <getPlayerName(peer_id)<getFloat( - "full_block_send_enable_min_time_from_building")) - { + if (m_time_from_building < m_min_time_from_building) { max_simul_sends_usually = LIMITED_MAX_SIMULTANEOUS_BLOCK_SENDS; } @@ -139,32 +192,59 @@ void RemoteClient::GetNextBlocks( */ s32 new_nearest_unsent_d = -1; - s16 d_max = g_settings->getS16("max_block_send_distance"); - s16 d_max_gen = g_settings->getS16("max_block_generate_distance"); - - // Don't loop very much at a time - s16 max_d_increment_at_time = 2; - if(d_max > d_start + max_d_increment_at_time) + // Get view range and camera fov (radians) from the client + s16 wanted_range = sao->getWantedRange() + 1; + float camera_fov = sao->getFov(); + + // Distrust client-sent FOV and get server-set player object property + // zoom FOV (degrees) as a check to avoid hacked clients using FOV to load + // distant world. + // (zoom is disabled by value 0) + float prop_zoom_fov = sao->getZoomFOV() < 0.001f ? + 0.0f : + std::max(camera_fov, sao->getZoomFOV() * core::DEGTORAD); + + const s16 full_d_max = std::min(adjustDist(m_max_send_distance, prop_zoom_fov), + wanted_range); + const s16 d_opt = std::min(adjustDist(m_block_optimize_distance, prop_zoom_fov), + wanted_range); + const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE; + + s16 d_max = full_d_max; + s16 d_max_gen = std::min(adjustDist(m_max_gen_distance, prop_zoom_fov), + wanted_range); + + // Don't loop very much at a time, adjust with distance, + // do more work per RTT with greater distances. + s16 max_d_increment_at_time = full_d_max / 9 + 1; + if (d_max > d_start + max_d_increment_at_time) d_max = d_start + max_d_increment_at_time; + // cos(angle between velocity and camera) * |velocity| + // Limit to 0.0f in case player moves backwards. + f32 dot = rangelim(camera_dir.dotProduct(playerspeed), 0.0f, 300.0f); + + // Reduce the field of view when a player moves and looks forward. + // limit max fov effect to 50%, 60% at 20n/s fly speed + camera_fov = camera_fov / (1 + dot / 300.0f); + s32 nearest_emerged_d = -1; s32 nearest_emergefull_d = -1; s32 nearest_sent_d = -1; - bool queue_is_full = false; + //bool queue_is_full = false; + + const v3s16 cam_pos_nodes = floatToInt(camera_pos, BS); s16 d; - for(d = d_start; d <= d_max; d++) - { + for (d = d_start; d <= d_max; d++) { /* Get the border/face dot coordinates of a "d-radiused" box */ - std::list list; - getFacePositions(list, d); + std::vector list = FacePositionCache::getFacePositions(d); - std::list::iterator li; - for(li=list.begin(); li!=list.end(); ++li) - { + std::vector::iterator li; + for (li = list.begin(); li != list.end(); ++li) { v3s16 p = *li + center; /* @@ -179,65 +259,50 @@ void RemoteClient::GetNextBlocks( u16 max_simul_dynamic = max_simul_sends_usually; // If block is very close, allow full maximum - if(d <= BLOCK_SEND_DISABLE_LIMITS_MAX_D) - max_simul_dynamic = max_simul_sends_setting; + if (d <= BLOCK_SEND_DISABLE_LIMITS_MAX_D) + max_simul_dynamic = m_max_simul_sends; // Don't select too many blocks for sending - if(num_blocks_selected >= max_simul_dynamic) - { - queue_is_full = true; + if (num_blocks_selected >= max_simul_dynamic) { + //queue_is_full = true; goto queue_full_break; } // Don't send blocks that are currently being transferred - if(m_blocks_sending.find(p) != m_blocks_sending.end()) + if (m_blocks_sending.find(p) != m_blocks_sending.end()) continue; /* - Do not go over-limit + Do not go over max mapgen limit */ - if(p.X < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p.X > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p.Z < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE - || p.Z > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE) + if (blockpos_over_max_limit(p)) continue; // If this is true, inexistent block will be made from scratch bool generate = d <= d_max_gen; - { - /*// Limit the generating area vertically to 2/3 - if(abs(p.Y - center.Y) > d_max_gen - d_max_gen / 3) - generate = false;*/ - - // Limit the send area vertically to 1/2 - if(abs(p.Y - center.Y) > d_max / 2) - continue; - } - /* Don't generate or send if not in sight FIXME This only works if the client uses a small enough FOV setting. The default of 72 degrees is fine. + Also retrieve a smaller view cone in the direction of the player's + movement. + (0.1 is about 4 degrees) */ - - float camera_fov = (72.0*M_PI/180) * 4./3.; - if(isBlockInSight(p, camera_pos, camera_dir, camera_fov, 10000*BS) == false) - { + f32 dist; + if (!(isBlockInSight(p, camera_pos, camera_dir, camera_fov, + d_blocks_in_sight, &dist) || + (playerspeed.getLength() > 1.0f * BS && + isBlockInSight(p, camera_pos, playerspeeddir, 0.1f, + d_blocks_in_sight)))) { continue; } /* Don't send already sent blocks */ - { - if(m_blocks_sent.find(p) != m_blocks_sent.end()) - { - continue; - } - } + if (m_blocks_sent.find(p) != m_blocks_sent.end()) + continue; /* Check if map has this block @@ -246,25 +311,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; /* @@ -274,19 +331,22 @@ void RemoteClient::GetNextBlocks( Block is near ground level if night-time mesh differs from day-time mesh. */ - if(d >= 4) - { - if(block->getDayNightDiff() == false) + if (d >= d_opt) { + if (!block->getIsUnderground() && !block->getDayNightDiff()) continue; } + + if (m_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; } @@ -294,8 +354,7 @@ void RemoteClient::GetNextBlocks( /* Add inexistent block to emerge queue. */ - if(block == NULL || surely_not_found_on_disk || block_is_invalid) - { + if (block == NULL || surely_not_found_on_disk || block_is_invalid) { if (emerge->enqueueBlockEmerge(peer_id, p, generate)) { if (nearest_emerged_d == -1) nearest_emerged_d = d; @@ -309,13 +368,13 @@ void RemoteClient::GetNextBlocks( continue; } - if(nearest_sent_d == -1) + if (nearest_sent_d == -1) nearest_sent_d = d; /* Add block to send queue */ - PrioritySortedBlockTransfer q((float)d, p, peer_id); + PrioritySortedBlockTransfer q((float)dist, p, peer_id); dest.push_back(q); @@ -326,41 +385,45 @@ void RemoteClient::GetNextBlocks( // If nothing was found for sending and nothing was queued for // emerging, continue next time browsing from here - if(nearest_emerged_d != -1){ + if (nearest_emerged_d != -1) { new_nearest_unsent_d = nearest_emerged_d; - } else if(nearest_emergefull_d != -1){ + } else if (nearest_emergefull_d != -1) { new_nearest_unsent_d = nearest_emergefull_d; } else { - if(d > g_settings->getS16("max_block_send_distance")){ + if (d > full_d_max) { new_nearest_unsent_d = 0; - m_nothing_to_send_pause_timer = 2.0; + m_nothing_to_send_pause_timer = 2.0f; } else { - if(nearest_sent_d != -1) + if (nearest_sent_d != -1) new_nearest_unsent_d = nearest_sent_d; else new_nearest_unsent_d = d; } } - if(new_nearest_unsent_d != -1) + if (new_nearest_unsent_d != -1) m_nearest_unsent_d = new_nearest_unsent_d; } void RemoteClient::GotBlock(v3s16 p) { - if(m_blocks_sending.find(p) != m_blocks_sending.end()) - m_blocks_sending.erase(p); - else - { - m_excess_gotblocks++; + if (m_blocks_modified.find(p) == m_blocks_modified.end()) { + if (m_blocks_sending.find(p) != m_blocks_sending.end()) + m_blocks_sending.erase(p); + else + m_excess_gotblocks++; + + m_blocks_sent.insert(p); } - m_blocks_sent.insert(p); } void RemoteClient::SentBlock(v3s16 p) { - if(m_blocks_sending.find(p) == m_blocks_sending.end()) - m_blocks_sending[p] = 0.0; + if (m_blocks_modified.find(p) != m_blocks_modified.end()) + m_blocks_modified.erase(p); + + if (m_blocks_sending.find(p) == m_blocks_sending.end()) + m_blocks_sending[p] = 0.0f; else infostream<<"RemoteClient::SentBlock(): Sent block" " already in m_blocks_sending"< &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()) + if (m_blocks_sending.find(p) != m_blocks_sending.end()) m_blocks_sending.erase(p); - if(m_blocks_sent.find(p) != m_blocks_sent.end()) + if (m_blocks_sent.find(p) != m_blocks_sent.end()) m_blocks_sent.erase(p); } } void RemoteClient::notifyEvent(ClientStateEvent event) { + std::ostringstream myerror; switch (m_state) { - case Invalid: - assert("State update for client in invalid state" != 0); + case CS_Invalid: + //intentionally do nothing break; - - case Created: - switch(event) - { - case Init: - m_state = InitSent; + case CS_Created: + switch (event) { + case CSE_Hello: + m_state = CS_HelloSent; break; - - case Disconnect: - m_state = Disconnecting; + case CSE_InitLegacy: + m_state = CS_AwaitingInit2; break; - - case SetDenied: - m_state = Denied; + case CSE_Disconnect: + m_state = CS_Disconnecting; + break; + case CSE_SetDenied: + m_state = CS_Denied; break; - /* GotInit2 SetDefinitionsSent SetMediaSent */ default: - assert("Invalid client state transition!" == 0); + myerror << "Created: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); } break; - - case Denied: + case CS_Denied: /* don't do anything if in denied state */ break; - - case InitSent: + case CS_HelloSent: switch(event) { - case GotInit2: + case CSE_AuthAccept: + m_state = CS_AwaitingInit2; + if (chosen_mech == AUTH_MECHANISM_SRP || + chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD) + srp_verifier_delete((SRPVerifier *) auth_data); + chosen_mech = AUTH_MECHANISM_NONE; + break; + case CSE_Disconnect: + m_state = CS_Disconnecting; + break; + case CSE_SetDenied: + m_state = CS_Denied; + if (chosen_mech == AUTH_MECHANISM_SRP || + chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD) + srp_verifier_delete((SRPVerifier *) auth_data); + chosen_mech = AUTH_MECHANISM_NONE; + break; + default: + myerror << "HelloSent: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); + } + break; + case CS_AwaitingInit2: + switch(event) + { + case CSE_GotInit2: confirmSerializationVersion(); - m_state = InitDone; + m_state = CS_InitDone; break; - - case Disconnect: - m_state = Disconnecting; + case CSE_Disconnect: + m_state = CS_Disconnecting; break; - - case SetDenied: - m_state = Denied; + case CSE_SetDenied: + m_state = CS_Denied; break; /* Init SetDefinitionsSent SetMediaSent */ default: - assert("Invalid client state transition!" == 0); + myerror << "InitSent: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); } break; - case InitDone: + case CS_InitDone: switch(event) { - case SetDefinitionsSent: - m_state = DefinitionsSent; + case CSE_SetDefinitionsSent: + m_state = CS_DefinitionsSent; break; - - case Disconnect: - m_state = Disconnecting; + case CSE_Disconnect: + m_state = CS_Disconnecting; break; - - case SetDenied: - m_state = Denied; + case CSE_SetDenied: + m_state = CS_Denied; break; /* Init GotInit2 SetMediaSent */ default: - assert("Invalid client state transition!" == 0); + myerror << "InitDone: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); } break; - - case DefinitionsSent: + case CS_DefinitionsSent: switch(event) { - case SetMediaSent: - m_state = Active; + case CSE_SetClientReady: + m_state = CS_Active; break; - - case Disconnect: - m_state = Disconnecting; + case CSE_Disconnect: + m_state = CS_Disconnecting; break; - - case SetDenied: - m_state = Denied; + case CSE_SetDenied: + m_state = CS_Denied; break; - /* Init GotInit2 SetDefinitionsSent */ default: - assert("Invalid client state transition!" == 0); + myerror << "DefinitionsSent: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); } break; - - case Active: + case CS_Active: switch(event) { - case SetDenied: - m_state = Denied; + case CSE_SetDenied: + m_state = CS_Denied; break; - - case Disconnect: - m_state = Disconnecting; + case CSE_Disconnect: + m_state = CS_Disconnecting; + break; + case CSE_SudoSuccess: + m_state = CS_SudoMode; + if (chosen_mech == AUTH_MECHANISM_SRP) + srp_verifier_delete((SRPVerifier *) auth_data); + chosen_mech = AUTH_MECHANISM_NONE; break; - /* Init GotInit2 SetDefinitionsSent SetMediaSent SetDenied */ default: - assert("Invalid client state transition!" == 0); + myerror << "Active: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); break; } break; - - case Disconnecting: + case CS_SudoMode: + switch(event) + { + case CSE_SetDenied: + m_state = CS_Denied; + break; + case CSE_Disconnect: + m_state = CS_Disconnecting; + break; + case CSE_SudoLeave: + m_state = CS_Active; + break; + default: + myerror << "Active: Invalid client state transition! " << event; + throw ClientStateError(myerror.str()); + break; + } + break; + case CS_Disconnecting: /* we are already disconnecting */ break; } } -ClientInterface::ClientInterface(con::Connection* con) +u64 RemoteClient::uptime() const +{ + return porting::getTimeS() - m_connection_time; +} + +ClientInterface::ClientInterface(const std::shared_ptr & con) : m_con(con), m_env(NULL), - m_print_info_timer(0.0) + m_print_info_timer(0.0f) { } @@ -528,169 +636,191 @@ ClientInterface::~ClientInterface() Delete clients */ { - JMutexAutoLock clientslock(m_clients_mutex); - - for(std::map::iterator - i = m_clients.begin(); - i != m_clients.end(); ++i) - { + MutexAutoLock clientslock(m_clients_mutex); + for (auto &client_it : m_clients) { // Delete client - delete i->second; + delete client_it.second; } } } -std::list ClientInterface::getClientIDs(ClientState min_state) +std::vector ClientInterface::getClientIDs(ClientState min_state) { - std::list reply; - JMutexAutoLock clientslock(m_clients_mutex); + std::vector reply; + MutexAutoLock clientslock(m_clients_mutex); - for(std::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; } -std::vector ClientInterface::getPlayerNames() +void ClientInterface::markBlockposAsNotSent(const v3s16 &pos) { - return m_clients_names; + MutexAutoLock clientslock(m_clients_mutex); + for (const auto &client : m_clients) { + if (client.second->getState() >= CS_Active) + client.second->SetBlockNotSent(pos); + } } +/** + * 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; - if(m_print_info_timer >= 30.0) - { - m_print_info_timer = 0.0; + if (m_print_info_timer >= 30.0f) { + m_print_info_timer = 0.0f; UpdatePlayerList(); } } void ClientInterface::UpdatePlayerList() { - if (m_env != NULL) - { - std::list clients = getClientIDs(); + if (m_env) { + std::vector clients = getClientIDs(); m_clients_names.clear(); - if(clients.size() != 0) + if (!clients.empty()) infostream<<"Players:"<::iterator - i = clients.begin(); - i != clients.end(); ++i) - { - Player *player = m_env->getPlayer(*i); - if(player==NULL) + + for (session_t i : clients) { + RemotePlayer *player = m_env->getPlayer(i); + + if (player == NULL) continue; - infostream<<"* "<getName()<<"\t"; + + infostream << "* " << player->getName() << "\t"; { - JMutexAutoLock clientslock(m_clients_mutex); - RemoteClient* client = lockedGetClientNoEx(*i); - if(client != NULL) + MutexAutoLock clientslock(m_clients_mutex); + RemoteClient* client = lockedGetClientNoEx(i); + if (client) client->PrintInfo(infostream); } - m_clients_names.push_back(player->getName()); + + m_clients_names.emplace_back(player->getName()); } } } -void ClientInterface::send(u16 peer_id,u8 channelnum, - SharedBuffer data, bool reliable) +void ClientInterface::send(session_t peer_id, u8 channelnum, + NetworkPacket *pkt, bool reliable) { - m_con->Send(peer_id, channelnum, data, reliable); + m_con->Send(peer_id, channelnum, pkt, reliable); } -void ClientInterface::sendToAll(u16 channelnum, - SharedBuffer data, bool reliable) +void ClientInterface::sendToAll(NetworkPacket *pkt) { - JMutexAutoLock clientslock(m_clients_mutex); - for(std::map::iterator - i = m_clients.begin(); - i != m_clients.end(); ++i) - { - RemoteClient *client = i->second; + MutexAutoLock clientslock(m_clients_mutex); + for (auto &client_it : m_clients) { + RemoteClient *client = client_it.second; + + if (client->net_proto_version != 0) { + m_con->Send(client->peer_id, + clientCommandFactoryTable[pkt->getCommand()].channel, pkt, + clientCommandFactoryTable[pkt->getCommand()].reliable); + } + } +} - if (client->net_proto_version != 0) - { - m_con->Send(client->peer_id, channelnum, data, 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) +RemoteClient* ClientInterface::getClientNoEx(session_t peer_id, ClientState state_min) { - JMutexAutoLock clientslock(m_clients_mutex); - std::map::iterator n; - n = m_clients.find(peer_id); + MutexAutoLock clientslock(m_clients_mutex); + 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()) + if (n == m_clients.end()) return NULL; if (n->second->getState() >= state_min) return n->second; - else - return NULL; + + return NULL; } -RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min) +RemoteClient* ClientInterface::lockedGetClientNoEx(session_t peer_id, ClientState state_min) { - std::map::iterator n; - 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()) + if (n == m_clients.end()) return NULL; if (n->second->getState() >= state_min) return n->second; - else - return NULL; + + return NULL; } -ClientState ClientInterface::getClientState(u16 peer_id) +ClientState ClientInterface::getClientState(session_t peer_id) { - JMutexAutoLock clientslock(m_clients_mutex); - std::map::iterator n; - n = m_clients.find(peer_id); + MutexAutoLock clientslock(m_clients_mutex); + 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()) - return Invalid; + if (n == m_clients.end()) + return CS_Invalid; return n->second->getState(); } -void ClientInterface::setPlayerName(u16 peer_id,std::string name) +void ClientInterface::setPlayerName(session_t peer_id, const std::string &name) { - JMutexAutoLock clientslock(m_clients_mutex); - std::map::iterator n; - n = m_clients.find(peer_id); + MutexAutoLock clientslock(m_clients_mutex); + 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()) + if (n != m_clients.end()) n->second->setName(name); } -void ClientInterface::DeleteClient(u16 peer_id) +void ClientInterface::DeleteClient(session_t peer_id) { - JMutexAutoLock conlock(m_clients_mutex); + MutexAutoLock conlock(m_clients_mutex); // Error check - std::map::iterator n; - 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()) + if (n == m_clients.end()) return; /* @@ -699,12 +829,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) @@ -716,15 +842,14 @@ void ClientInterface::DeleteClient(u16 peer_id) m_clients.erase(peer_id); } -void ClientInterface::CreateClient(u16 peer_id) +void ClientInterface::CreateClient(session_t peer_id) { - JMutexAutoLock conlock(m_clients_mutex); + MutexAutoLock conlock(m_clients_mutex); // Error check - std::map::iterator n; - 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; + if (n != m_clients.end()) return; // Create client RemoteClient *client = new RemoteClient(); @@ -732,14 +857,13 @@ void ClientInterface::CreateClient(u16 peer_id) m_clients[client->peer_id] = client; } -void ClientInterface::event(u16 peer_id, ClientStateEvent event) +void ClientInterface::event(session_t peer_id, ClientStateEvent event) { { - JMutexAutoLock clientlock(m_clients_mutex); + MutexAutoLock clientlock(m_clients_mutex); // Error check - std::map::iterator n; - n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); // No client to deliver event if (n == m_clients.end()) @@ -747,23 +871,39 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event) n->second->notifyEvent(event); } - if ((event == SetMediaSent) || (event == Disconnect) || (event == SetDenied)) + if ((event == CSE_SetClientReady) || + (event == CSE_Disconnect) || + (event == CSE_SetDenied)) { UpdatePlayerList(); } } -u16 ClientInterface::getProtocolVersion(u16 peer_id) +u16 ClientInterface::getProtocolVersion(session_t peer_id) { - JMutexAutoLock conlock(m_clients_mutex); + MutexAutoLock conlock(m_clients_mutex); // Error check - std::map::iterator n; - n = m_clients.find(peer_id); + RemoteClientMap::iterator n = m_clients.find(peer_id); - // No client to deliver event + // No client to get version if (n == m_clients.end()) return 0; return n->second->net_proto_version; } + +void ClientInterface::setClientVersion(session_t peer_id, u8 major, u8 minor, u8 patch, + const std::string &full) +{ + MutexAutoLock conlock(m_clients_mutex); + + // Error check + RemoteClientMap::iterator n = m_clients.find(peer_id); + + // No client to set versions + if (n == m_clients.end()) + return; + + n->second->setVersionInfo(major, minor, patch, full); +}