New settings tab contain all possible settings

[oweals/minetest.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 7649be29eff7586f7ced78f1bd0e4145c9a0bfcf..e7f127b84232c892bb1a0492a00d4be9f108778b 100644 (file)
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -31,16 +31,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 #include "serverobject.h"              // TODO this is used for cleanup of only
 #include "log.h"
+#include "util/srp.h"
 
 const char *ClientInterface::statenames[] = {
        "Invalid",
        "Disconnecting",
        "Denied",
        "Created",
-       "InitSent",
+       "AwaitingInit2",
+       "HelloSent",
        "InitDone",
        "DefinitionsSent",
-       "Active"
+       "Active",
+       "SudoMode",
 };
 
 
@@ -64,7 +67,7 @@ void RemoteClient::GetNextBlocks (
                float dtime,
                std::vector<PrioritySortedBlockTransfer> &dest)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
 
        // Increment timers
@@ -208,25 +211,19 @@ void RemoteClient::GetNextBlocks (
                                max_simul_dynamic = max_simul_sends_setting;
 
                        // Don't select too many blocks for sending
-                       if(num_blocks_selected >= max_simul_dynamic)
-                       {
+                       if (num_blocks_selected >= max_simul_dynamic) {
                                //queue_is_full = true;
                                goto queue_full_break;
                        }
 
                        // Don't send blocks that are currently being transferred
-                       if(m_blocks_sending.find(p) != m_blocks_sending.end())
+                       if (m_blocks_sending.find(p) != m_blocks_sending.end())
                                continue;
 
                        /*
                                Do not go over-limit
                        */
-                       if(p.X < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.X > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Y < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Y > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Z < -MAP_GENERATION_LIMIT / MAP_BLOCKSIZE
-                       || p.Z > MAP_GENERATION_LIMIT / MAP_BLOCKSIZE)
+                       if (blockpos_over_limit(p))
                                continue;
 
                        // If this is true, inexistent block will be made from scratch
@@ -238,7 +235,7 @@ void RemoteClient::GetNextBlocks (
                                        generate = false;*/
 
                                // Limit the send area vertically to 1/2
-                               if(abs(p.Y - center.Y) > full_d_max / 2)
+                               if (abs(p.Y - center.Y) > full_d_max / 2)
                                        continue;
                        }
 
@@ -427,10 +424,12 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
                //intentionally do nothing
                break;
        case CS_Created:
-               switch(event)
-               {
-               case CSE_Init:
-                       m_state = CS_InitSent;
+               switch (event) {
+               case CSE_Hello:
+                       m_state = CS_HelloSent;
+                       break;
+               case CSE_InitLegacy:
+                       m_state = CS_AwaitingInit2;
                        break;
                case CSE_Disconnect:
                        m_state = CS_Disconnecting;
@@ -447,7 +446,32 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
        case CS_Denied:
                /* don't do anything if in denied state */
                break;
-       case CS_InitSent:
+       case CS_HelloSent:
+               switch(event)
+               {
+               case CSE_AuthAccept:
+                       m_state = CS_AwaitingInit2;
+                       if ((chosen_mech == AUTH_MECHANISM_SRP)
+                                       || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
+                               srp_verifier_delete((SRPVerifier *) auth_data);
+                       chosen_mech = AUTH_MECHANISM_NONE;
+                       break;
+               case CSE_Disconnect:
+                       m_state = CS_Disconnecting;
+                       break;
+               case CSE_SetDenied:
+                       m_state = CS_Denied;
+                       if ((chosen_mech == AUTH_MECHANISM_SRP)
+                                       || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
+                               srp_verifier_delete((SRPVerifier *) auth_data);
+                       chosen_mech = AUTH_MECHANISM_NONE;
+                       break;
+               default:
+                       myerror << "HelloSent: Invalid client state transition! " << event;
+                       throw ClientStateError(myerror.str());
+               }
+               break;
+       case CS_AwaitingInit2:
                switch(event)
                {
                case CSE_GotInit2:
@@ -514,6 +538,13 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
                case CSE_Disconnect:
                        m_state = CS_Disconnecting;
                        break;
+               case CSE_SudoSuccess:
+                       m_state = CS_SudoMode;
+                       if ((chosen_mech == AUTH_MECHANISM_SRP)
+                                       || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
+                               srp_verifier_delete((SRPVerifier *) auth_data);
+                       chosen_mech = AUTH_MECHANISM_NONE;
+                       break;
                /* Init GotInit2 SetDefinitionsSent SetMediaSent SetDenied */
                default:
                        myerror << "Active: Invalid client state transition! " << event;
@@ -521,6 +552,24 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
                        break;
                }
                break;
+       case CS_SudoMode:
+               switch(event)
+               {
+               case CSE_SetDenied:
+                       m_state = CS_Denied;
+                       break;
+               case CSE_Disconnect:
+                       m_state = CS_Disconnecting;
+                       break;
+               case CSE_SudoLeave:
+                       m_state = CS_Active;
+                       break;
+               default:
+                       myerror << "Active: Invalid client state transition! " << event;
+                       throw ClientStateError(myerror.str());
+                       break;
+               }
+               break;
        case CS_Disconnecting:
                /* we are already disconnecting */
                break;
@@ -546,7 +595,7 @@ ClientInterface::~ClientInterface()
                Delete clients
        */
        {
-               JMutexAutoLock clientslock(m_clients_mutex);
+               MutexAutoLock clientslock(m_clients_mutex);
 
                for(std::map<u16, RemoteClient*>::iterator
                        i = m_clients.begin();
@@ -562,7 +611,7 @@ ClientInterface::~ClientInterface()
 std::vector<u16> ClientInterface::getClientIDs(ClientState min_state)
 {
        std::vector<u16> reply;
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
 
        for(std::map<u16, RemoteClient*>::iterator
                i = m_clients.begin();
@@ -613,7 +662,7 @@ void ClientInterface::UpdatePlayerList()
                        infostream << "* " << player->getName() << "\t";
 
                        {
-                               JMutexAutoLock clientslock(m_clients_mutex);
+                               MutexAutoLock clientslock(m_clients_mutex);
                                RemoteClient* client = lockedGetClientNoEx(*i);
                                if(client != NULL)
                                        client->PrintInfo(infostream);
@@ -633,7 +682,7 @@ void ClientInterface::send(u16 peer_id, u8 channelnum,
 void ClientInterface::sendToAll(u16 channelnum,
                NetworkPacket* pkt, bool reliable)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        for(std::map<u16, RemoteClient*>::iterator
                i = m_clients.begin();
                i != m_clients.end(); ++i) {
@@ -647,7 +696,7 @@ void ClientInterface::sendToAll(u16 channelnum,
 
 RemoteClient* ClientInterface::getClientNoEx(u16 peer_id, ClientState state_min)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        std::map<u16, RemoteClient*>::iterator n;
        n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
@@ -678,7 +727,7 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(u16 peer_id, ClientState stat
 
 ClientState ClientInterface::getClientState(u16 peer_id)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        std::map<u16, RemoteClient*>::iterator n;
        n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
@@ -691,7 +740,7 @@ ClientState ClientInterface::getClientState(u16 peer_id)
 
 void ClientInterface::setPlayerName(u16 peer_id,std::string name)
 {
-       JMutexAutoLock clientslock(m_clients_mutex);
+       MutexAutoLock clientslock(m_clients_mutex);
        std::map<u16, RemoteClient*>::iterator n;
        n = m_clients.find(peer_id);
        // The client may not exist; clients are immediately removed if their
@@ -702,7 +751,7 @@ void ClientInterface::setPlayerName(u16 peer_id,std::string name)
 
 void ClientInterface::DeleteClient(u16 peer_id)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;
@@ -737,7 +786,7 @@ void ClientInterface::DeleteClient(u16 peer_id)
 
 void ClientInterface::CreateClient(u16 peer_id)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;
@@ -754,7 +803,7 @@ void ClientInterface::CreateClient(u16 peer_id)
 void ClientInterface::event(u16 peer_id, ClientStateEvent event)
 {
        {
-               JMutexAutoLock clientlock(m_clients_mutex);
+               MutexAutoLock clientlock(m_clients_mutex);
 
                // Error check
                std::map<u16, RemoteClient*>::iterator n;
@@ -776,7 +825,7 @@ void ClientInterface::event(u16 peer_id, ClientStateEvent event)
 
 u16 ClientInterface::getProtocolVersion(u16 peer_id)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;
@@ -791,7 +840,7 @@ u16 ClientInterface::getProtocolVersion(u16 peer_id)
 
 void ClientInterface::setClientVersion(u16 peer_id, u8 major, u8 minor, u8 patch, std::string full)
 {
-       JMutexAutoLock conlock(m_clients_mutex);
+       MutexAutoLock conlock(m_clients_mutex);
 
        // Error check
        std::map<u16, RemoteClient*>::iterator n;