checked the coding standard and changed it accordinly
This commit is contained in:
parent
ad7091e520
commit
640ac2172a
|
@ -7,17 +7,13 @@ using namespace Oyster::Network;
|
||||||
|
|
||||||
Connection::~Connection()
|
Connection::~Connection()
|
||||||
{
|
{
|
||||||
if(mySocket != NULL)
|
closesocket( this->socket );
|
||||||
{
|
|
||||||
closesocket( mySocket );
|
|
||||||
mySocket = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Connection::Connect(unsigned short port , const char serverName[])
|
bool Connection::Connect(unsigned short port , const char serverName[])
|
||||||
{
|
{
|
||||||
mySocket = socket(AF_INET, SOCK_STREAM, 0);
|
this->socket = ::socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if(mySocket == SOCKET_ERROR)
|
if(this->socket == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//error opening socket
|
//error opening socket
|
||||||
return false;
|
return false;
|
||||||
|
@ -30,6 +26,7 @@ bool Connection::Connect(unsigned short port , const char serverName[])
|
||||||
//couldn't find host
|
//couldn't find host
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sockaddr_in server;
|
struct sockaddr_in server;
|
||||||
server.sin_family = AF_INET;
|
server.sin_family = AF_INET;
|
||||||
server.sin_port = htons(port);
|
server.sin_port = htons(port);
|
||||||
|
@ -37,7 +34,7 @@ bool Connection::Connect(unsigned short port , const char serverName[])
|
||||||
|
|
||||||
while(1)
|
while(1)
|
||||||
{
|
{
|
||||||
if(connect(mySocket, (sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
|
if(connect(this->socket, (sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//Error connecting to server
|
//Error connecting to server
|
||||||
return false;
|
return false;
|
||||||
|
@ -56,8 +53,8 @@ bool Connection::Connect(unsigned short port , const char serverName[])
|
||||||
|
|
||||||
bool Connection::InitiateServer(unsigned short port)
|
bool Connection::InitiateServer(unsigned short port)
|
||||||
{
|
{
|
||||||
mySocket = socket(AF_INET, SOCK_STREAM, 0);
|
this->socket = ::socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if(mySocket == SOCKET_ERROR)
|
if(this->socket == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//Error opening socket!
|
//Error opening socket!
|
||||||
return false;
|
return false;
|
||||||
|
@ -68,28 +65,28 @@ bool Connection::InitiateServer(unsigned short port)
|
||||||
server.sin_port = htons(port);
|
server.sin_port = htons(port);
|
||||||
server.sin_addr.s_addr = INADDR_ANY;
|
server.sin_addr.s_addr = INADDR_ANY;
|
||||||
|
|
||||||
if(bind(mySocket, (sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
|
if(bind(this->socket, (sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//Bind failed!;
|
//Bind failed!;
|
||||||
closesocket(mySocket);
|
closesocket(this->socket);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//not our Listen function! its trying to keep our socket open for connections
|
//not our Listen function! its trying to keep our socket open for connections
|
||||||
if(listen(mySocket, 5) == SOCKET_ERROR)
|
if(listen(this->socket, 5) == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//"Listen failed!
|
//"Listen failed!
|
||||||
closesocket(mySocket);
|
closesocket(this->socket);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Server started!
|
//Server started!
|
||||||
return mySocket;
|
return this->socket;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Connection::Disconnect()
|
void Connection::Disconnect()
|
||||||
{
|
{
|
||||||
closesocket(mySocket);
|
closesocket(this->socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Connection::Send(const unsigned char message[])
|
bool Connection::Send(const unsigned char message[])
|
||||||
|
@ -98,7 +95,7 @@ bool Connection::Send(const unsigned char message[])
|
||||||
unsigned long messageSize = strlen((char*)message);
|
unsigned long messageSize = strlen((char*)message);
|
||||||
|
|
||||||
messageSize = 255;
|
messageSize = 255;
|
||||||
nBytes = send(mySocket, (char*)message , messageSize, 0);
|
nBytes = send(this->socket, (char*)message , messageSize, 0);
|
||||||
if(nBytes == SOCKET_ERROR)
|
if(nBytes == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//Send failed!
|
//Send failed!
|
||||||
|
@ -111,7 +108,7 @@ bool Connection::Send(const unsigned char message[])
|
||||||
int Connection::Recieve(unsigned char message[])
|
int Connection::Recieve(unsigned char message[])
|
||||||
{
|
{
|
||||||
int nBytes;
|
int nBytes;
|
||||||
nBytes = recv(mySocket, (char*)message , 255, 0);
|
nBytes = recv(this->socket, (char*)message , 255, 0);
|
||||||
if(nBytes == SOCKET_ERROR)
|
if(nBytes == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
//Recv failed
|
//Recv failed
|
||||||
|
@ -126,7 +123,7 @@ int Connection::Recieve(unsigned char message[])
|
||||||
int Connection::Listen()
|
int Connection::Listen()
|
||||||
{
|
{
|
||||||
int clientSocket;
|
int clientSocket;
|
||||||
if((clientSocket = accept(mySocket, NULL, NULL)) == INVALID_SOCKET)
|
if((clientSocket = accept(this->socket, NULL, NULL)) == INVALID_SOCKET)
|
||||||
{
|
{
|
||||||
//failed
|
//failed
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
|
#ifndef NETWORK_DEPENDENCIES_CONNECTION_H
|
||||||
|
#define NETWORK_DEPENDENCIES_CONNECTION_H
|
||||||
|
|
||||||
//////////////////////////////////
|
//////////////////////////////////
|
||||||
// Created by Sam Svensson 2013 //
|
// Created by Sam Svensson 2013 //
|
||||||
//////////////////////////////////
|
//////////////////////////////////
|
||||||
|
|
||||||
#ifndef NETWORK_DEPENDENCIES_CONNECTION_H
|
|
||||||
#define NETWORK_DEPENDENCIES_CONNECTION_H
|
|
||||||
|
|
||||||
#include "IConnection.h"
|
#include "IConnection.h"
|
||||||
|
|
||||||
namespace Oyster
|
namespace Oyster
|
||||||
|
@ -15,12 +15,13 @@ namespace Oyster
|
||||||
{
|
{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Connection() { mySocket = 0; };
|
Connection() { this->socket = 0; };
|
||||||
Connection(int socket) { mySocket = socket; };
|
Connection(int socket) { this->socket = socket; };
|
||||||
~Connection();
|
virtual ~Connection();
|
||||||
|
|
||||||
virtual bool Connect( unsigned short port , const char serverName[] );
|
virtual bool Connect( unsigned short port , const char serverName[] );
|
||||||
virtual bool InitiateServer( unsigned short port );
|
virtual bool InitiateServer( unsigned short port );
|
||||||
|
//virutal bool initiateClient();
|
||||||
|
|
||||||
virtual void Disconnect();
|
virtual void Disconnect();
|
||||||
|
|
||||||
|
@ -30,7 +31,7 @@ namespace Oyster
|
||||||
virtual int Listen();
|
virtual int Listen();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int mySocket;
|
int socket;
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
|
#ifndef NETWORK_DEPENDENCIES_I_CONNECTION_H
|
||||||
|
#define NETWORK_DEPENDENCIES_I_CONNECTION_H
|
||||||
|
|
||||||
//////////////////////////////////
|
//////////////////////////////////
|
||||||
// Created by Sam Svensson 2013 //
|
// Created by Sam Svensson 2013 //
|
||||||
//////////////////////////////////
|
//////////////////////////////////
|
||||||
|
|
||||||
#ifndef NETWORK_DEPENDENCIES_I_CONNECTION_H
|
|
||||||
#define NETWORK_DEPENDENCIES_I_CONNECTION_H
|
|
||||||
|
|
||||||
namespace Oyster
|
namespace Oyster
|
||||||
{
|
{
|
||||||
namespace Network
|
namespace Network
|
||||||
|
@ -17,6 +17,7 @@ namespace Oyster
|
||||||
virtual bool Send( const unsigned char message[] ) = 0;
|
virtual bool Send( const unsigned char message[] ) = 0;
|
||||||
virtual int Recieve(unsigned char message[]) = 0;
|
virtual int Recieve(unsigned char message[]) = 0;
|
||||||
virtual bool InitiateServer( unsigned short port ) { return false; };
|
virtual bool InitiateServer( unsigned short port ) { return false; };
|
||||||
|
virtual bool initiateClient( unsigned short port ) { return false; };
|
||||||
virtual int Listen() { return -1; };
|
virtual int Listen() { return -1; };
|
||||||
virtual bool Connect( unsigned short port, const char serverName[] ) { return false; };
|
virtual bool Connect( unsigned short port, const char serverName[] ) { return false; };
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
#ifndef NETWORK_DEPENDENCIES_I_TRANSLATE
|
#ifndef NETWORK_DEPENDENCIES_I_TRANSLATE
|
||||||
#define NETWORK_DEPENDENCIES_I_TRANSLATE
|
#define NETWORK_DEPENDENCIES_I_TRANSLATE
|
||||||
|
|
||||||
|
//////////////////////////////////
|
||||||
|
// Created by Sam Svensson 2013 //
|
||||||
|
//////////////////////////////////
|
||||||
|
|
||||||
namespace Oyster
|
namespace Oyster
|
||||||
{
|
{
|
||||||
namespace Network
|
namespace Network
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
#ifndef NETWORK_DEPENDENCIES_PROTOCOLS_H
|
#ifndef NETWORK_DEPENDENCIES_PROTOCOLS_H
|
||||||
#define NETWORK_DEPENDENCIES_PROTOCOLS_H
|
#define NETWORK_DEPENDENCIES_PROTOCOLS_H
|
||||||
|
|
||||||
|
//////////////////////////////////
|
||||||
|
// Created by Sam Svensson 2013 //
|
||||||
|
//////////////////////////////////
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace Oyster
|
namespace Oyster
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
#ifndef NETWORK_DEPENDENCIES_TRANSLATOR_H
|
#ifndef NETWORK_DEPENDENCIES_TRANSLATOR_H
|
||||||
#define NETWORK_DEPENDENCIES_TRANSLATOR_H
|
#define NETWORK_DEPENDENCIES_TRANSLATOR_H
|
||||||
|
|
||||||
|
//////////////////////////////////
|
||||||
|
// Created by Sam Svensson 2013 //
|
||||||
|
//////////////////////////////////
|
||||||
|
|
||||||
#include "Messages/MessagesInclude.h"
|
#include "Messages/MessagesInclude.h"
|
||||||
#include "Protocols.h"
|
#include "Protocols.h"
|
||||||
#include "ITranslate.h"
|
#include "ITranslate.h"
|
||||||
|
|
Loading…
Reference in New Issue