diff options
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 209 |
1 files changed, 172 insertions, 37 deletions
diff --git a/src/server.h b/src/server.h index f997828b2..791ecdec7 100644 --- a/src/server.h +++ b/src/server.h @@ -1,6 +1,6 @@ /* Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com> +Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,18 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "utility.h" #include "porting.h" #include "map.h" +#include "inventory.h" +#include "auth.h" +/* + Some random functions +*/ +v3f findSpawnPos(ServerMap &map); + +/* + A structure containing the data needed for queueing the fetching + of blocks. +*/ struct QueuedBlockEmerge { v3s16 pos; @@ -240,6 +251,8 @@ public: pending_serialization_version = SER_FMT_VER_INVALID; m_nearest_unsent_d = 0; m_nearest_unsent_reset_timer = 0.0; + m_nothing_to_send_counter = 0; + m_nothing_to_send_pause_timer = 0; } ~RemoteClient() { @@ -284,7 +297,7 @@ public: void PrintInfo(std::ostream &o) { o<<"RemoteClient "<<peer_id<<": " - <<", m_blocks_sent.size()="<<m_blocks_sent.size() + <<"m_blocks_sent.size()="<<m_blocks_sent.size() <<", m_blocks_sending.size()="<<m_blocks_sending.size() <<", m_nearest_unsent_d="<<m_nearest_unsent_d <<", m_excess_gotblocks="<<m_excess_gotblocks @@ -340,9 +353,14 @@ private: This is resetted by PrintInfo() */ u32 m_excess_gotblocks; + + // CPU usage optimization + u32 m_nothing_to_send_counter; + float m_nothing_to_send_pause_timer; }; -class Server : public con::PeerHandler, public MapEventReceiver +class Server : public con::PeerHandler, public MapEventReceiver, + public InventoryManager { public: /* @@ -365,14 +383,21 @@ public: core::list<PlayerInfo> getPlayerInfo(); - u32 getDayNightRatio() + /*u32 getDayNightRatio() { return time_to_daynight_ratio(m_time_of_day.get()); + }*/ + + // Environment must be locked when called + void setTimeOfDay(u32 time) + { + m_env.setTimeOfDay(time); + m_time_of_day_send_timer = 0; } bool getShutdownRequested() { - return m_shutdown_requested.get(); + return m_shutdown_requested; } /* @@ -382,58 +407,132 @@ public: */ void onMapEditEvent(MapEditEvent *event); + /* + Shall be called with the environment and the connection locked. + */ + Inventory* getInventory(InventoryContext *c, std::string id); + void inventoryModified(InventoryContext *c, std::string id); + + // Connection must be locked when called + std::wstring getStatusString(); + + void requestShutdown(void) + { + m_shutdown_requested = true; + } + + + // Envlock and conlock should be locked when calling this + void SendMovePlayer(Player *player); + + u64 getPlayerAuthPrivs(const std::string &name) + { + try{ + return m_authmanager.getPrivs(name); + } + catch(AuthNotFoundException &e) + { + dstream<<"WARNING: Auth not found for "<<name<<std::endl; + return 0; + } + } + + void setPlayerAuthPrivs(const std::string &name, u64 privs) + { + try{ + return m_authmanager.setPrivs(name, privs); + } + catch(AuthNotFoundException &e) + { + dstream<<"WARNING: Auth not found for "<<name<<std::endl; + } + } + private: - // Virtual methods from con::PeerHandler. + // con::PeerHandler implementation. + // These queue stuff to be processed by handlePeerChanges(). // As of now, these create and remove clients and players. void peerAdded(con::Peer *peer); void deletingPeer(con::Peer *peer, bool timeout); + /* + Static send methods + */ + + static void SendHP(con::Connection &con, u16 peer_id, u8 hp); + static void SendAccessDenied(con::Connection &con, u16 peer_id, + const std::wstring &reason); + + /* + Non-static send methods + */ + // Envlock and conlock should be locked when calling these void SendObjectData(float dtime); void SendPlayerInfos(); void SendInventory(u16 peer_id); void SendChatMessage(u16 peer_id, const std::wstring &message); void BroadcastChatMessage(const std::wstring &message); - void sendRemoveNode(v3s16 p, u16 ignore_id=0); - void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0); + void SendPlayerHP(Player *player); + /* + Send a node removal/addition event to all clients except ignore_id. + Additionally, if far_players!=NULL, players further away than + far_d_nodes are ignored and their peer_ids are added to far_players + */ + // Envlock and conlock should be locked when calling these + void sendRemoveNode(v3s16 p, u16 ignore_id=0, + core::list<u16> *far_players=NULL, float far_d_nodes=100); + void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0, + core::list<u16> *far_players=NULL, float far_d_nodes=100); + void setBlockNotSent(v3s16 p); - // Environment and Connection must be locked when called + // Environment and Connection must be locked when called void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver); - // Sends blocks to clients + // Sends blocks to clients (locks env and con on its own) void SendBlocks(float dtime); + + /* + Something random + */ + + void UpdateCrafting(u16 peer_id); // When called, connection mutex should be locked RemoteClient* getClient(u16 peer_id); - // Connection must be locked when called - std::wstring getStatusString(); - + // When called, environment mutex should be locked + std::string getPlayerName(u16 peer_id) + { + Player *player = m_env.getPlayer(peer_id); + if(player == NULL) + return "[id="+itos(peer_id); + return player->getName(); + } + /* Get a player from memory or creates one. If player is already connected, return NULL + The password is not checked here - it is only used to + set the password if a new player is created. Call with env and con locked. */ - Player *emergePlayer(const char *name, const char *password, - u16 peer_id); - - /* - Update water pressure. - This also adds suitable nodes to active_nodes. - - environment has to be locked when calling. - */ - /*void UpdateBlockWaterPressure(MapBlock *block, - core::map<v3s16, MapBlock*> &modified_blocks);*/ + Player *emergePlayer(const char *name, const char *password, u16 peer_id); // Locks environment and connection by its own struct PeerChange; void handlePeerChange(PeerChange &c); void handlePeerChanges(); + + u64 getPlayerPrivs(Player *player); + + /* + Variables + */ - //float m_flowwater_timer; + // Some timers float m_liquid_transform_timer; float m_print_info_timer; float m_objectdata_timer; @@ -442,52 +541,86 @@ private: // NOTE: If connection and environment are both to be locked, // environment shall be locked first. - JMutex m_env_mutex; - ServerEnvironment m_env; - JMutex m_con_mutex; + // Environment + ServerEnvironment m_env; + JMutex m_env_mutex; + + // Connection con::Connection m_con; - core::map<u16, RemoteClient*> m_clients; // Behind the con mutex + JMutex m_con_mutex; + // Connected clients (behind the con mutex) + core::map<u16, RemoteClient*> m_clients; + // User authentication + AuthManager m_authmanager; + + /* + Threads + */ + + // A buffer for time steps + // step() increments and AsyncRunStep() run by m_thread reads it. float m_step_dtime; JMutex m_step_dtime_mutex; + // The server mainly operates in this thread ServerThread m_thread; + // This thread fetches and generates map EmergeThread m_emergethread; - + // Queue of block coordinates to be processed by the emerge thread BlockEmergeQueue m_emerge_queue; - // Nodes that are destinations of flowing liquid at the moment - //core::map<v3s16, u8> m_flow_active_nodes; + /* + Time related stuff + */ // 0-23999 - MutexedVariable<u32> m_time_of_day; + //MutexedVariable<u32> m_time_of_day; // Used to buffer dtime for adding to m_time_of_day float m_time_counter; + // Timer for sending time of day over network float m_time_of_day_send_timer; - + // Uptime of server in seconds MutexedVariable<double> m_uptime; + /* + Peer change queue. + Queues stuff from peerAdded() and deletingPeer() to + handlePeerChanges() + */ enum PeerChangeType { PEER_ADDED, PEER_REMOVED }; - struct PeerChange { PeerChangeType type; u16 peer_id; bool timeout; }; - Queue<PeerChange> m_peer_change_queue; + /* + Random stuff + */ + + // Map directory std::string m_mapsavedir; - MutexedVariable<bool> m_shutdown_requested; + bool m_shutdown_requested; /* + Map edit event queue. Automatically receives all map edits. + The constructor of this class registers us to receive them through + onMapEditEvent + + NOTE: Should these be moved to actually be members of + ServerEnvironment? + */ + + /* Queue of map edits from the environment for sending to the clients This is behind m_env_mutex */ @@ -505,6 +638,8 @@ private: */ u16 m_ignore_map_edit_events_peer_id; + Profiler *m_profiler; + friend class EmergeThread; friend class RemoteClient; }; |