actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix indentation.

Browse Source
This commit is contained in:
Steve Checkoway
2004-08-14 05:59:26 +00:00
parent 9946dcd335
commit 31e646cd30
1 changed files with 237 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ezsockets.cpp
+237 -237
View File
@@ -13,207 +13,207 @@
#if defined(_XBOX) #if defined(_XBOX)
#elif defined(_WINDOWS) // We need the WinSock32 Library on Windows #elif defined(_WINDOWS) // We need the WinSock32 Library on Windows
#pragma comment(lib,"wsock32.lib") #pragma comment(lib,"wsock32.lib")
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
EzSockets::EzSockets() EzSockets::EzSockets()
{ {
MAXCON = 5; MAXCON = 5;
memset (&addr,0,sizeof(addr)); //Clear the sockaddr_in structure memset (&addr,0,sizeof(addr)); //Clear the sockaddr_in structure
#if defined(_WINDOWS) || defined(_XBOX) // Windows REQUIRES WinSock Startup #if defined(_WINDOWS) || defined(_XBOX) // Windows REQUIRES WinSock Startup
WSAStartup( MAKEWORD(1,1), &wsda ); WSAStartup( MAKEWORD(1,1), &wsda );
#endif #endif
sock = -1; sock = -1;
blocking = true; blocking = true;
scks = new fd_set; scks = new fd_set;
times = new timeval; times = new timeval;
times->tv_sec = 0; times->tv_sec = 0;
times->tv_usec = 0; times->tv_usec = 0;
state = skDISCONNECTED; state = skDISCONNECTED;
} }
EzSockets::~EzSockets() EzSockets::~EzSockets()
{ {
close(); close();
delete scks; delete scks;
delete times; delete times;
} }
//Check to see if the socket has been created //Check to see if the socket has been created
bool EzSockets::check() bool EzSockets::check()
{ {
return sock > 0; return sock > 0;
} }
bool EzSockets::create() bool EzSockets::create()
{ {
return create(IPPROTO_TCP, SOCK_STREAM); return create(IPPROTO_TCP, SOCK_STREAM);
} }
bool EzSockets::create(int Protocol) bool EzSockets::create(int Protocol)
{ {
switch(Protocol) switch(Protocol)
{ {
case IPPROTO_TCP: case IPPROTO_TCP:
return create(IPPROTO_TCP, SOCK_STREAM); return create(IPPROTO_TCP, SOCK_STREAM);
case IPPROTO_UDP: case IPPROTO_UDP:
return create(IPPROTO_UDP, SOCK_DGRAM); return create(IPPROTO_UDP, SOCK_DGRAM);
default: default:
//XBOX does not support the raw socket. //XBOX does not support the raw socket.
//So, since there's no need, we aren't //So, since there's no need, we aren't
//going to allow it on XBOX //going to allow it on XBOX
#if defined(_XBOX) #if defined(_XBOX)
return false; return false;
#else #else
return create(Protocol, SOCK_RAW); return create(Protocol, SOCK_RAW);
#endif #endif
} }
} }
bool EzSockets::create(int Protocol, int Type) bool EzSockets::create(int Protocol, int Type)
{ {
state = skDISCONNECTED; state = skDISCONNECTED;
sock = socket(AF_INET, Type, Protocol); sock = socket(AF_INET, Type, Protocol);
return sock > 0; return sock > 0;
} }
bool EzSockets::bind(unsigned short port) bool EzSockets::bind(unsigned short port)
{ {
if(!check()) if(!check())
return false; return false;
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin_addr.s_addr = htonl(INADDR_ANY);
addr.sin_port = htons(port); addr.sin_port = htons(port);
return !::bind(sock,(struct sockaddr*)&addr, sizeof(addr)); return !::bind(sock,(struct sockaddr*)&addr, sizeof(addr));
} }
bool EzSockets::listen() bool EzSockets::listen()
{ {
if (::listen(sock, MAXCON)) if (::listen(sock, MAXCON))
return false; return false;
state = skLISTENING; state = skLISTENING;
return true; return true;
} }
#if defined(WIN32) || defined(DARWIN)// glibc already has socklen_t defined #if defined(WIN32) || defined(DARWIN)// glibc already has socklen_t defined
typedef int socklen_t; typedef int socklen_t;
#endif #endif
bool EzSockets::accept(EzSockets& socket) bool EzSockets::accept(EzSockets& socket)
{ {
if (!blocking && !CanRead()) if (!blocking && !CanRead())
return false; return false;
int length = sizeof(socket); int length = sizeof(socket);
socket.sock = ::accept(sock,(struct sockaddr*) &socket.addr, socket.sock = ::accept(sock,(struct sockaddr*) &socket.addr,
(socklen_t*) &length); (socklen_t*) &length);
if(socket.sock<=0) if (socket.sock <= 0)
return false; return false;
socket.state = skCONNECTED; socket.state = skCONNECTED;
return true; return true;
} }
void EzSockets::close() void EzSockets::close()
{ {
state = skDISCONNECTED; state = skDISCONNECTED;
inBuffer = ""; inBuffer = "";
outBuffer = ""; outBuffer = "";
#if defined(WIN32) // The close socket command is different in Windows #if defined(WIN32) // The close socket command is different in Windows
::closesocket(sock); ::closesocket(sock);
#else #else
::close(sock); ::close(sock);
#endif #endif
} }
long EzSockets::uAddr() long EzSockets::uAddr()
{ {
return addr.sin_addr.s_addr; return addr.sin_addr.s_addr;
} }
bool EzSockets::connect(const std::string& host,unsigned short port) bool EzSockets::connect(const std::string& host,unsigned short port)
{ {
if(!check()) if(!check())
return false; return false;
#if defined(_XBOX) #if defined(_XBOX)
// FIXME: Xbox doesn't have gethostbyname or any way to get a hostent. // FIXME: Xbox doesn't have gethostbyname or any way to get a hostent.
// Investigate the samples and figure out how this is supposed to work. // Investigate the samples and figure out how this is supposed to work.
return false; return false;
#elif defined(_WINDOWS) #elif defined(_WINDOWS)
struct hostent* phe; struct hostent* phe;
phe = gethostbyname(host.c_str()); phe = gethostbyname(host.c_str());
addr.sin_addr = *((LPIN_ADDR)* phe->h_addr_list); addr.sin_addr = *((LPIN_ADDR)* phe->h_addr_list);
#else #else
inet_pton(AF_INET,host.c_str(), &addr.sin_addr); inet_pton(AF_INET,host.c_str(), &addr.sin_addr);
#endif #endif
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(port); addr.sin_port = htons(port);
if(::connect(sock, (struct sockaddr*)&addr, sizeof(addr))) if(::connect(sock, (struct sockaddr*)&addr, sizeof(addr)))
return false; return false;
state = skCONNECTED; state = skCONNECTED;
return true; return true;
} }
bool EzSockets::CanRead() bool EzSockets::CanRead()
{ {
FD_ZERO(scks); FD_ZERO(scks);
FD_SET((unsigned)sock, scks); FD_SET((unsigned)sock, scks);
return select(sock+1,scks,NULL,NULL,times) > 0; return select(sock+1,scks,NULL,NULL,times) > 0;
} }
bool EzSockets::IsError() { bool EzSockets::IsError() {
if (state == skERROR) if (state == skERROR)
return true;
FD_ZERO(scks);
FD_SET((unsigned)sock, scks);
if (select(sock+1, NULL, NULL, scks, times) >=0 )
return false;
state = skERROR;
return true; return true;
FD_ZERO(scks);
FD_SET((unsigned)sock, scks);
if (select(sock+1, NULL, NULL, scks, times) >=0 )
return false;
state = skERROR;
return true;
} }
bool EzSockets::CanWrite() bool EzSockets::CanWrite()
{ {
FD_ZERO(scks); FD_ZERO(scks);
FD_SET((unsigned)sock, scks); FD_SET((unsigned)sock, scks);
return select(sock+1, NULL, scks, NULL, times) > 0; return select(sock+1, NULL, scks, NULL, times) > 0;
} }
void EzSockets::update() void EzSockets::update()
{ {
if (IsError()) //If socket is in error, don't bother. if (IsError()) //If socket is in error, don't bother.
return; return;
while (CanRead() && !IsError()) //Check for Reading while (CanRead() && !IsError()) //Check for Reading
if (pUpdateRead() < 1) if (pUpdateRead() < 1)
break; break;
if (CanWrite() && (outBuffer.length()>0)) if (CanWrite() && (outBuffer.length()>0))
pUpdateWrite(); pUpdateWrite();
} }
@@ -222,47 +222,47 @@ void EzSockets::update()
\*********************/ \*********************/
void EzSockets::SendData(const string& outData) void EzSockets::SendData(const string& outData)
{ {
outBuffer.append(outData); outBuffer.append(outData);
if(blocking) if(blocking)
while ((outBuffer.length()>0) && !IsError()) while ((outBuffer.length()>0) && !IsError())
pUpdateWrite(); pUpdateWrite();
else else
update(); update();
} }
void EzSockets::SendData(const char *data, unsigned int bytes) void EzSockets::SendData(const char *data, unsigned int bytes)
{ {
outBuffer.append(data, bytes); outBuffer.append(data, bytes);
if(blocking) if(blocking)
while ((outBuffer.length()>0) && !IsError()) while ((outBuffer.length()>0) && !IsError())
pUpdateWrite(); pUpdateWrite();
else else
update(); update();
} }
int EzSockets::ReadData(char *data, unsigned int bytes) int EzSockets::ReadData(char *data, unsigned int bytes)
{ {
int bytesRead = PeekData(data,bytes); int bytesRead = PeekData(data,bytes);
inBuffer = inBuffer.substr(bytesRead); inBuffer = inBuffer.substr(bytesRead);
return bytesRead; return bytesRead;
} }
int EzSockets::PeekData(char *data, unsigned int bytes) int EzSockets::PeekData(char *data, unsigned int bytes)
{ {
if(blocking) if (blocking)
while ((inBuffer.length()<bytes) && !IsError()) while ((inBuffer.length()<bytes) && !IsError())
pUpdateRead(); pUpdateRead();
else else
while (CanRead() && !IsError()) while (CanRead() && !IsError())
if (pUpdateRead()<1) if (pUpdateRead()<1)
break; break;
int bytesRead = bytes; int bytesRead = bytes;
if (inBuffer.length()<bytes) if (inBuffer.length()<bytes)
bytesRead = inBuffer.length(); bytesRead = inBuffer.length();
memcpy(data,inBuffer.c_str(), bytesRead); memcpy(data,inBuffer.c_str(), bytesRead);
return bytesRead; return bytesRead;
} }
@@ -271,59 +271,59 @@ int EzSockets::PeekData(char *data, unsigned int bytes)
\**********************************/ \**********************************/
void EzSockets::SendPack(const char *data, unsigned int bytes) void EzSockets::SendPack(const char *data, unsigned int bytes)
{ {
unsigned int SendSize = htonl(bytes); unsigned int SendSize = htonl(bytes);
SendData((const char *)&SendSize, sizeof(int)); SendData((const char *)&SendSize, sizeof(int));
SendData(data, bytes); SendData(data, bytes);
} }
int EzSockets::ReadPack(char *data, unsigned int max) int EzSockets::ReadPack(char *data, unsigned int max)
{ {
int size = PeekPack(data, max); int size = PeekPack(data, max);
if (size != -1) if (size != -1)
inBuffer = inBuffer.substr(size+4); inBuffer = inBuffer.substr(size+4);
return size; return size;
} }
int EzSockets::PeekPack(char *data, unsigned int max) int EzSockets::PeekPack(char *data, unsigned int max)
{ {
if (CanRead()) if (CanRead())
pUpdateRead(); pUpdateRead();
if (blocking) if (blocking)
{ {
while ((inBuffer.length()<4) && !IsError()) while ((inBuffer.length()<4) && !IsError())
pUpdateRead(); pUpdateRead();
if (IsError())
return -1;
}
if (inBuffer.length()<4)
return -1;
unsigned int size;
PeekData((char*)&size, 4);
size = ntohl(size);
if (blocking)
while (inBuffer.length()<(size+4) && !IsError())
pUpdateRead();
else
if (inBuffer.length()<(size+4) || inBuffer.length()<=4)
return -1;
if (IsError()) if (IsError())
return -1; return -1;
}
if (inBuffer.length()<4)
return -1;
unsigned int size;
PeekData((char*)&size, 4);
size = ntohl(size);
if (blocking)
while (inBuffer.length()<(size+4) && !IsError())
pUpdateRead();
else
if (inBuffer.length()<(size+4) || inBuffer.length()<=4)
return -1;
if (IsError())
return -1;
//What if we get disconnected while waiting for data? //What if we get disconnected while waiting for data?
string tBuff(inBuffer.substr(4, size)); string tBuff(inBuffer.substr(4, size));
if (tBuff.length() > max) if (tBuff.length() > max)
tBuff.substr(0, max); tBuff.substr(0, max);
memcpy (data, tBuff.c_str(),tBuff.length()); memcpy (data, tBuff.c_str(),tBuff.length());
return size; return size;
} }
@@ -332,36 +332,36 @@ int EzSockets::PeekPack(char *data, unsigned int max)
\*****************************************/ \*****************************************/
void EzSockets::SendStr(const string& data, char delim) void EzSockets::SendStr(const string& data, char delim)
{ {
char tDr[1]; char tDr[1];
tDr[0] = delim; tDr[0] = delim;
SendData(data.c_str(), data.length()); SendData(data.c_str(), data.length());
SendData(tDr, 1); SendData(tDr, 1);
} }
int EzSockets::ReadStr(string& data, char delim) int EzSockets::ReadStr(string& data, char delim)
{ {
int t = PeekStr(data, delim); int t = PeekStr(data, delim);
if (t >= 0) if (t >= 0)
inBuffer = inBuffer.substr(t+1); inBuffer = inBuffer.substr(t+1);
return t; return t;
} }
int EzSockets::PeekStr(string& data, char delim) int EzSockets::PeekStr(string& data, char delim)
{ {
int t = inBuffer.find(delim,0); int t = inBuffer.find(delim,0);
if (blocking) if (blocking)
{
while (t == -1 && !IsError())
{ {
pUpdateRead(); while (t == -1 && !IsError())
t = inBuffer.find(delim, 0); {
pUpdateRead();
t = inBuffer.find(delim, 0);
}
data = inBuffer.substr(0, t);
} }
data = inBuffer.substr(0, t);
} if(t >= 0)
data = inBuffer.substr(0, t);
if(t >= 0) return t;
data = inBuffer.substr(0, t);
return t;
} }
@@ -370,18 +370,18 @@ int EzSockets::PeekStr(string& data, char delim)
\************************/ \************************/
istream& operator>>(istream &is, EzSockets& obj) istream& operator>>(istream &is, EzSockets& obj)
{ {
string writeString; string writeString;
obj.SendStr(writeString); obj.SendStr(writeString);
is >> writeString; is >> writeString;
return is; return is;
} }
ostream& operator<<(ostream &os, EzSockets &obj) ostream& operator<<(ostream &os, EzSockets &obj)
{ {
string readString; string readString;
obj.ReadStr(readString); obj.ReadStr(readString);
os << readString; os << readString;
return os; return os;
} }
@@ -390,44 +390,44 @@ ostream& operator<<(ostream &os, EzSockets &obj)
\**************************/ \**************************/
int EzSockets::pUpdateRead() int EzSockets::pUpdateRead()
{ {
char tempData[1024]; char tempData[1024];
int bytes = pReadData(tempData); int bytes = pReadData(tempData);
if (bytes > 0) if (bytes > 0)
inBuffer.append(tempData, bytes); inBuffer.append(tempData, bytes);
else if (bytes <= 0) else if (bytes <= 0)
/* To get her I think CanRead was called at least once. /* To get her I think CanRead was called at least once.
So if length equals 0 and can read says there is data than So if length equals 0 and can read says there is data than
the socket was closed.*/ the socket was closed.*/
state = skERROR; state = skERROR;
return bytes; return bytes;
} }
int EzSockets::pUpdateWrite() int EzSockets::pUpdateWrite()
{ {
int bytes = pWriteData(outBuffer.c_str(), outBuffer.length()); int bytes = pWriteData(outBuffer.c_str(), outBuffer.length());
if (bytes > 0) if (bytes > 0)
outBuffer = outBuffer.substr(bytes); outBuffer = outBuffer.substr(bytes);
else if (bytes < 0) else if (bytes < 0)
state = skERROR; state = skERROR;
return bytes; return bytes;
} }
int EzSockets::pReadData(char* data) int EzSockets::pReadData(char* data)
{ {
if(state == skCONNECTED || state == skLISTENING) if(state == skCONNECTED || state == skLISTENING)
return recv(sock, data, 1024, 0); return recv(sock, data, 1024, 0);
fromAddr_len = sizeof(sockaddr_in); fromAddr_len = sizeof(sockaddr_in);
return recvfrom(sock, data, 1024, 0, (sockaddr*)&fromAddr, return recvfrom(sock, data, 1024, 0, (sockaddr*)&fromAddr,
(socklen_t*)&fromAddr_len); (socklen_t*)&fromAddr_len);
} }
int EzSockets::pWriteData(const char* data, int dataSize) int EzSockets::pWriteData(const char* data, int dataSize)
{ {
return send(sock, data, dataSize, 0); return send(sock, data, dataSize, 0);
} }
/* /*