style formatting, some warning cleanup.
This commit is contained in:
wrenczes
@@ -24,277 +24,287 @@ unsigned char ADRESSE_IP_SERVEUR [4] = {127,0,0,1};
|
||||
|
||||
|
||||
JSocket::JSocket(string ipAddr)
|
||||
: state(NOT_AVAILABLE),
|
||||
mfd(-1)
|
||||
: state(NOT_AVAILABLE),
|
||||
mfd(-1)
|
||||
{
|
||||
int result = -1;
|
||||
int result;
|
||||
struct hostent *hostentptr;
|
||||
#ifdef WIN32
|
||||
SOCKET Desc_Socket_Cliente;
|
||||
SOCKADDR_IN Adresse_Socket_Server;
|
||||
WORD wVersionRequested;
|
||||
WSADATA wsaData;
|
||||
|
||||
wVersionRequested=MAKEWORD(1, 1);
|
||||
result = WSAStartup(wVersionRequested,&wsaData);
|
||||
if (result != 0)
|
||||
{
|
||||
DebugTrace("WSAStartup\t");
|
||||
return;
|
||||
}
|
||||
#elif LINUX
|
||||
int Desc_Socket_Cliente;
|
||||
struct sockaddr_in Adresse_Socket_Server;
|
||||
#endif
|
||||
|
||||
struct hostent *hostentptr;
|
||||
#ifdef WIN32
|
||||
SOCKADDR_IN Adresse_Socket_Server;
|
||||
WORD wVersionRequested;
|
||||
WSADATA wsaData;
|
||||
mfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||
if(mfd < 0)
|
||||
return;
|
||||
DebugTrace("Connecting " << ipAddr);
|
||||
|
||||
wVersionRequested=MAKEWORD(1,1);
|
||||
result = WSAStartup(wVersionRequested,&wsaData);
|
||||
if(result!=0){
|
||||
DebugTrace("WSAStartup\t");
|
||||
return;
|
||||
}
|
||||
#ifdef WIN32
|
||||
unsigned int addr_dest = inet_addr(ipAddr.c_str());
|
||||
hostentptr=gethostbyaddr((char*) &addr_dest, 4, AF_INET);
|
||||
#elif LINUX
|
||||
struct sockaddr_in Adresse_Socket_Server;
|
||||
hostentptr = gethostbyname(ipAddr.c_str());
|
||||
#endif
|
||||
|
||||
mfd=socket(AF_INET,SOCK_STREAM,0);
|
||||
if(mfd < 0)
|
||||
return;
|
||||
DebugTrace("Connecting " << ipAddr);
|
||||
if (hostentptr == NULL)
|
||||
{
|
||||
DebugTrace("ERROR, no such host\n");
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
unsigned int addr_dest = inet_addr(ipAddr.c_str());
|
||||
hostentptr=gethostbyaddr((char*) &addr_dest,4,AF_INET);
|
||||
ZeroMemory( (char*)&Adresse_Socket_Server, sizeof(Adresse_Socket_Server));
|
||||
#elif LINUX
|
||||
hostentptr = gethostbyname(ipAddr.c_str());
|
||||
#endif
|
||||
if (hostentptr == NULL) {
|
||||
DebugTrace("ERROR, no such host\n");
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
ZeroMemory( (char*)&Adresse_Socket_Server,sizeof(Adresse_Socket_Server));
|
||||
#elif LINUX
|
||||
bzero( (char*)&Adresse_Socket_Server,sizeof(Adresse_Socket_Server));
|
||||
bzero( (char*)&Adresse_Socket_Server, sizeof(Adresse_Socket_Server));
|
||||
#endif //WINDOWS
|
||||
|
||||
Adresse_Socket_Server.sin_family=(*hostentptr).h_addrtype;
|
||||
Adresse_Socket_Server.sin_port=htons(SERVER_PORT);
|
||||
Adresse_Socket_Server.sin_addr=*((struct in_addr*)(*hostentptr).h_addr);
|
||||
Adresse_Socket_Server.sin_family = (*hostentptr).h_addrtype;
|
||||
Adresse_Socket_Server.sin_port = htons(SERVER_PORT);
|
||||
Adresse_Socket_Server.sin_addr = *((struct in_addr*)(*hostentptr).h_addr);
|
||||
|
||||
result = connect(
|
||||
mfd,
|
||||
(const struct sockaddr*)&Adresse_Socket_Server,
|
||||
sizeof(Adresse_Socket_Server));
|
||||
if (result != 0){
|
||||
DebugTrace("client connect failed :" << strerror(errno));
|
||||
state = FATAL_ERROR;
|
||||
return;
|
||||
}
|
||||
result = connect(
|
||||
mfd,
|
||||
(const struct sockaddr*)&Adresse_Socket_Server,
|
||||
sizeof(Adresse_Socket_Server));
|
||||
if (result != 0)
|
||||
{
|
||||
DebugTrace("client connect failed :" << strerror(errno));
|
||||
state = FATAL_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
state = CONNECTED;
|
||||
state = CONNECTED;
|
||||
}
|
||||
|
||||
bool JSocket::SetNonBlocking(int sock)
|
||||
{
|
||||
int opts;
|
||||
|
||||
#ifdef WIN32
|
||||
#elif LINUX
|
||||
opts = fcntl(sock,F_GETFL);
|
||||
if (opts < 0) {
|
||||
perror("fcntl(F_GETFL)");
|
||||
return false;
|
||||
}
|
||||
opts = (opts | O_NONBLOCK);
|
||||
if (fcntl(sock,F_SETFL,opts) < 0) {
|
||||
perror("fcntl(F_SETFL)");
|
||||
return false;
|
||||
}
|
||||
int opts = fcntl(sock,F_GETFL);
|
||||
if (opts < 0)
|
||||
{
|
||||
perror("fcntl(F_GETFL)");
|
||||
return false;
|
||||
}
|
||||
opts = (opts | O_NONBLOCK);
|
||||
if (fcntl(sock,F_SETFL,opts) < 0)
|
||||
{
|
||||
perror("fcntl(F_SETFL)");
|
||||
return false;
|
||||
}
|
||||
#endif //WINDOWS
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
JSocket::JSocket()
|
||||
: state(NOT_AVAILABLE),
|
||||
mfd(-1)
|
||||
: state(NOT_AVAILABLE),
|
||||
mfd(-1)
|
||||
{
|
||||
int result;
|
||||
int result;
|
||||
#ifdef WIN32
|
||||
SOCKADDR_IN Adresse_Socket_Connection;
|
||||
WORD wVersionRequested;
|
||||
WSADATA wsaData;
|
||||
SOCKADDR_IN Adresse_Socket_Connection;
|
||||
WORD wVersionRequested;
|
||||
WSADATA wsaData;
|
||||
|
||||
wVersionRequested=MAKEWORD(1,1);
|
||||
result=WSAStartup(wVersionRequested,&wsaData);
|
||||
wVersionRequested = MAKEWORD(1,1);
|
||||
result = WSAStartup(wVersionRequested,&wsaData);
|
||||
|
||||
if(result!=0){
|
||||
DebugTrace("WSAStartup\t");
|
||||
return;
|
||||
}
|
||||
if (result != 0)
|
||||
{
|
||||
DebugTrace("WSAStartup\t");
|
||||
return;
|
||||
}
|
||||
#elif LINUX
|
||||
struct sockaddr_in Adresse_Socket_Connection;
|
||||
struct sockaddr_in Adresse_Socket_Connection;
|
||||
#endif //WINDOWS
|
||||
|
||||
mfd=socket( AF_INET, SOCK_STREAM,0);
|
||||
mfd=socket( AF_INET, SOCK_STREAM,0);
|
||||
|
||||
#ifdef WIN32
|
||||
#elif LINUX
|
||||
int reuse_addr = 1; /* Used so we can re-bind to our port
|
||||
while a previous connection is still
|
||||
in TIME_WAIT state. */
|
||||
/* So that we can re-bind to it without TIME_WAIT problems */
|
||||
setsockopt(mfd, SOL_SOCKET, SO_REUSEADDR, &reuse_addr,
|
||||
sizeof(reuse_addr));
|
||||
int reuse_addr = 1; /* Used so we can re-bind to our port
|
||||
while a previous connection is still
|
||||
in TIME_WAIT state. */
|
||||
/* So that we can re-bind to it without TIME_WAIT problems */
|
||||
setsockopt(mfd, SOL_SOCKET, SO_REUSEADDR, &reuse_addr,
|
||||
sizeof(reuse_addr));
|
||||
#endif //WINDOWS
|
||||
|
||||
SetNonBlocking(mfd);
|
||||
SetNonBlocking(mfd);
|
||||
|
||||
#ifdef WIN32
|
||||
ZeroMemory( &Adresse_Socket_Connection,sizeof(Adresse_Socket_Connection));
|
||||
ZeroMemory( &Adresse_Socket_Connection,sizeof(Adresse_Socket_Connection));
|
||||
#elif LINUX
|
||||
bzero( &Adresse_Socket_Connection,sizeof(Adresse_Socket_Connection));
|
||||
bzero( &Adresse_Socket_Connection,sizeof(Adresse_Socket_Connection));
|
||||
#endif //WINDOWS
|
||||
Adresse_Socket_Connection.sin_family=AF_INET;
|
||||
Adresse_Socket_Connection.sin_port=htons(SERVER_PORT);
|
||||
Adresse_Socket_Connection.sin_family = AF_INET;
|
||||
Adresse_Socket_Connection.sin_port = htons(SERVER_PORT);
|
||||
|
||||
result=::bind(mfd,
|
||||
(struct sockaddr*)&Adresse_Socket_Connection,
|
||||
sizeof(Adresse_Socket_Connection));
|
||||
if(result!=0){
|
||||
state = FATAL_ERROR;
|
||||
DebugTrace("bind error:" << strerror(errno));
|
||||
return;
|
||||
}
|
||||
result = ::bind(mfd,
|
||||
(struct sockaddr*)&Adresse_Socket_Connection,
|
||||
sizeof(Adresse_Socket_Connection));
|
||||
if (result != 0)
|
||||
{
|
||||
state = FATAL_ERROR;
|
||||
DebugTrace("bind error:" << strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
result=listen(mfd,1);
|
||||
if(result!=0){
|
||||
state = FATAL_ERROR;
|
||||
DebugTrace("listen error:" << strerror(errno));
|
||||
return;
|
||||
}
|
||||
result = listen(mfd,1);
|
||||
if(result != 0)
|
||||
{
|
||||
state = FATAL_ERROR;
|
||||
DebugTrace("listen error:" << strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
state = DISCONNECTED;
|
||||
state = DISCONNECTED;
|
||||
}
|
||||
|
||||
JSocket::JSocket(int fd)
|
||||
: state(CONNECTED),
|
||||
mfd(fd)
|
||||
: state(CONNECTED),
|
||||
mfd(fd)
|
||||
{
|
||||
}
|
||||
|
||||
JSocket::~JSocket(){
|
||||
Disconnect();
|
||||
JSocket::~JSocket()
|
||||
{
|
||||
Disconnect();
|
||||
#ifdef WIN32
|
||||
WSACleanup();
|
||||
WSACleanup();
|
||||
#endif
|
||||
}
|
||||
|
||||
void JSocket::Disconnect()
|
||||
{
|
||||
state = JSocket::DISCONNECTED;
|
||||
if(mfd) {
|
||||
state = JSocket::DISCONNECTED;
|
||||
if(mfd)
|
||||
{
|
||||
#ifdef WIN32
|
||||
closesocket(mfd);
|
||||
closesocket(mfd);
|
||||
#elif LINUX
|
||||
close(mfd);
|
||||
close(mfd);
|
||||
#endif
|
||||
mfd = 0;
|
||||
}
|
||||
mfd = 0;
|
||||
}
|
||||
}
|
||||
|
||||
JSocket* JSocket::Accept()
|
||||
{
|
||||
#ifdef WIN32
|
||||
SOCKADDR_IN Adresse_Socket_Cliente;
|
||||
int Longueur_Adresse;
|
||||
#elif LINUX
|
||||
struct sockaddr_in Adresse_Socket_Cliente;
|
||||
socklen_t Longueur_Adresse;
|
||||
#endif //WINDOWS
|
||||
#ifdef WIN32
|
||||
SOCKADDR_IN Adresse_Socket_Cliente;
|
||||
int Longueur_Adresse;
|
||||
#elif LINUX
|
||||
struct sockaddr_in Adresse_Socket_Cliente;
|
||||
socklen_t Longueur_Adresse;
|
||||
#endif //WINDOWS
|
||||
|
||||
while(mfd) {
|
||||
fd_set set;
|
||||
FD_ZERO(&set);
|
||||
FD_SET(mfd, &set);
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000*100;
|
||||
JSocket* socket = NULL;
|
||||
|
||||
int result = select(mfd+1, &set, NULL, NULL, &tv);
|
||||
if( result > 0 && FD_ISSET(mfd, &set) ) {
|
||||
while (mfd)
|
||||
{
|
||||
fd_set set;
|
||||
FD_ZERO(&set);
|
||||
FD_SET(mfd, &set);
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000 * 100;
|
||||
|
||||
Longueur_Adresse = sizeof(Adresse_Socket_Cliente);
|
||||
int val=accept(
|
||||
mfd,
|
||||
(struct sockaddr*)&Adresse_Socket_Cliente,
|
||||
&Longueur_Adresse);
|
||||
DebugTrace("connection on client port "<< ntohs(Adresse_Socket_Cliente.sin_port));
|
||||
int result = select(mfd+1, &set, NULL, NULL, &tv);
|
||||
if (result > 0 && FD_ISSET(mfd, &set))
|
||||
{
|
||||
|
||||
if(val >=0 ) {
|
||||
state = CONNECTED;
|
||||
return new JSocket(val);
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
Longueur_Adresse = sizeof(Adresse_Socket_Cliente);
|
||||
int val = accept(
|
||||
mfd,
|
||||
(struct sockaddr*)&Adresse_Socket_Cliente,
|
||||
&Longueur_Adresse);
|
||||
DebugTrace("connection on client port "<< ntohs(Adresse_Socket_Cliente.sin_port));
|
||||
|
||||
if (val >= 0)
|
||||
{
|
||||
state = CONNECTED;
|
||||
socket = new JSocket(val);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return socket;
|
||||
}
|
||||
|
||||
int JSocket::Read(char* buff, int size)
|
||||
{
|
||||
if(state == CONNECTED)
|
||||
{
|
||||
fd_set set;
|
||||
FD_ZERO(&set);
|
||||
FD_SET(mfd, &set);
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000*100;
|
||||
if (state == CONNECTED)
|
||||
{
|
||||
fd_set set;
|
||||
FD_ZERO(&set);
|
||||
FD_SET(mfd, &set);
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000 * 100;
|
||||
|
||||
int result = select(mfd+1, &set, NULL, NULL, &tv);
|
||||
if( result > 0 && FD_ISSET(mfd, &set) )
|
||||
{
|
||||
#ifdef WIN32
|
||||
int readbytes = recv(mfd, buff, size,0);
|
||||
#elif LINUX
|
||||
int readbytes = read(mfd, buff, size);
|
||||
#endif //WINDOWS
|
||||
if(readbytes < 0)
|
||||
{
|
||||
DebugTrace("Error reading from socket\n");
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
return readbytes;
|
||||
}
|
||||
else if( result < 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
int result = select(mfd+1, &set, NULL, NULL, &tv);
|
||||
if (result > 0 && FD_ISSET(mfd, &set))
|
||||
{
|
||||
#ifdef WIN32
|
||||
int readbytes = recv(mfd, buff, size, 0);
|
||||
#elif LINUX
|
||||
int readbytes = read(mfd, buff, size);
|
||||
#endif //WINDOWS
|
||||
if(readbytes < 0)
|
||||
{
|
||||
DebugTrace("Error reading from socket\n");
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
return readbytes;
|
||||
}
|
||||
else if( result < 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int JSocket::Write(char* buff, int size)
|
||||
{
|
||||
int size1 = size;
|
||||
while (size > 0 && state == CONNECTED) {
|
||||
fd_set set;
|
||||
FD_ZERO(&set);
|
||||
FD_SET(mfd, &set);
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000*100;
|
||||
int size1 = size;
|
||||
while (size > 0 && state == CONNECTED)
|
||||
{
|
||||
fd_set set;
|
||||
FD_ZERO(&set);
|
||||
FD_SET(mfd, &set);
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 1000 * 100;
|
||||
|
||||
int result = select(mfd+1, NULL, &set, NULL, &tv);
|
||||
if( result > 0 && FD_ISSET(mfd, &set))
|
||||
{
|
||||
int len = send(mfd, buff, size, 0);
|
||||
if (len < 0) {
|
||||
return -1;
|
||||
}
|
||||
size -= len;
|
||||
buff += len;
|
||||
} else if (result < 0) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return size1 - size;
|
||||
int result = select(mfd+1, NULL, &set, NULL, &tv);
|
||||
if( result > 0 && FD_ISSET(mfd, &set))
|
||||
{
|
||||
int len = send(mfd, buff, size, 0);
|
||||
if (len < 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
size -= len;
|
||||
buff += len;
|
||||
}
|
||||
else if (result < 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return size1 - size;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user