diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-27 17:14:20 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-06-27 17:14:20 +0200 |
| commit | bc421842c6a052cbc74d3cc28d5edb263780350f (patch) | |
| tree | fa41dab729e3fe0cd69c219d3ae130ee686c95c6 /source/Server.h | |
| parent | Added a warning when spawning an entity in a non-existent chunk (diff) | |
| download | cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.gz cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.bz2 cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.lz cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.xz cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.zst cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/Server.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/source/Server.h b/source/Server.h index dfda56c62..3f7a24699 100644 --- a/source/Server.h +++ b/source/Server.h @@ -8,13 +8,12 @@ #pragma once -#ifndef CSERVER_H_INCLUDED -#define CSERVER_H_INCLUDED #include "OSSupport/SocketThreads.h" #include "OSSupport/ListenThread.h" #include "CryptoPP/rsa.h" #include "CryptoPP/randpool.h" +#include "RCONServer.h" @@ -105,11 +104,11 @@ private: cNotifyWriteThread m_NotifyWriteThread; - cListenThread m_ListenThreadIPv4; // IPv4 - cListenThread m_ListenThreadIPv6; // IPv6 + cListenThread m_ListenThreadIPv4; + cListenThread m_ListenThreadIPv6; cCriticalSection m_CSClients; // Locks client list - cClientHandleList m_Clients; // Clients that are connected to the server + cClientHandleList m_Clients; // Clients that are connected to the server cSocketThreads m_SocketThreads; @@ -120,12 +119,14 @@ private: unsigned int m_Milliseconds; bool m_bIsConnected; // true - connected false - not connected - int m_iServerPort; bool m_bRestarting; - CryptoPP::RSA::PrivateKey m_PrivateKey; - CryptoPP::RSA::PublicKey m_PublicKey; + CryptoPP::RSA::PrivateKey m_PrivateKey; + CryptoPP::RSA::PublicKey m_PublicKey; + + cRCONServer m_RCONServer; + cServer(void); ~cServer(); @@ -140,9 +141,3 @@ private: - -#endif // CSERVER_H_INCLUDED - - - - |