flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Removed the unused cBlockingTCPLink class.

This commit is contained in:
madmaxoft 2014-04-30 17:06:31 +02:00
parent 014fab58e6
commit 58929a9948
3 changed files with 0 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/OSSupport/BlockingTCPLink.cpp
View File

@ -1,142 +0,0 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "BlockingTCPLink.h"
#include "Errors.h"
cBlockingTCPLink::cBlockingTCPLink(void)
{
}
cBlockingTCPLink::~cBlockingTCPLink()
{
CloseSocket();
}
void cBlockingTCPLink::CloseSocket()
{
if (!m_Socket.IsValid())
{
m_Socket.CloseSocket();
}
}
bool cBlockingTCPLink::Connect(const char * iAddress, unsigned int iPort)
{
ASSERT(!m_Socket.IsValid());
if (m_Socket.IsValid())
{
LOGWARN("WARNING: cTCPLink Connect() called while still connected.");
m_Socket.CloseSocket();
}
struct hostent *hp;
unsigned int addr;
struct sockaddr_in server;
m_Socket = socket(AF_INET, SOCK_STREAM, 0);
if (!m_Socket.IsValid())
{
LOGERROR("cTCPLink: Cannot create a socket");
return false;
}
addr = inet_addr(iAddress);
hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET);
if (hp == NULL)
{
//LOGWARN("cTCPLink: gethostbyaddr returned NULL");
hp = gethostbyname(iAddress);
if (hp == NULL)
{
LOGWARN("cTCPLink: Could not resolve %s", iAddress);
CloseSocket();
return false;
}
}
memcpy(&server.sin_addr.s_addr,hp->h_addr, hp->h_length);
server.sin_family = AF_INET;
server.sin_port = htons( (unsigned short)iPort);
if (connect(m_Socket, (struct sockaddr *)&server, sizeof(server)))
{
LOGWARN("cTCPLink: Connection to \"%s:%d\" failed (%s)", iAddress, iPort,GetOSErrorString( cSocket::GetLastError() ).c_str() );
CloseSocket();
return false;
}
return true;
}
int cBlockingTCPLink::Send(char * a_Data, unsigned int a_Size, int a_Flags /* = 0 */ )
{
UNUSED(a_Flags);
ASSERT(m_Socket.IsValid());
if (!m_Socket.IsValid())
{
LOGERROR("cBlockingTCPLink: Trying to send data without a valid connection!");
return -1;
}
return m_Socket.Send(a_Data, a_Size);
}
int cBlockingTCPLink::SendMessage( const char* a_Message, int a_Flags /* = 0 */ )
{
UNUSED(a_Flags);
ASSERT(m_Socket.IsValid());
if (!m_Socket.IsValid())
{
LOGWARN("cBlockingTCPLink: Trying to send message without a valid connection!");
return -1;
}
return m_Socket.Send(a_Message, strlen(a_Message));
}
void cBlockingTCPLink::ReceiveData(AString & oData)
{
ASSERT(m_Socket.IsValid());
if (!m_Socket.IsValid())
{
return;
}
int Received = 0;
char Buffer[256];
while ((Received = recv(m_Socket, Buffer, sizeof(Buffer), 0)) > 0)
{
oData.append(Buffer, Received);
}
}

28
src/OSSupport/BlockingTCPLink.h
View File

@ -1,28 +0,0 @@
#pragma once
#include "Socket.h"
class cBlockingTCPLink // tolua_export
{ // tolua_export
public: // tolua_export
cBlockingTCPLink(void); // tolua_export
~cBlockingTCPLink(); // tolua_export
bool Connect( const char* a_Address, unsigned int a_Port ); // tolua_export
int Send( char* a_Data, unsigned int a_Size, int a_Flags = 0 ); // tolua_export
int SendMessage( const char* a_Message, int a_Flags = 0 ); // tolua_export
void CloseSocket(); // tolua_export
void ReceiveData(AString & oData); // tolua_export
protected:
cSocket m_Socket;
}; // tolua_export

1
src/Protocol/Authenticator.cpp
View File

@ -2,7 +2,6 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Authenticator.h"
#include "../OSSupport/BlockingTCPLink.h"
#include "../Root.h"
#include "../Server.h"
#include "../ClientHandle.h"