From ae96ca635c9e5c22452acc0c1a473f339706fec3 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 23 Dec 2008 09:47:42 +0000 Subject: (svn r14721) -Codechange: s/NetworkTCPSocketHandler/NetworkClientSocket/ as it's (way) more descriptive what it's used for. --- src/network/core/tcp.cpp | 14 +++++++------- src/network/core/tcp.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/network/core') diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp index f6cef8728..5ce7d4831 100644 --- a/src/network/core/tcp.cpp +++ b/src/network/core/tcp.cpp @@ -18,7 +18,7 @@ #include "table/strings.h" /** Very ugly temporary hack !!! */ -void NetworkTCPSocketHandler::Initialize() +void NetworkClientSocket::Initialize() { this->sock = INVALID_SOCKET; @@ -37,7 +37,7 @@ void NetworkTCPSocketHandler::Initialize() this->command_queue = NULL; } -void NetworkTCPSocketHandler::Destroy() +void NetworkClientSocket::Destroy() { closesocket(this->sock); this->writable = false; @@ -67,7 +67,7 @@ void NetworkTCPSocketHandler::Destroy() * @return the new status * TODO: needs to be splitted when using client and server socket packets */ -NetworkRecvStatus NetworkTCPSocketHandler::CloseConnection() +NetworkRecvStatus NetworkClientSocket::CloseConnection() { NetworkCloseClient(this); @@ -90,7 +90,7 @@ NetworkRecvStatus NetworkTCPSocketHandler::CloseConnection() * if the OS-network-buffer is full) * @param packet the packet to send */ -void NetworkTCPSocketHandler::Send_Packet(Packet *packet) +void NetworkClientSocket::Send_Packet(Packet *packet) { Packet *p; assert(packet != NULL); @@ -116,7 +116,7 @@ void NetworkTCPSocketHandler::Send_Packet(Packet *packet) * data right now (full network-buffer, it happens ;)) * 3) sending took too long */ -bool NetworkTCPSocketHandler::Send_Packets() +bool NetworkClientSocket::Send_Packets() { ssize_t res; Packet *p; @@ -165,7 +165,7 @@ bool NetworkTCPSocketHandler::Send_Packets() * @param status the variable to store the status into * @return the received packet (or NULL when it didn't receive one) */ -Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status) +Packet *NetworkClientSocket::Recv_Packet(NetworkRecvStatus *status) { ssize_t res; Packet *p; @@ -244,7 +244,7 @@ Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status) return p; } -bool NetworkTCPSocketHandler::IsPacketQueueEmpty() +bool NetworkClientSocket::IsPacketQueueEmpty() { return this->packet_queue == NULL; } diff --git a/src/network/core/tcp.h b/src/network/core/tcp.h index f956aa105..716d219af 100644 --- a/src/network/core/tcp.h +++ b/src/network/core/tcp.h @@ -85,7 +85,7 @@ enum ClientStatus { }; /** Base socket handler for all TCP sockets */ -class NetworkTCPSocketHandler : public NetworkSocketHandler { +class NetworkClientSocket : public NetworkSocketHandler { /* TODO: rewrite into a proper class */ private: Packet *packet_queue; ///< Packets that are awaiting delivery @@ -114,7 +114,7 @@ public: inline NetworkClientInfo *GetInfo() const { extern NetworkClientInfo _network_client_info[MAX_CLIENT_INFO]; - extern NetworkTCPSocketHandler _clients[MAX_CLIENTS]; + extern NetworkClientSocket _clients[MAX_CLIENTS]; return &_network_client_info[this - _clients]; } }; -- cgit v1.2.3-54-g00ecf