Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed erroneus handling of many players with no peer existing at same time

master
Perttu Ahola 2011-01-18 00:26:09 +02:00
parent a35d8dabcf
commit 1986326731
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/server.cpp
View File

@ -1567,9 +1567,18 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
playername[playername_size-1] = 0; playername[playername_size-1] = 0;
// Get player // Get player
Player *player = emergePlayer(playername, ""); Player *player = emergePlayer(playername, "", peer_id);
//Player *player = m_env.getPlayer(peer_id); //Player *player = m_env.getPlayer(peer_id);
// If failed, cancel
if(player == NULL)
{
derr_server<<DTIME<<"Server: peer_id="<<peer_id
<<": failed to emerge player"<<std::endl;
return;
}
/*
// If a client is already connected to the player, cancel // If a client is already connected to the player, cancel
if(player->peer_id != 0) if(player->peer_id != 0)
{ {
@ -1579,9 +1588,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
<<player->peer_id<<")"<<std::endl; <<player->peer_id<<")"<<std::endl;
return; return;
} }
// Set client of player // Set client of player
player->peer_id = peer_id; player->peer_id = peer_id;
*/
// Check if player doesn't exist // Check if player doesn't exist
if(player == NULL) if(player == NULL)
@ -3091,7 +3100,8 @@ RemoteClient* Server::getClient(u16 peer_id)
return n->getValue(); return n->getValue();
} }
Player *Server::emergePlayer(const char *name, const char *password) Player *Server::emergePlayer(const char *name, const char *password,
u16 peer_id)
{ {
/* /*
Try to get an existing player Try to get an existing player
@ -3099,9 +3109,25 @@ Player *Server::emergePlayer(const char *name, const char *password)
Player *player = m_env.getPlayer(name); Player *player = m_env.getPlayer(name);
if(player != NULL) if(player != NULL)
{ {
// If player is already connected, cancel
if(player->peer_id != 0)
{
dstream<<"emergePlayer(): Player already connected"<<std::endl;
return NULL;
}
// Got one. // Got one.
return player; return player;
} }
/*
If player with the wanted peer_id already exists, cancel.
*/
if(m_env.getPlayer(peer_id) != NULL)
{
dstream<<"emergePlayer(): Player with wrong name but same"
" peer_id already exists"<<std::endl;
return NULL;
}
/* /*
Create a new player Create a new player
@ -3109,7 +3135,8 @@ Player *Server::emergePlayer(const char *name, const char *password)
{ {
player = new ServerRemotePlayer(); player = new ServerRemotePlayer();
//player->peer_id = c.peer_id; //player->peer_id = c.peer_id;
player->peer_id = PEER_ID_INEXISTENT; //player->peer_id = PEER_ID_INEXISTENT;
player->peer_id = peer_id;
player->updateName(name); player->updateName(name);
/* /*

13
src/server.h
View File

@ -437,11 +437,14 @@ private:
// When called, connection mutex should be locked // When called, connection mutex should be locked
RemoteClient* getClient(u16 peer_id); RemoteClient* getClient(u16 peer_id);
// Gets a player from memory or creates one. /*
// Caller should check isClientConnected() and set it appropriately. Get a player from memory or creates one.
// If player is already connected, return NULL
// Call with env and con locked.
Player *emergePlayer(const char *name, const char *password); Call with env and con locked.
*/
Player *emergePlayer(const char *name, const char *password,
u16 peer_id);
/* /*
Update water pressure. Update water pressure.