X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientiface.cpp;h=f07f02012fc38411d79087da8c3218e9821f793f;hb=9c8fec83af2c94791865cd82ee18abdc54f913a1;hp=11054969c24664d1550bd7af3bcb30150a0dc615;hpb=454483f26610959526d97c1d318e0d699d78747d;p=dragonfireclient.git diff --git a/src/clientiface.cpp b/src/clientiface.cpp index 11054969c..f07f02012 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", @@ -78,11 +78,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 +94,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(); @@ -238,9 +238,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 @@ -274,8 +274,7 @@ 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(); @@ -589,9 +588,9 @@ 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) @@ -610,7 +609,7 @@ ClientInterface::~ClientInterface() { MutexAutoLock clientslock(m_clients_mutex); - for (UNORDERED_MAP::iterator i = m_clients.begin(); + for (RemoteClientMap::iterator i = m_clients.begin(); i != m_clients.end(); ++i) { // Delete client delete i->second; @@ -623,15 +622,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; @@ -644,7 +652,7 @@ void ClientInterface::step(float dtime) void ClientInterface::UpdatePlayerList() { - if (m_env != NULL) { + if (m_env) { std::vector clients = getClientIDs(); m_clients_names.clear(); @@ -663,7 +671,7 @@ void ClientInterface::UpdatePlayerList() { MutexAutoLock clientslock(m_clients_mutex); RemoteClient* client = lockedGetClientNoEx(*i); - if(client != NULL) + if (client) client->PrintInfo(infostream); } @@ -678,24 +686,51 @@ 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) { + for (RemoteClientMap::iterator i = m_clients.begin(); + i != m_clients.end(); ++i) { RemoteClient *client = i->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 (std::unordered_map::iterator i = m_clients.begin(); + i != m_clients.end(); ++i) { + RemoteClient *client = i->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()) @@ -709,7 +744,7 @@ RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min) 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()) @@ -724,7 +759,7 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat 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()) @@ -736,7 +771,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()) @@ -748,7 +783,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()) @@ -760,10 +795,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 (std::set::iterator i = client->m_known_objects.begin(); + i != client->m_known_objects.end(); ++i) { // Get object u16 id = *i; ServerActiveObject* obj = m_env->getActiveObject(id); @@ -782,7 +815,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; @@ -798,7 +831,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()) @@ -819,7 +852,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()) @@ -833,7 +866,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())