*/
#include <sstream>
-
#include "clientiface.h"
-#include "util/numeric.h"
-#include "util/mathconstants.h"
+#include "network/connection.h"
+#include "network/serveropcodes.h"
#include "remoteplayer.h"
#include "settings.h"
#include "mapblock.h"
-#include "network/connection.h"
-#include "environment.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",
float dtime,
std::vector<PrioritySortedBlockTransfer> &dest)
{
- DSTACK(FUNCTION_NAME);
-
-
// Increment timers
m_nothing_to_send_pause_timer -= dtime;
m_nearest_unsent_reset_timer += dtime;
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 new_nearest_unsent_d = -1;
- const s16 full_d_max = g_settings->getS16("max_block_send_distance");
- const s16 d_opt = g_settings->getS16("block_send_optimize_distance");
+ // get view range and camera fov from the client
+ s16 wanted_range = sao->getWantedRange();
+ float camera_fov = sao->getFov();
+ // if FOV, wanted_range are not available (old client), fall back to old default
+ if (wanted_range <= 0) wanted_range = 1000;
+ if (camera_fov <= 0) camera_fov = (72.0*M_PI/180) * 4./3.;
+
+ const s16 full_d_max = MYMIN(g_settings->getS16("max_block_send_distance"), wanted_range);
+ const s16 d_opt = MYMIN(g_settings->getS16("block_send_optimize_distance"), wanted_range);
+ const s16 d_blocks_in_sight = full_d_max * BS * MAP_BLOCKSIZE;
+ //infostream << "Fov from client " << camera_fov << " full_d_max " << full_d_max << std::endl;
s16 d_max = full_d_max;
- s16 d_max_gen = g_settings->getS16("max_block_generate_distance");
+ s16 d_max_gen = MYMIN(g_settings->getS16("max_block_generate_distance"), wanted_range);
// Don't loop very much at a time
s16 max_d_increment_at_time = 2;
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
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) > full_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.
*/
- 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)) {
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();
// 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;
/*
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;
}
/*
Add block to send queue
*/
- PrioritySortedBlockTransfer q((float)d, p, peer_id);
+ PrioritySortedBlockTransfer q((float)dist, p, peer_id);
dest.push_back(q);
} 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;
} else {
m_nearest_unsent_d = 0;
m_nothing_to_send_pause_timer = 0;
- for(std::map<v3s16, MapBlock*>::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())
{
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;
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;
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;
}
}
-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::Connection> & con)
:
m_con(con),
m_env(NULL),
{
MutexAutoLock clientslock(m_clients_mutex);
- for (UNORDERED_MAP<u16, RemoteClient*>::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;
}
}
}
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();
if(!clients.empty())
infostream<<"Players:"<<std::endl;
- for (std::vector<u16>::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;
{
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());
}
}
}
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) {
- 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<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())
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<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())
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<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 (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)
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())
projects / dragonfireclient.git / blobdiff