Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style formatting, some warning cleanup.

Browse Source
This commit is contained in:
wrenczes
2011-05-25 06:59:44 +00:00
parent 3152f69088
commit ffda1d0548
1 changed files with 206 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/src/pc/JSocket.cpp
+69 -59
View File
@@ -27,22 +27,17 @@ JSocket::JSocket(string ipAddr)
: state(NOT_AVAILABLE), : state(NOT_AVAILABLE),
mfd(-1) mfd(-1)
{ {
int result = -1; int result;
#ifdef WIN32
SOCKET Desc_Socket_Cliente;
#elif LINUX
int Desc_Socket_Cliente;
#endif
struct hostent *hostentptr; struct hostent *hostentptr;
#ifdef WIN32 #ifdef WIN32
SOCKADDR_IN Adresse_Socket_Server; SOCKADDR_IN Adresse_Socket_Server;
WORD wVersionRequested; WORD wVersionRequested;
WSADATA wsaData; WSADATA wsaData;
wVersionRequested=MAKEWORD(1,1); wVersionRequested=MAKEWORD(1, 1);
result = WSAStartup(wVersionRequested,&wsaData); result = WSAStartup(wVersionRequested,&wsaData);
if(result!=0){ if (result != 0)
{
DebugTrace("WSAStartup\t"); DebugTrace("WSAStartup\t");
return; return;
} }
@@ -50,37 +45,39 @@ JSocket::JSocket(string ipAddr)
struct sockaddr_in Adresse_Socket_Server; struct sockaddr_in Adresse_Socket_Server;
#endif #endif
mfd=socket(AF_INET,SOCK_STREAM,0); mfd = socket(AF_INET, SOCK_STREAM, 0);
if(mfd < 0) if(mfd < 0)
return; return;
DebugTrace("Connecting " << ipAddr); DebugTrace("Connecting " << ipAddr);
#ifdef WIN32 #ifdef WIN32
unsigned int addr_dest = inet_addr(ipAddr.c_str()); unsigned int addr_dest = inet_addr(ipAddr.c_str());
hostentptr=gethostbyaddr((char*) &addr_dest,4,AF_INET); hostentptr=gethostbyaddr((char*) &addr_dest, 4, AF_INET);
#elif LINUX #elif LINUX
hostentptr = gethostbyname(ipAddr.c_str()); hostentptr = gethostbyname(ipAddr.c_str());
#endif #endif
if (hostentptr == NULL) { if (hostentptr == NULL)
{
DebugTrace("ERROR, no such host\n"); DebugTrace("ERROR, no such host\n");
return; return;
} }
#ifdef WIN32 #ifdef WIN32
ZeroMemory( (char*)&Adresse_Socket_Server,sizeof(Adresse_Socket_Server)); ZeroMemory( (char*)&Adresse_Socket_Server, sizeof(Adresse_Socket_Server));
#elif LINUX #elif LINUX
bzero( (char*)&Adresse_Socket_Server,sizeof(Adresse_Socket_Server)); bzero( (char*)&Adresse_Socket_Server, sizeof(Adresse_Socket_Server));
#endif //WINDOWS #endif //WINDOWS
Adresse_Socket_Server.sin_family=(*hostentptr).h_addrtype; Adresse_Socket_Server.sin_family = (*hostentptr).h_addrtype;
Adresse_Socket_Server.sin_port=htons(SERVER_PORT); Adresse_Socket_Server.sin_port = htons(SERVER_PORT);
Adresse_Socket_Server.sin_addr=*((struct in_addr*)(*hostentptr).h_addr); Adresse_Socket_Server.sin_addr = *((struct in_addr*)(*hostentptr).h_addr);
result = connect( result = connect(
mfd, mfd,
(const struct sockaddr*)&Adresse_Socket_Server, (const struct sockaddr*)&Adresse_Socket_Server,
sizeof(Adresse_Socket_Server)); sizeof(Adresse_Socket_Server));
if (result != 0){ if (result != 0)
{
DebugTrace("client connect failed :" << strerror(errno)); DebugTrace("client connect failed :" << strerror(errno));
state = FATAL_ERROR; state = FATAL_ERROR;
return; return;
@@ -91,17 +88,17 @@ JSocket::JSocket(string ipAddr)
bool JSocket::SetNonBlocking(int sock) bool JSocket::SetNonBlocking(int sock)
{ {
int opts;
#ifdef WIN32 #ifdef WIN32
#elif LINUX #elif LINUX
opts = fcntl(sock,F_GETFL); int opts = fcntl(sock,F_GETFL);
if (opts < 0) { if (opts < 0)
{
perror("fcntl(F_GETFL)"); perror("fcntl(F_GETFL)");
return false; return false;
} }
opts = (opts | O_NONBLOCK); opts = (opts | O_NONBLOCK);
if (fcntl(sock,F_SETFL,opts) < 0) { if (fcntl(sock,F_SETFL,opts) < 0)
{
perror("fcntl(F_SETFL)"); perror("fcntl(F_SETFL)");
return false; return false;
} }
@@ -119,10 +116,11 @@ JSocket::JSocket()
WORD wVersionRequested; WORD wVersionRequested;
WSADATA wsaData; WSADATA wsaData;
wVersionRequested=MAKEWORD(1,1); wVersionRequested = MAKEWORD(1,1);
result=WSAStartup(wVersionRequested,&wsaData); result = WSAStartup(wVersionRequested,&wsaData);
if(result!=0){ if (result != 0)
{
DebugTrace("WSAStartup\t"); DebugTrace("WSAStartup\t");
return; return;
} }
@@ -149,20 +147,22 @@ JSocket::JSocket()
#elif LINUX #elif LINUX
bzero( &Adresse_Socket_Connection,sizeof(Adresse_Socket_Connection)); bzero( &Adresse_Socket_Connection,sizeof(Adresse_Socket_Connection));
#endif //WINDOWS #endif //WINDOWS
Adresse_Socket_Connection.sin_family=AF_INET; Adresse_Socket_Connection.sin_family = AF_INET;
Adresse_Socket_Connection.sin_port=htons(SERVER_PORT); Adresse_Socket_Connection.sin_port = htons(SERVER_PORT);
result=::bind(mfd, result = ::bind(mfd,
(struct sockaddr*)&Adresse_Socket_Connection, (struct sockaddr*)&Adresse_Socket_Connection,
sizeof(Adresse_Socket_Connection)); sizeof(Adresse_Socket_Connection));
if(result!=0){ if (result != 0)
{
state = FATAL_ERROR; state = FATAL_ERROR;
DebugTrace("bind error:" << strerror(errno)); DebugTrace("bind error:" << strerror(errno));
return; return;
} }
result=listen(mfd,1); result = listen(mfd,1);
if(result!=0){ if(result != 0)
{
state = FATAL_ERROR; state = FATAL_ERROR;
DebugTrace("listen error:" << strerror(errno)); DebugTrace("listen error:" << strerror(errno));
return; return;
@@ -177,7 +177,8 @@ JSocket::JSocket(int fd)
{ {
} }
JSocket::~JSocket(){ JSocket::~JSocket()
{
Disconnect(); Disconnect();
#ifdef WIN32 #ifdef WIN32
WSACleanup(); WSACleanup();
@@ -187,7 +188,8 @@ JSocket::~JSocket(){
void JSocket::Disconnect() void JSocket::Disconnect()
{ {
state = JSocket::DISCONNECTED; state = JSocket::DISCONNECTED;
if(mfd) { if(mfd)
{
#ifdef WIN32 #ifdef WIN32
closesocket(mfd); closesocket(mfd);
#elif LINUX #elif LINUX
@@ -199,61 +201,67 @@ void JSocket::Disconnect()
JSocket* JSocket::Accept() JSocket* JSocket::Accept()
{ {
#ifdef WIN32 #ifdef WIN32
SOCKADDR_IN Adresse_Socket_Cliente; SOCKADDR_IN Adresse_Socket_Cliente;
int Longueur_Adresse; int Longueur_Adresse;
#elif LINUX #elif LINUX
struct sockaddr_in Adresse_Socket_Cliente; struct sockaddr_in Adresse_Socket_Cliente;
socklen_t Longueur_Adresse; socklen_t Longueur_Adresse;
#endif //WINDOWS #endif //WINDOWS
while(mfd) { JSocket* socket = NULL;
while (mfd)
{
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
FD_SET(mfd, &set); FD_SET(mfd, &set);
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1000*100; tv.tv_usec = 1000 * 100;
int result = select(mfd+1, &set, NULL, NULL, &tv); int result = select(mfd+1, &set, NULL, NULL, &tv);
if( result > 0 && FD_ISSET(mfd, &set) ) { if (result > 0 && FD_ISSET(mfd, &set))
{
Longueur_Adresse = sizeof(Adresse_Socket_Cliente); Longueur_Adresse = sizeof(Adresse_Socket_Cliente);
int val=accept( int val = accept(
mfd, mfd,
(struct sockaddr*)&Adresse_Socket_Cliente, (struct sockaddr*)&Adresse_Socket_Cliente,
&Longueur_Adresse); &Longueur_Adresse);
DebugTrace("connection on client port "<< ntohs(Adresse_Socket_Cliente.sin_port)); DebugTrace("connection on client port "<< ntohs(Adresse_Socket_Cliente.sin_port));
if(val >=0 ) { if (val >= 0)
{
state = CONNECTED; state = CONNECTED;
return new JSocket(val); socket = new JSocket(val);
} else { }
return NULL; break;
}
} }
} }
return socket;
} }
int JSocket::Read(char* buff, int size) int JSocket::Read(char* buff, int size)
{ {
if(state == CONNECTED) if (state == CONNECTED)
{ {
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
FD_SET(mfd, &set); FD_SET(mfd, &set);
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1000*100; tv.tv_usec = 1000 * 100;
int result = select(mfd+1, &set, NULL, NULL, &tv); int result = select(mfd+1, &set, NULL, NULL, &tv);
if( result > 0 && FD_ISSET(mfd, &set) ) if (result > 0 && FD_ISSET(mfd, &set))
{ {
#ifdef WIN32 #ifdef WIN32
int readbytes = recv(mfd, buff, size,0); int readbytes = recv(mfd, buff, size, 0);
#elif LINUX #elif LINUX
int readbytes = read(mfd, buff, size); int readbytes = read(mfd, buff, size);
#endif //WINDOWS #endif //WINDOWS
if(readbytes < 0) if(readbytes < 0)
{ {
DebugTrace("Error reading from socket\n"); DebugTrace("Error reading from socket\n");
@@ -273,28 +281,30 @@ int JSocket::Read(char* buff, int size)
int JSocket::Write(char* buff, int size) int JSocket::Write(char* buff, int size)
{ {
int size1 = size; int size1 = size;
while (size > 0 && state == CONNECTED) { while (size > 0 && state == CONNECTED)
{
fd_set set; fd_set set;
FD_ZERO(&set); FD_ZERO(&set);
FD_SET(mfd, &set); FD_SET(mfd, &set);
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1000*100; tv.tv_usec = 1000 * 100;
int result = select(mfd+1, NULL, &set, NULL, &tv); int result = select(mfd+1, NULL, &set, NULL, &tv);
if( result > 0 && FD_ISSET(mfd, &set)) if( result > 0 && FD_ISSET(mfd, &set))
{ {
int len = send(mfd, buff, size, 0); int len = send(mfd, buff, size, 0);
if (len < 0) { if (len < 0)
{
return -1; return -1;
} }
size -= len; size -= len;
buff += len; buff += len;
} else if (result < 0) { }
else if (result < 0)
{
return -1; return -1;
} }
} }
return size1 - size; return size1 - size;
} }