Log unhandled exceptions in connectionthreads to errorstream

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 21e9c811cf0460027301c731cc140b855aca80f5..cb0baceced8fd1358980192a9d8ae9b9cd2653e7 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -122,8 +122,8 @@ struct MediaInfo
        std::string path;
        std::string sha1_digest;
 
-       MediaInfo(const std::string path_="",
-                       const std::string sha1_digest_=""):
+       MediaInfo(const std::string &path_="",
+                 const std::string &sha1_digest_=""):
                path(path_),
                sha1_digest(sha1_digest_)
        {
@@ -174,10 +174,11 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        Server(
                const std::string &path_world,
                const SubgameSpec &gamespec,
-               bool simple_singleplayer_mode
+               bool simple_singleplayer_mode,
+               bool ipv6
        );
        ~Server();
-       void start(unsigned short port);
+       void start(Address bind_addr);
        void stop();
        // This is mainly a way to pass the time to the server.
        // Actual processing is done in an another thread.
@@ -185,6 +186,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // This is run by ServerThread and does the actual processing
        void AsyncRunStep(bool initial_step=false);
        void Receive();
+       PlayerSAO* StageTwoClientInit(u16 peer_id);
        void ProcessData(u8 *data, u32 datasize, u16 peer_id);
 
        // Environment must be locked when called
@@ -229,8 +231,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void unsetIpBanned(const std::string &ip_or_name);
        std::string getBanDescription(const std::string &ip_or_name);
 
-       void notifyPlayer(const char *name, const std::wstring msg, const bool prepend);
-       void notifyPlayers(const std::wstring msg);
+       void notifyPlayer(const char *name, const std::wstring &msg);
+       void notifyPlayers(const std::wstring &msg);
        void spawnParticle(const char *playername,
                v3f pos, v3f velocity, v3f acceleration,
                float expirationtime, float size,
@@ -320,6 +322,9 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        inline Address getPeerAddress(u16 peer_id)
                        { return m_con.GetPeerAddress(peer_id); }
                        
+       bool setLocalPlayerAnimations(Player *player, v2s32 animation_frames[4], f32 frame_speed);
+       bool setPlayerEyeOffset(Player *player, v3f first, v3f third);
+
        bool setSky(Player *player, const video::SColor &bgcolor,
                        const std::string &type, const std::vector<std::string> &params);
        
@@ -330,6 +335,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
 
+       void DenyAccess(u16 peer_id, const std::wstring &reason);
+       bool getClientConInfo(u16 peer_id, con::rtt_stat_type type,float* retval);
+       bool getClientInfo(u16 peer_id,ClientState* state, u32* uptime,
+                       u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
+                       std::string* vers_string);
+
 private:
 
        friend class EmergeThread;
@@ -353,9 +364,11 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void SendPlayerHP(u16 peer_id);
        void SendPlayerBreath(u16 peer_id);
        void SendMovePlayer(u16 peer_id);
+       void SendLocalPlayerAnimations(u16 peer_id, v2s32 animation_frames[4], f32 animation_speed);
+       void SendEyeOffset(u16 peer_id, v3f first, v3f third);
        void SendPlayerPrivileges(u16 peer_id);
        void SendPlayerInventoryFormspec(u16 peer_id);
-       void SendShowFormspecMessage(u16 peer_id, const std::string formspec, const std::string formname);
+       void SendShowFormspecMessage(u16 peer_id, const std::string &formspec, const std::string &formname);
        void SendHUDAdd(u16 peer_id, u32 id, HudElement *form);
        void SendHUDRemove(u16 peer_id, u32 id);
        void SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value);
@@ -415,13 +428,12 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        void DiePlayer(u16 peer_id);
        void RespawnPlayer(u16 peer_id);
-       void DenyAccess(u16 peer_id, const std::wstring &reason);
        void DeleteClient(u16 peer_id, ClientDeletionReason reason);
        void UpdateCrafting(u16 peer_id);
 
        // When called, connection mutex should be locked
-       RemoteClient* getClient(u16 peer_id,ClientState state_min=Active);
-       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=Active);
+       RemoteClient* getClient(u16 peer_id,ClientState state_min=CS_Active);
+       RemoteClient* getClientNoEx(u16 peer_id,ClientState state_min=CS_Active);
 
        // When called, environment mutex should be locked
        std::string getPlayerName(u16 peer_id);