mirror of https://github.com/OpenTTD/OpenTTD
Codechange: Use override keyword in networking classes.
parent
b1fb3f4fb8
commit
07de9d6c3f
|
@ -40,7 +40,7 @@ public:
|
||||||
*/
|
*/
|
||||||
bool IsConnected() const { return this->sock != INVALID_SOCKET; }
|
bool IsConnected() const { return this->sock != INVALID_SOCKET; }
|
||||||
|
|
||||||
virtual NetworkRecvStatus CloseConnection(bool error = true);
|
NetworkRecvStatus CloseConnection(bool error = true) override;
|
||||||
virtual void SendPacket(Packet *packet);
|
virtual void SendPacket(Packet *packet);
|
||||||
SendPacketsState SendPackets(bool closing_down = false);
|
SendPacketsState SendPackets(bool closing_down = false);
|
||||||
|
|
||||||
|
|
|
@ -481,7 +481,7 @@ protected:
|
||||||
|
|
||||||
NetworkRecvStatus HandlePacket(Packet *p);
|
NetworkRecvStatus HandlePacket(Packet *p);
|
||||||
public:
|
public:
|
||||||
NetworkRecvStatus CloseConnection(bool error = true);
|
NetworkRecvStatus CloseConnection(bool error = true) override;
|
||||||
|
|
||||||
NetworkAdminSocketHandler(SOCKET s);
|
NetworkAdminSocketHandler(SOCKET s);
|
||||||
~NetworkAdminSocketHandler();
|
~NetworkAdminSocketHandler();
|
||||||
|
|
|
@ -98,7 +98,7 @@ struct ContentInfo {
|
||||||
class NetworkContentSocketHandler : public NetworkTCPSocketHandler {
|
class NetworkContentSocketHandler : public NetworkTCPSocketHandler {
|
||||||
protected:
|
protected:
|
||||||
NetworkAddress client_addr; ///< The address we're connected to.
|
NetworkAddress client_addr; ///< The address we're connected to.
|
||||||
virtual void Close();
|
void Close() override;
|
||||||
|
|
||||||
bool ReceiveInvalidPacket(PacketContentType type);
|
bool ReceiveInvalidPacket(PacketContentType type);
|
||||||
|
|
||||||
|
|
|
@ -522,7 +522,7 @@ public:
|
||||||
CommandQueue incoming_queue; ///< The command-queue awaiting handling
|
CommandQueue incoming_queue; ///< The command-queue awaiting handling
|
||||||
uint last_packet; ///< Time we received the last frame.
|
uint last_packet; ///< Time we received the last frame.
|
||||||
|
|
||||||
NetworkRecvStatus CloseConnection(bool error = true);
|
NetworkRecvStatus CloseConnection(bool error = true) override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close the network connection due to the given status.
|
* Close the network connection due to the given status.
|
||||||
|
|
|
@ -60,7 +60,7 @@ public:
|
||||||
return this->sock != INVALID_SOCKET;
|
return this->sock != INVALID_SOCKET;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual NetworkRecvStatus CloseConnection(bool error = true);
|
NetworkRecvStatus CloseConnection(bool error = true) override;
|
||||||
|
|
||||||
NetworkHTTPSocketHandler(SOCKET sock, HTTPCallback *callback,
|
NetworkHTTPSocketHandler(SOCKET sock, HTTPCallback *callback,
|
||||||
const char *host, const char *url, const char *data, int depth);
|
const char *host, const char *url, const char *data, int depth);
|
||||||
|
@ -106,13 +106,13 @@ public:
|
||||||
free(this->url);
|
free(this->url);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnFailure()
|
void OnFailure() override
|
||||||
{
|
{
|
||||||
this->callback->OnFailure();
|
this->callback->OnFailure();
|
||||||
free(this->data);
|
free(this->data);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnConnect(SOCKET s)
|
void OnConnect(SOCKET s) override
|
||||||
{
|
{
|
||||||
new NetworkHTTPSocketHandler(s, this->callback, this->address.GetHostname(), this->url, this->data, this->depth);
|
new NetworkHTTPSocketHandler(s, this->callback, this->address.GetHostname(), this->url, this->data, this->depth);
|
||||||
/* We've relinquished control of data now. */
|
/* We've relinquished control of data now. */
|
||||||
|
|
|
@ -52,7 +52,7 @@ protected:
|
||||||
/** The opened sockets. */
|
/** The opened sockets. */
|
||||||
SocketList sockets;
|
SocketList sockets;
|
||||||
|
|
||||||
NetworkRecvStatus CloseConnection(bool error = true);
|
NetworkRecvStatus CloseConnection(bool error = true) override;
|
||||||
|
|
||||||
void ReceiveInvalidPacket(PacketUDPType, NetworkAddress *client_addr);
|
void ReceiveInvalidPacket(PacketUDPType, NetworkAddress *client_addr);
|
||||||
|
|
||||||
|
@ -235,7 +235,7 @@ public:
|
||||||
virtual ~NetworkUDPSocketHandler() { this->Close(); }
|
virtual ~NetworkUDPSocketHandler() { this->Close(); }
|
||||||
|
|
||||||
bool Listen();
|
bool Listen();
|
||||||
void Close();
|
void Close() override;
|
||||||
|
|
||||||
void SendPacket(Packet *p, NetworkAddress *recv, bool all = false, bool broadcast = false);
|
void SendPacket(Packet *p, NetworkAddress *recv, bool all = false, bool broadcast = false);
|
||||||
void ReceivePackets();
|
void ReceivePackets();
|
||||||
|
|
|
@ -576,12 +576,12 @@ class TCPQueryConnecter : TCPConnecter {
|
||||||
public:
|
public:
|
||||||
TCPQueryConnecter(const NetworkAddress &address) : TCPConnecter(address) {}
|
TCPQueryConnecter(const NetworkAddress &address) : TCPConnecter(address) {}
|
||||||
|
|
||||||
virtual void OnFailure()
|
void OnFailure() override
|
||||||
{
|
{
|
||||||
NetworkDisconnect();
|
NetworkDisconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnConnect(SOCKET s)
|
void OnConnect(SOCKET s) override
|
||||||
{
|
{
|
||||||
_networking = true;
|
_networking = true;
|
||||||
new ClientNetworkGameSocketHandler(s);
|
new ClientNetworkGameSocketHandler(s);
|
||||||
|
@ -659,12 +659,12 @@ class TCPClientConnecter : TCPConnecter {
|
||||||
public:
|
public:
|
||||||
TCPClientConnecter(const NetworkAddress &address) : TCPConnecter(address) {}
|
TCPClientConnecter(const NetworkAddress &address) : TCPConnecter(address) {}
|
||||||
|
|
||||||
virtual void OnFailure()
|
void OnFailure() override
|
||||||
{
|
{
|
||||||
NetworkError(STR_NETWORK_ERROR_NOCONNECTION);
|
NetworkError(STR_NETWORK_ERROR_NOCONNECTION);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnConnect(SOCKET s)
|
void OnConnect(SOCKET s) override
|
||||||
{
|
{
|
||||||
_networking = true;
|
_networking = true;
|
||||||
new ClientNetworkGameSocketHandler(s);
|
new ClientNetworkGameSocketHandler(s);
|
||||||
|
|
|
@ -26,14 +26,14 @@ extern NetworkAdminSocketPool _networkadminsocket_pool;
|
||||||
/** Class for handling the server side of the game connection. */
|
/** Class for handling the server side of the game connection. */
|
||||||
class ServerNetworkAdminSocketHandler : public NetworkAdminSocketPool::PoolItem<&_networkadminsocket_pool>, public NetworkAdminSocketHandler, public TCPListenHandler<ServerNetworkAdminSocketHandler, ADMIN_PACKET_SERVER_FULL, ADMIN_PACKET_SERVER_BANNED> {
|
class ServerNetworkAdminSocketHandler : public NetworkAdminSocketPool::PoolItem<&_networkadminsocket_pool>, public NetworkAdminSocketHandler, public TCPListenHandler<ServerNetworkAdminSocketHandler, ADMIN_PACKET_SERVER_FULL, ADMIN_PACKET_SERVER_BANNED> {
|
||||||
protected:
|
protected:
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_JOIN(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_JOIN(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_QUIT(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_QUIT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_UPDATE_FREQUENCY(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_UPDATE_FREQUENCY(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_POLL(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_POLL(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_CHAT(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_CHAT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_RCON(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_RCON(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_GAMESCRIPT(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_GAMESCRIPT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_ADMIN_PING(Packet *p);
|
NetworkRecvStatus Receive_ADMIN_PING(Packet *p) override;
|
||||||
|
|
||||||
NetworkRecvStatus SendProtocol();
|
NetworkRecvStatus SendProtocol();
|
||||||
NetworkRecvStatus SendPong(uint32 d1);
|
NetworkRecvStatus SendPong(uint32 d1);
|
||||||
|
|
|
@ -42,33 +42,33 @@ protected:
|
||||||
friend void NetworkClose(bool close_admins);
|
friend void NetworkClose(bool close_admins);
|
||||||
static ClientNetworkGameSocketHandler *my_client; ///< This is us!
|
static ClientNetworkGameSocketHandler *my_client; ///< This is us!
|
||||||
|
|
||||||
virtual NetworkRecvStatus Receive_SERVER_FULL(Packet *p);
|
NetworkRecvStatus Receive_SERVER_FULL(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_BANNED(Packet *p);
|
NetworkRecvStatus Receive_SERVER_BANNED(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_ERROR(Packet *p);
|
NetworkRecvStatus Receive_SERVER_ERROR(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_COMPANY_INFO(Packet *p);
|
NetworkRecvStatus Receive_SERVER_COMPANY_INFO(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_CLIENT_INFO(Packet *p);
|
NetworkRecvStatus Receive_SERVER_CLIENT_INFO(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_NEED_GAME_PASSWORD(Packet *p);
|
NetworkRecvStatus Receive_SERVER_NEED_GAME_PASSWORD(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_NEED_COMPANY_PASSWORD(Packet *p);
|
NetworkRecvStatus Receive_SERVER_NEED_COMPANY_PASSWORD(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_WELCOME(Packet *p);
|
NetworkRecvStatus Receive_SERVER_WELCOME(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_WAIT(Packet *p);
|
NetworkRecvStatus Receive_SERVER_WAIT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_MAP_BEGIN(Packet *p);
|
NetworkRecvStatus Receive_SERVER_MAP_BEGIN(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_MAP_SIZE(Packet *p);
|
NetworkRecvStatus Receive_SERVER_MAP_SIZE(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_MAP_DATA(Packet *p);
|
NetworkRecvStatus Receive_SERVER_MAP_DATA(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_MAP_DONE(Packet *p);
|
NetworkRecvStatus Receive_SERVER_MAP_DONE(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_JOIN(Packet *p);
|
NetworkRecvStatus Receive_SERVER_JOIN(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_FRAME(Packet *p);
|
NetworkRecvStatus Receive_SERVER_FRAME(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_SYNC(Packet *p);
|
NetworkRecvStatus Receive_SERVER_SYNC(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_COMMAND(Packet *p);
|
NetworkRecvStatus Receive_SERVER_COMMAND(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_CHAT(Packet *p);
|
NetworkRecvStatus Receive_SERVER_CHAT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_QUIT(Packet *p);
|
NetworkRecvStatus Receive_SERVER_QUIT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_ERROR_QUIT(Packet *p);
|
NetworkRecvStatus Receive_SERVER_ERROR_QUIT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_SHUTDOWN(Packet *p);
|
NetworkRecvStatus Receive_SERVER_SHUTDOWN(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_NEWGAME(Packet *p);
|
NetworkRecvStatus Receive_SERVER_NEWGAME(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_RCON(Packet *p);
|
NetworkRecvStatus Receive_SERVER_RCON(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_CHECK_NEWGRFS(Packet *p);
|
NetworkRecvStatus Receive_SERVER_CHECK_NEWGRFS(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_MOVE(Packet *p);
|
NetworkRecvStatus Receive_SERVER_MOVE(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_COMPANY_UPDATE(Packet *p);
|
NetworkRecvStatus Receive_SERVER_COMPANY_UPDATE(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_SERVER_CONFIG_UPDATE(Packet *p);
|
NetworkRecvStatus Receive_SERVER_CONFIG_UPDATE(Packet *p) override;
|
||||||
|
|
||||||
static NetworkRecvStatus SendNewGRFsOk();
|
static NetworkRecvStatus SendNewGRFsOk();
|
||||||
static NetworkRecvStatus SendGetMap();
|
static NetworkRecvStatus SendGetMap();
|
||||||
|
@ -78,7 +78,7 @@ public:
|
||||||
ClientNetworkGameSocketHandler(SOCKET s);
|
ClientNetworkGameSocketHandler(SOCKET s);
|
||||||
~ClientNetworkGameSocketHandler();
|
~ClientNetworkGameSocketHandler();
|
||||||
|
|
||||||
NetworkRecvStatus CloseConnection(NetworkRecvStatus status);
|
NetworkRecvStatus CloseConnection(NetworkRecvStatus status) override;
|
||||||
void ClientError(NetworkRecvStatus res);
|
void ClientError(NetworkRecvStatus res);
|
||||||
|
|
||||||
static NetworkRecvStatus SendCompanyInformationQuery();
|
static NetworkRecvStatus SendCompanyInformationQuery();
|
||||||
|
|
|
@ -724,13 +724,13 @@ public:
|
||||||
*/
|
*/
|
||||||
NetworkContentConnecter(const NetworkAddress &address) : TCPConnecter(address) {}
|
NetworkContentConnecter(const NetworkAddress &address) : TCPConnecter(address) {}
|
||||||
|
|
||||||
virtual void OnFailure()
|
void OnFailure() override
|
||||||
{
|
{
|
||||||
_network_content_client.isConnecting = false;
|
_network_content_client.isConnecting = false;
|
||||||
_network_content_client.OnConnect(false);
|
_network_content_client.OnConnect(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnConnect(SOCKET s)
|
void OnConnect(SOCKET s) override
|
||||||
{
|
{
|
||||||
assert(_network_content_client.sock == INVALID_SOCKET);
|
assert(_network_content_client.sock == INVALID_SOCKET);
|
||||||
_network_content_client.isConnecting = false;
|
_network_content_client.isConnecting = false;
|
||||||
|
|
|
@ -80,20 +80,20 @@ protected:
|
||||||
|
|
||||||
friend class NetworkContentConnecter;
|
friend class NetworkContentConnecter;
|
||||||
|
|
||||||
virtual bool Receive_SERVER_INFO(Packet *p);
|
bool Receive_SERVER_INFO(Packet *p) override;
|
||||||
virtual bool Receive_SERVER_CONTENT(Packet *p);
|
bool Receive_SERVER_CONTENT(Packet *p) override;
|
||||||
|
|
||||||
ContentInfo *GetContent(ContentID cid);
|
ContentInfo *GetContent(ContentID cid);
|
||||||
void DownloadContentInfo(ContentID cid);
|
void DownloadContentInfo(ContentID cid);
|
||||||
|
|
||||||
void OnConnect(bool success);
|
void OnConnect(bool success) override;
|
||||||
void OnDisconnect();
|
void OnDisconnect() override;
|
||||||
void OnReceiveContentInfo(const ContentInfo *ci);
|
void OnReceiveContentInfo(const ContentInfo *ci) override;
|
||||||
void OnDownloadProgress(const ContentInfo *ci, int bytes);
|
void OnDownloadProgress(const ContentInfo *ci, int bytes) override;
|
||||||
void OnDownloadComplete(ContentID cid);
|
void OnDownloadComplete(ContentID cid) override;
|
||||||
|
|
||||||
void OnFailure();
|
void OnFailure() override;
|
||||||
void OnReceiveData(const char *data, size_t length);
|
void OnReceiveData(const char *data, size_t length) override;
|
||||||
|
|
||||||
bool BeforeDownload();
|
bool BeforeDownload();
|
||||||
void AfterDownload();
|
void AfterDownload();
|
||||||
|
@ -109,7 +109,7 @@ public:
|
||||||
|
|
||||||
void Connect();
|
void Connect();
|
||||||
void SendReceive();
|
void SendReceive();
|
||||||
void Close();
|
void Close() override;
|
||||||
|
|
||||||
void RequestContentList(ContentType type);
|
void RequestContentList(ContentType type);
|
||||||
void RequestContentList(uint count, const ContentID *content_ids);
|
void RequestContentList(uint count, const ContentID *content_ids);
|
||||||
|
|
|
@ -115,7 +115,7 @@ BaseNetworkContentDownloadStatusWindow::~BaseNetworkContentDownloadStatusWindow(
|
||||||
_network_content_client.RemoveCallback(this);
|
_network_content_client.RemoveCallback(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widget) const
|
void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widget) const
|
||||||
{
|
{
|
||||||
if (widget != WID_NCDS_BACKGROUND) return;
|
if (widget != WID_NCDS_BACKGROUND) return;
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ BaseNetworkContentDownloadStatusWindow::~BaseNetworkContentDownloadStatusWindow(
|
||||||
DrawStringMultiLine(r.left + 2, r.right - 2, y, y + FONT_HEIGHT_NORMAL * 2, str, TC_FROMSTRING, SA_CENTER);
|
DrawStringMultiLine(r.left + 2, r.right - 2, y, y + FONT_HEIGHT_NORMAL * 2, str, TC_FROMSTRING, SA_CENTER);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo *ci, int bytes)
|
void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo *ci, int bytes)
|
||||||
{
|
{
|
||||||
if (ci->id != this->cur_id) {
|
if (ci->id != this->cur_id) {
|
||||||
strecpy(this->name, ci->filename, lastof(this->name));
|
strecpy(this->name, ci->filename, lastof(this->name));
|
||||||
|
|
|
@ -26,22 +26,22 @@ extern NetworkClientSocketPool _networkclientsocket_pool;
|
||||||
/** Class for handling the server side of the game connection. */
|
/** Class for handling the server side of the game connection. */
|
||||||
class ServerNetworkGameSocketHandler : public NetworkClientSocketPool::PoolItem<&_networkclientsocket_pool>, public NetworkGameSocketHandler, public TCPListenHandler<ServerNetworkGameSocketHandler, PACKET_SERVER_FULL, PACKET_SERVER_BANNED> {
|
class ServerNetworkGameSocketHandler : public NetworkClientSocketPool::PoolItem<&_networkclientsocket_pool>, public NetworkGameSocketHandler, public TCPListenHandler<ServerNetworkGameSocketHandler, PACKET_SERVER_FULL, PACKET_SERVER_BANNED> {
|
||||||
protected:
|
protected:
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_JOIN(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_JOIN(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_COMPANY_INFO(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_COMPANY_INFO(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_GAME_PASSWORD(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_GAME_PASSWORD(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_COMPANY_PASSWORD(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_COMPANY_PASSWORD(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_GETMAP(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_GETMAP(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_MAP_OK(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_MAP_OK(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_ACK(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_ACK(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_COMMAND(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_COMMAND(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_CHAT(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_CHAT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_SET_PASSWORD(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_SET_PASSWORD(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_SET_NAME(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_SET_NAME(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_QUIT(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_QUIT(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_ERROR(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_ERROR(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_RCON(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_RCON(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_NEWGRFS_CHECKED(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_NEWGRFS_CHECKED(Packet *p) override;
|
||||||
virtual NetworkRecvStatus Receive_CLIENT_MOVE(Packet *p);
|
NetworkRecvStatus Receive_CLIENT_MOVE(Packet *p) override;
|
||||||
|
|
||||||
NetworkRecvStatus SendCompanyInfo();
|
NetworkRecvStatus SendCompanyInfo();
|
||||||
NetworkRecvStatus SendNewGRFCheck();
|
NetworkRecvStatus SendNewGRFCheck();
|
||||||
|
@ -79,8 +79,8 @@ public:
|
||||||
ServerNetworkGameSocketHandler(SOCKET s);
|
ServerNetworkGameSocketHandler(SOCKET s);
|
||||||
~ServerNetworkGameSocketHandler();
|
~ServerNetworkGameSocketHandler();
|
||||||
|
|
||||||
virtual Packet *ReceivePacket();
|
virtual Packet *ReceivePacket() override;
|
||||||
NetworkRecvStatus CloseConnection(NetworkRecvStatus status);
|
NetworkRecvStatus CloseConnection(NetworkRecvStatus status) override;
|
||||||
void GetClientName(char *client_name, const char *last) const;
|
void GetClientName(char *client_name, const char *last) const;
|
||||||
|
|
||||||
NetworkRecvStatus SendMap();
|
NetworkRecvStatus SendMap();
|
||||||
|
|
|
@ -117,8 +117,8 @@ void NetworkUDPQueryServer(NetworkAddress address, bool manually)
|
||||||
/** Helper class for connecting to the master server. */
|
/** Helper class for connecting to the master server. */
|
||||||
class MasterNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
class MasterNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
||||||
protected:
|
protected:
|
||||||
virtual void Receive_MASTER_ACK_REGISTER(Packet *p, NetworkAddress *client_addr);
|
void Receive_MASTER_ACK_REGISTER(Packet *p, NetworkAddress *client_addr) override;
|
||||||
virtual void Receive_MASTER_SESSION_KEY(Packet *p, NetworkAddress *client_addr);
|
void Receive_MASTER_SESSION_KEY(Packet *p, NetworkAddress *client_addr) override;
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* Create the socket.
|
* Create the socket.
|
||||||
|
@ -148,9 +148,9 @@ void MasterNetworkUDPSocketHandler::Receive_MASTER_SESSION_KEY(Packet *p, Networ
|
||||||
/** Helper class for handling all server side communication. */
|
/** Helper class for handling all server side communication. */
|
||||||
class ServerNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
class ServerNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
||||||
protected:
|
protected:
|
||||||
virtual void Receive_CLIENT_FIND_SERVER(Packet *p, NetworkAddress *client_addr);
|
void Receive_CLIENT_FIND_SERVER(Packet *p, NetworkAddress *client_addr) override;
|
||||||
virtual void Receive_CLIENT_DETAIL_INFO(Packet *p, NetworkAddress *client_addr);
|
void Receive_CLIENT_DETAIL_INFO(Packet *p, NetworkAddress *client_addr) override;
|
||||||
virtual void Receive_CLIENT_GET_NEWGRFS(Packet *p, NetworkAddress *client_addr);
|
void Receive_CLIENT_GET_NEWGRFS(Packet *p, NetworkAddress *client_addr) override;
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* Create the socket.
|
* Create the socket.
|
||||||
|
@ -324,10 +324,10 @@ void ServerNetworkUDPSocketHandler::Receive_CLIENT_GET_NEWGRFS(Packet *p, Networ
|
||||||
/** Helper class for handling all client side communication. */
|
/** Helper class for handling all client side communication. */
|
||||||
class ClientNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
class ClientNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
||||||
protected:
|
protected:
|
||||||
virtual void Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr);
|
void Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr) override;
|
||||||
virtual void Receive_MASTER_RESPONSE_LIST(Packet *p, NetworkAddress *client_addr);
|
void Receive_MASTER_RESPONSE_LIST(Packet *p, NetworkAddress *client_addr) override;
|
||||||
virtual void Receive_SERVER_NEWGRFS(Packet *p, NetworkAddress *client_addr);
|
void Receive_SERVER_NEWGRFS(Packet *p, NetworkAddress *client_addr) override;
|
||||||
virtual void HandleIncomingNetworkGameInfoGRFConfig(GRFConfig *config);
|
void HandleIncomingNetworkGameInfoGRFConfig(GRFConfig *config) override;
|
||||||
public:
|
public:
|
||||||
virtual ~ClientNetworkUDPSocketHandler() {}
|
virtual ~ClientNetworkUDPSocketHandler() {}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue