*/
#include <sstream>
-
#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",
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
}
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();
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++) {
/*
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
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;
}
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();
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)
block_is_invalid = true;
if(block->getDayNightDiff() == false)
continue;
}
+
+ if (occ_cull && !block_is_invalid &&
+ env->getMap().isBlockOccluded(block, cam_pos_nodes)) {
+ continue;
+ }
}
/*
/*
Add block to send queue
*/
- PrioritySortedBlockTransfer q((float)d, p, peer_id);
+ PrioritySortedBlockTransfer q((float)dist, p, peer_id);
dest.push_back(q);
}
}
-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)
{
MutexAutoLock clientslock(m_clients_mutex);
- for (UNORDERED_MAP<u16, RemoteClient*>::iterator i = m_clients.begin();
+ for (RemoteClientMap::iterator i = m_clients.begin();
i != m_clients.end(); ++i) {
// Delete client
delete i->second;
std::vector<u16> reply;
MutexAutoLock clientslock(m_clients_mutex);
- for(UNORDERED_MAP<u16, RemoteClient*>::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;
void ClientInterface::UpdatePlayerList()
{
- if (m_env != NULL) {
+ if (m_env) {
std::vector<u16> clients = getClientIDs();
m_clients_names.clear();
{
MutexAutoLock clientslock(m_clients_mutex);
RemoteClient* client = lockedGetClientNoEx(*i);
- if(client != NULL)
+ if (client)
client->PrintInfo(infostream);
}
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<u16, RemoteClient*>::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<u16, RemoteClient*>::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<u16, RemoteClient*>::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())
RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState state_min)
{
- UNORDERED_MAP<u16, RemoteClient*>::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())
ClientState ClientInterface::getClientState(u16 peer_id)
{
MutexAutoLock clientslock(m_clients_mutex);
- UNORDERED_MAP<u16, RemoteClient*>::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())
void ClientInterface::setPlayerName(u16 peer_id,std::string name)
{
MutexAutoLock clientslock(m_clients_mutex);
- UNORDERED_MAP<u16, RemoteClient*>::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())
MutexAutoLock conlock(m_clients_mutex);
// Error check
- UNORDERED_MAP<u16, RemoteClient*>::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())
//TODO this should be done by client destructor!!!
RemoteClient *client = n->second;
// Handle objects
- for(std::set<u16>::iterator
- i = client->m_known_objects.begin();
- i != client->m_known_objects.end(); ++i)
- {
+ for (std::set<u16>::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);
MutexAutoLock conlock(m_clients_mutex);
// Error check
- UNORDERED_MAP<u16, RemoteClient*>::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;
MutexAutoLock clientlock(m_clients_mutex);
// Error check
- UNORDERED_MAP<u16, RemoteClient*>::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())
MutexAutoLock conlock(m_clients_mutex);
// Error check
- UNORDERED_MAP<u16, RemoteClient*>::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())
MutexAutoLock conlock(m_clients_mutex);
// Error check
- UNORDERED_MAP<u16, RemoteClient*>::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())