projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings reported by clang
[oweals/minetest.git]
/
src
/
server.cpp
diff --git
a/src/server.cpp
b/src/server.cpp
index 516a9d2f9c32b3a4cd51d04d5bad7b1dad7802ef..1e644ce6ce3a672a5f4d414f63409a66940e0fad 100644
(file)
--- a/
src/server.cpp
+++ b/
src/server.cpp
@@
-676,15
+676,15
@@
void Server::AsyncRunStep(bool initial_step)
{
float &counter = m_masterserver_timer;
if(!isSingleplayer() && (!counter || counter >= 300.0) &&
{
float &counter = m_masterserver_timer;
if(!isSingleplayer() && (!counter || counter >= 300.0) &&
- g_settings->getBool("server_announce")
== true
)
+ g_settings->getBool("server_announce"))
{
{
- ServerList::sendAnnounce(
!counter ? "start" : "update
",
-
m_clients.getPlayerNames(),
-
m_uptime.get(),
-
m_env->getGameTime(),
-
m_lag,
-
m_gamespec.id,
-
m_mods);
+ ServerList::sendAnnounce(
counter ? "update" : "start
",
+ m_clients.getPlayerNames(),
+ m_uptime.get(),
+ m_env->getGameTime(),
+ m_lag,
+ m_gamespec.id,
+ m_mods);
counter = 0.01;
}
counter += dtime;
counter = 0.01;
}
counter += dtime;
@@
-714,7
+714,7
@@
void Server::AsyncRunStep(bool initial_step)
// If definitions and textures have not been sent, don't
// send objects either
// If definitions and textures have not been sent, don't
// send objects either
- if (client->getState() < DefinitionsSent)
+ if (client->getState() <
CS_
DefinitionsSent)
continue;
Player *player = m_env->getPlayer(client->peer_id);
continue;
Player *player = m_env->getPlayer(client->peer_id);
@@
-1169,7
+1169,7
@@
PlayerSAO* Server::StageTwoClientInit(u16 peer_id)
std::string playername = "";
PlayerSAO *playersao = NULL;
m_clients.Lock();
std::string playername = "";
PlayerSAO *playersao = NULL;
m_clients.Lock();
- RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id,InitDone);
+ RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id,
CS_
InitDone);
if (client != NULL) {
playername = client->getName();
playersao = emergePlayer(playername.c_str(), peer_id);
if (client != NULL) {
playername = client->getName();
playersao = emergePlayer(playername.c_str(), peer_id);
@@
-1320,10
+1320,10
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if(datasize < 2+1+PLAYERNAME_SIZE)
return;
if(datasize < 2+1+PLAYERNAME_SIZE)
return;
- RemoteClient* client = getClient(peer_id,Created);
+ RemoteClient* client = getClient(peer_id,
CS_
Created);
// If net_proto_version is set, this client has already been handled
// If net_proto_version is set, this client has already been handled
- if(client->getState() > Created)
+ if(client->getState() > C
S_C
reated)
{
verbosestream<<"Server: Ignoring multiple TOSERVER_INITs from "
<<addr_s<<" (peer_id="<<peer_id<<")"<<std::endl;
{
verbosestream<<"Server: Ignoring multiple TOSERVER_INITs from "
<<addr_s<<" (peer_id="<<peer_id<<")"<<std::endl;
@@
-1522,7
+1522,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Enforce user limit.
// Don't enforce for users that have some admin right
// Enforce user limit.
// Don't enforce for users that have some admin right
- if(m_clients.getClientIDs(Created).size() >= g_settings->getU16("max_users") &&
+ if(m_clients.getClientIDs(C
S_C
reated).size() >= g_settings->getU16("max_users") &&
!checkPriv(playername, "server") &&
!checkPriv(playername, "ban") &&
!checkPriv(playername, "privs") &&
!checkPriv(playername, "server") &&
!checkPriv(playername, "ban") &&
!checkPriv(playername, "privs") &&
@@
-1605,7
+1605,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Send as reliable
m_clients.send(peer_id, 0, reply, true);
// Send as reliable
m_clients.send(peer_id, 0, reply, true);
- m_clients.event(peer_id, Init);
+ m_clients.event(peer_id,
CSE_
Init);
}
return;
}
return;
@@
-1617,7
+1617,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
verbosestream<<"Server: Got TOSERVER_INIT2 from "
<<peer_id<<std::endl;
verbosestream<<"Server: Got TOSERVER_INIT2 from "
<<peer_id<<std::endl;
- m_clients.event(peer_id, GotInit2);
+ m_clients.event(peer_id,
CSE_
GotInit2);
u16 protocol_version = m_clients.getProtocolVersion(peer_id);
u16 protocol_version = m_clients.getProtocolVersion(peer_id);
@@
-1651,7
+1651,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Send node definitions
SendNodeDef(peer_id, m_nodedef, protocol_version);
// Send node definitions
SendNodeDef(peer_id, m_nodedef, protocol_version);
- m_clients.event(peer_id, SetDefinitionsSent);
+ m_clients.event(peer_id,
CSE_
SetDefinitionsSent);
// Send media announcement
sendMediaAnnouncement(peer_id);
// Send media announcement
sendMediaAnnouncement(peer_id);
@@
-1666,7
+1666,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
///// begin compatibility code
if (protocol_version <= 22) {
///// begin compatibility code
if (protocol_version <= 22) {
- m_clients.event(peer_id, SetClientReady);
+ m_clients.event(peer_id,
CSE_
SetClientReady);
m_script->on_joinplayer(playersao);
}
///// end compatibility code
m_script->on_joinplayer(playersao);
}
///// end compatibility code
@@
-1681,8
+1681,8
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
return;
}
return;
}
- u8 peer_ser_ver = getClient(peer_id,InitDone)->serialization_version;
- u16 peer_proto_ver = getClient(peer_id,InitDone)->net_proto_version;
+ u8 peer_ser_ver = getClient(peer_id,
CS_
InitDone)->serialization_version;
+ u16 peer_proto_ver = getClient(peer_id,
CS_
InitDone)->net_proto_version;
if(peer_ser_ver == SER_FMT_VER_INVALID)
{
if(peer_ser_ver == SER_FMT_VER_INVALID)
{
@@
-1746,7
+1746,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
data[2], data[3], data[4],
std::string((char*) &data[8],(u16) data[6]));
data[2], data[3], data[4],
std::string((char*) &data[8],(u16) data[6]));
- m_clients.event(peer_id, SetClientReady);
+ m_clients.event(peer_id,
CSE_
SetClientReady);
m_script->on_joinplayer(playersao);
}
m_script->on_joinplayer(playersao);
}
@@
-1778,7
+1778,7
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
return;
}
return;
}
- if (m_clients.getClientState(peer_id) < Active)
+ if (m_clients.getClientState(peer_id) <
CS_
Active)
{
if (command == TOSERVER_PLAYERPOS) return;
{
if (command == TOSERVER_PLAYERPOS) return;
@@
-1789,18
+1789,20
@@
void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
}
Player *player = m_env->getPlayer(peer_id);
}
Player *player = m_env->getPlayer(peer_id);
- if(player == NULL){
+ if(player == NULL)
{
errorstream<<"Server::ProcessData(): Cancelling: "
"No player for peer_id="<<peer_id
errorstream<<"Server::ProcessData(): Cancelling: "
"No player for peer_id="<<peer_id
- <<std::endl;
+ << " disconnecting peer!" <<std::endl;
+ m_con.DisconnectPeer(peer_id);
return;
}
PlayerSAO *playersao = player->getPlayerSAO();
return;
}
PlayerSAO *playersao = player->getPlayerSAO();
- if(playersao == NULL){
+ if(playersao == NULL)
{
errorstream<<"Server::ProcessData(): Cancelling: "
"No player object for peer_id="<<peer_id
errorstream<<"Server::ProcessData(): Cancelling: "
"No player object for peer_id="<<peer_id
- <<std::endl;
+ << " disconnecting peer!" <<std::endl;
+ m_con.DisconnectPeer(peer_id);
return;
}
return;
}
@@
-2837,7
+2839,7
@@
void Server::deletingPeer(con::Peer *peer, bool timeout)
verbosestream<<"Server::deletingPeer(): peer->id="
<<peer->id<<", timeout="<<timeout<<std::endl;
verbosestream<<"Server::deletingPeer(): peer->id="
<<peer->id<<", timeout="<<timeout<<std::endl;
- m_clients.event(peer->id,Disconnect);
+ m_clients.event(peer->id,
CSE_
Disconnect);
con::PeerChange c;
c.type = con::PEER_REMOVED;
c.peer_id = peer->id;
con::PeerChange c;
c.type = con::PEER_REMOVED;
c.peer_id = peer->id;
@@
-2866,12
+2868,12
@@
bool Server::getClientInfo(
{
*state = m_clients.getClientState(peer_id);
m_clients.Lock();
{
*state = m_clients.getClientState(peer_id);
m_clients.Lock();
- RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id,Invalid);
+ RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id,
CS_
Invalid);
if (client == NULL) {
m_clients.Unlock();
return false;
if (client == NULL) {
m_clients.Unlock();
return false;
-
}
+ }
*uptime = client->uptime();
*ser_vers = client->serialization_version;
*uptime = client->uptime();
*ser_vers = client->serialization_version;
@@
-3132,10
+3134,11
@@
void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
std::ostringstream os(std::ios_base::binary);
u8 buf[12];
std::ostringstream os(std::ios_base::binary);
u8 buf[12];
+
// Write command
writeU16(buf, TOCLIENT_SHOW_FORMSPEC);
os.write((char*)buf, 2);
// Write command
writeU16(buf, TOCLIENT_SHOW_FORMSPEC);
os.write((char*)buf, 2);
- os<<serializeLongString(formspec);
+ os<<serializeLongString(
FORMSPEC_VERSION_STRING +
formspec);
os<<serializeString(formname);
// Make data buffer
os<<serializeString(formname);
// Make data buffer
@@
-3538,7
+3541,7
@@
void Server::SendPlayerInventoryFormspec(u16 peer_id)
std::ostringstream os(std::ios_base::binary);
writeU16(os, TOCLIENT_INVENTORY_FORMSPEC);
std::ostringstream os(std::ios_base::binary);
writeU16(os, TOCLIENT_INVENTORY_FORMSPEC);
- os<<serializeLongString(player->inventory_formspec);
+ os<<serializeLongString(
FORMSPEC_VERSION_STRING +
player->inventory_formspec);
// Make data buffer
std::string s = os.str();
// Make data buffer
std::string s = os.str();
@@
-3841,7
+3844,7
@@
void Server::SendBlocks(float dtime)
i = clients.begin();
i != clients.end(); ++i)
{
i = clients.begin();
i != clients.end(); ++i)
{
- RemoteClient *client = m_clients.lockedGetClientNoEx(*i,Active);
+ RemoteClient *client = m_clients.lockedGetClientNoEx(*i,
CS_
Active);
if (client == NULL)
return;
if (client == NULL)
return;
@@
-3877,7
+3880,7
@@
void Server::SendBlocks(float dtime)
continue;
}
continue;
}
- RemoteClient *client = m_clients.lockedGetClientNoEx(q.peer_id,Active);
+ RemoteClient *client = m_clients.lockedGetClientNoEx(q.peer_id,
CS_
Active);
if(!client)
continue;
if(!client)
continue;
@@
-4268,7
+4271,7
@@
void Server::DenyAccess(u16 peer_id, const std::wstring &reason)
DSTACK(__FUNCTION_NAME);
SendAccessDenied(peer_id, reason);
DSTACK(__FUNCTION_NAME);
SendAccessDenied(peer_id, reason);
- m_clients.event(peer_id,SetDenied);
+ m_clients.event(peer_id,
CSE_
SetDenied);
m_con.DisconnectPeer(peer_id);
}
m_con.DisconnectPeer(peer_id);
}