BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

server.cpp: code modernization

Browse Source 
* Use more for range based loops
* Simplify some tests
* Code style fixes
* connection.h: better PeerChange constructor instead of creating uninitalized object and then affect variables
This commit is contained in:
Loic Blot 2017-08-15 09:30:31 +02:00
parent 618e0dd417
commit 342e9336ae
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
2 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/connection.h
View File

@ -586,6 +586,10 @@ enum PeerChangeType
}; };
struct PeerChange struct PeerChange
{ {
PeerChange(PeerChangeType t, u16 _peer_id, bool _timeout):
type(t), peer_id(_peer_id), timeout(_timeout) {}
PeerChange() = delete;
PeerChangeType type; PeerChangeType type;
u16 peer_id; u16 peer_id;
bool timeout; bool timeout;

67
src/server.cpp
View File

@ -114,7 +114,7 @@ void *ServerThread::run()
END_DEBUG_EXCEPTION_HANDLER END_DEBUG_EXCEPTION_HANDLER
return NULL; return nullptr;
} }
v3f ServerSoundParams::getPos(ServerEnvironment *env, bool *pos_exists) const v3f ServerSoundParams::getPos(ServerEnvironment *env, bool *pos_exists) const
@ -172,7 +172,7 @@ Server::Server(
{ {
m_lag = g_settings->getFloat("dedicated_server_step"); m_lag = g_settings->getFloat("dedicated_server_step");
if(path_world == "") if (path_world.empty())
throw ServerError("Supplied empty world path"); throw ServerError("Supplied empty world path");
if(!gamespec.isValid()) if(!gamespec.isValid())
@ -251,7 +251,7 @@ Server::Server(
// Apply texture overrides from texturepack/override.txt // Apply texture overrides from texturepack/override.txt
std::string texture_path = g_settings->get("texture_path"); std::string texture_path = g_settings->get("texture_path");
if (texture_path != "" && fs::IsDir(texture_path)) if (!texture_path.empty() && fs::IsDir(texture_path))
m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt"); m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt");
m_nodedef->setNodeRegistrationStatus(true); m_nodedef->setNodeRegistrationStatus(true);
@ -326,7 +326,7 @@ Server::~Server()
reconnect = m_shutdown_ask_reconnect; reconnect = m_shutdown_ask_reconnect;
kick_msg = m_shutdown_msg; kick_msg = m_shutdown_msg;
} }
if (kick_msg == "") { if (kick_msg.empty()) {
kick_msg = g_settings->get("kick_msg_shutdown"); kick_msg = g_settings->get("kick_msg_shutdown");
} }
m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN, m_env->kickAllPlayers(SERVER_ACCESSDENIED_SHUTDOWN,
@ -1016,7 +1016,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
m_clients.lock(); m_clients.lock();
try { try {
RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_InitDone); RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_InitDone);
if (client != NULL) { if (client) {
playername = client->getName(); playername = client->getName();
playersao = emergePlayer(playername.c_str(), peer_id, client->net_proto_version); playersao = emergePlayer(playername.c_str(), peer_id, client->net_proto_version);
} }
@ -1029,7 +1029,7 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
RemotePlayer *player = m_env->getPlayer(playername.c_str()); RemotePlayer *player = m_env->getPlayer(playername.c_str());
// If failed, cancel // If failed, cancel
if ((playersao == NULL) || (player == NULL)) { if (!playersao || !player) {
if (player && player->peer_id != 0) { if (player && player->peer_id != 0) {
actionstream << "Server: Failed to emerge player \"" << playername actionstream << "Server: Failed to emerge player \"" << playername
<< "\" (player allocated to an another client)" << std::endl; << "\" (player allocated to an another client)" << std::endl;
@ -1301,11 +1301,7 @@ void Server::peerAdded(con::Peer *peer)
verbosestream<<"Server::peerAdded(): peer->id=" verbosestream<<"Server::peerAdded(): peer->id="
<<peer->id<<std::endl; <<peer->id<<std::endl;
con::PeerChange c; m_peer_change_queue.push(con::PeerChange(con::PEER_ADDED, peer->id, false));
c.type = con::PEER_ADDED;
c.peer_id = peer->id;
c.timeout = false;
m_peer_change_queue.push(c);
} }
void Server::deletingPeer(con::Peer *peer, bool timeout) void Server::deletingPeer(con::Peer *peer, bool timeout)
@ -1315,11 +1311,7 @@ void Server::deletingPeer(con::Peer *peer, bool timeout)
<<peer->id<<", timeout="<<timeout<<std::endl; <<peer->id<<", timeout="<<timeout<<std::endl;
m_clients.event(peer->id, CSE_Disconnect); m_clients.event(peer->id, CSE_Disconnect);
con::PeerChange c; m_peer_change_queue.push(con::PeerChange(con::PEER_REMOVED, peer->id, timeout));
c.type = con::PEER_REMOVED;
c.peer_id = peer->id;
c.timeout = timeout;
m_peer_change_queue.push(c);
} }
bool Server::getClientConInfo(u16 peer_id, con::rtt_stat_type type, float* retval) bool Server::getClientConInfo(u16 peer_id, con::rtt_stat_type type, float* retval)
@ -1344,7 +1336,7 @@ bool Server::getClientInfo(
m_clients.lock(); m_clients.lock();
RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_Invalid); RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_Invalid);
if (client == NULL) { if (!client) {
m_clients.unlock(); m_clients.unlock();
return false; return false;
} }
@ -2134,10 +2126,10 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
pkt << p; pkt << p;
std::vector<u16> clients = m_clients.getClientIDs(); std::vector<u16> clients = m_clients.getClientIDs();
for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) { for (u16 client_id : clients) {
if (far_players) { if (far_players) {
// Get player // Get player
if (RemotePlayer *player = m_env->getPlayer(*i)) { if (RemotePlayer *player = m_env->getPlayer(client_id)) {
PlayerSAO *sao = player->getPlayerSAO(); PlayerSAO *sao = player->getPlayerSAO();
if (!sao) if (!sao)
continue; continue;
@ -2145,14 +2137,14 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
// If player is far away, only set modified blocks not sent // If player is far away, only set modified blocks not sent
v3f player_pos = sao->getBasePosition(); v3f player_pos = sao->getBasePosition();
if (player_pos.getDistanceFrom(p_f) > maxd) { if (player_pos.getDistanceFrom(p_f) > maxd) {
far_players->push_back(*i); far_players->push_back(client_id);
continue; continue;
} }
} }
} }
// Send as reliable // Send as reliable
m_clients.send(*i, 0, &pkt, true); m_clients.send(client_id, 0, &pkt, true);
} }
} }
@ -2275,19 +2267,15 @@ void Server::SendBlocks(float dtime)
PrioritySortedBlockTransfer q = queue[i]; PrioritySortedBlockTransfer q = queue[i];
MapBlock *block = NULL; MapBlock *block = nullptr;
try try {
{
block = m_env->getMap().getBlockNoCreate(q.pos); block = m_env->getMap().getBlockNoCreate(q.pos);
} } catch(const InvalidPositionException &e) {
catch(InvalidPositionException &e)
{
continue; continue;
} }
RemoteClient *client = m_clients.lockedGetClientNoEx(q.peer_id, CS_Active); RemoteClient *client = m_clients.lockedGetClientNoEx(q.peer_id, CS_Active);
if (!client)
if(!client)
continue; continue;
SendBlockNoLock(q.peer_id, block, client->serialization_version, client->net_proto_version); SendBlockNoLock(q.peer_id, block, client->serialization_version, client->net_proto_version);
@ -2718,7 +2706,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
RemotePlayer *player = m_env->getPlayer(peer_id); RemotePlayer *player = m_env->getPlayer(peer_id);
/* Run scripts and remove from environment */ /* Run scripts and remove from environment */
if (player != NULL) { if (player) {
PlayerSAO *playersao = player->getPlayerSAO(); PlayerSAO *playersao = player->getPlayerSAO();
assert(playersao); assert(playersao);
@ -2737,7 +2725,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
Print out action Print out action
*/ */
{ {
if(player != NULL && reason != CDR_DENY) { if (player && reason != CDR_DENY) {
std::ostringstream os(std::ios_base::binary); std::ostringstream os(std::ios_base::binary);
std::vector<u16> clients = m_clients.getClientIDs(); std::vector<u16> clients = m_clients.getClientIDs();
@ -2889,8 +2877,7 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
if (player && player->protocol_version >= 29) if (player && player->protocol_version >= 29)
peer_id_to_avoid_sending = PEER_ID_INEXISTENT; peer_id_to_avoid_sending = PEER_ID_INEXISTENT;
for (u16 i = 0; i < clients.size(); i++) { for (u16 cid : clients) {
u16 cid = clients[i];
if (cid != peer_id_to_avoid_sending) if (cid != peer_id_to_avoid_sending)
SendChatMessage(cid, ChatMessage(line)); SendChatMessage(cid, ChatMessage(line));
} }
@ -2927,7 +2914,7 @@ RemoteClient* Server::getClientNoEx(u16 peer_id, ClientState state_min)
std::string Server::getPlayerName(u16 peer_id) std::string Server::getPlayerName(u16 peer_id)
{ {
RemotePlayer *player = m_env->getPlayer(peer_id); RemotePlayer *player = m_env->getPlayer(peer_id);
if (player == NULL) if (!player)
return "[id="+itos(peer_id)+"]"; return "[id="+itos(peer_id)+"]";
return player->getName(); return player->getName();
} }
@ -2935,7 +2922,7 @@ std::string Server::getPlayerName(u16 peer_id)
PlayerSAO* Server::getPlayerSAO(u16 peer_id) PlayerSAO* Server::getPlayerSAO(u16 peer_id)
{ {
RemotePlayer *player = m_env->getPlayer(peer_id); RemotePlayer *player = m_env->getPlayer(peer_id);
if (player == NULL) if (!player)
return NULL; return NULL;
return player->getPlayerSAO(); return player->getPlayerSAO();
} }
@ -2954,12 +2941,12 @@ std::wstring Server::getStatusString()
bool first = true; bool first = true;
os<<L", clients={"; os<<L", clients={";
std::vector<u16> clients = m_clients.getClientIDs(); std::vector<u16> clients = m_clients.getClientIDs();
for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) { for (u16 client_id : clients) {
// Get player // Get player
RemotePlayer *player = m_env->getPlayer(*i); RemotePlayer *player = m_env->getPlayer(client_id);
// Get name of player // Get name of player
std::wstring name = L"unknown"; std::wstring name = L"unknown";
if (player != NULL) if (player)
name = narrow_to_wide(player->getName()); name = narrow_to_wide(player->getName());
// Add name to information string // Add name to information string
if(!first) if(!first)
@ -3540,7 +3527,7 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
RemotePlayer *player = m_env->getPlayer(name); RemotePlayer *player = m_env->getPlayer(name);
// If player is already connected, cancel // If player is already connected, cancel
if (player != NULL && player->peer_id != 0) { if (player && player->peer_id != 0) {
infostream<<"emergePlayer(): Player already connected"<<std::endl; infostream<<"emergePlayer(): Player already connected"<<std::endl;
return NULL; return NULL;
} }
@ -3548,7 +3535,7 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id, u16 proto_version
/* /*
If player with the wanted peer_id already exists, cancel. If player with the wanted peer_id already exists, cancel.
*/ */
if (m_env->getPlayer(peer_id) != NULL) { if (m_env->getPlayer(peer_id)) {
infostream<<"emergePlayer(): Player with wrong name but same" infostream<<"emergePlayer(): Player with wrong name but same"
" peer_id already exists"<<std::endl; " peer_id already exists"<<std::endl;
return NULL; return NULL;