|
@ -2,22 +2,32 @@ |
|
|
|
|
|
|
|
|
namespace betacore |
|
|
namespace betacore |
|
|
{ |
|
|
{ |
|
|
Client::Client(MODE mode, int port, std::string address, std::function<void(SHAPE &S)> &update) : _mode(mode), |
|
|
|
|
|
_port(port), |
|
|
|
|
|
_address(address), |
|
|
|
|
|
_update(update) |
|
|
|
|
|
|
|
|
Client::Client(MODE mode, int port, std::string url, std::function<void(SHAPE &S)> &update) : _mode(mode), |
|
|
|
|
|
_port(port), |
|
|
|
|
|
_url(url), |
|
|
|
|
|
_update(update) |
|
|
{ |
|
|
{ |
|
|
this->start(); |
|
|
this->start(); |
|
|
|
|
|
lookup["TRIANGLE"]="APPLE"; |
|
|
|
|
|
lookup["CIRCLE"]="ORANGE"; |
|
|
|
|
|
lookup["SQUARE"]="BANANA"; |
|
|
|
|
|
lookup["PENTAGON"]="PINEAPPLE"; |
|
|
|
|
|
|
|
|
|
|
|
lookup["APPLE"]="TRIANGLE"; |
|
|
|
|
|
lookup["ORANGE"]="CIRCLE"; |
|
|
|
|
|
lookup["BANANA"]="SQUARE"; |
|
|
|
|
|
lookup["PINEAPPLE"]="PENTAGON"; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
void Client::start() |
|
|
void Client::start() |
|
|
{ |
|
|
{ |
|
|
std::cout |
|
|
std::cout |
|
|
<< "Start" |
|
|
<< "Start" |
|
|
<< "\nConnecting to: " << _address << ":" <<_port |
|
|
|
|
|
|
|
|
<< "\nConnecting to: " << _url << ":" <<_port |
|
|
<< std::endl; |
|
|
<< std::endl; |
|
|
//Create a socket point
|
|
|
//Create a socket point
|
|
|
_client_socket = socket(AF_INET, SOCK_STREAM, 0); |
|
|
|
|
|
_server = gethostbyname(_address.c_str()); |
|
|
|
|
|
|
|
|
this->_client_socket = socket(AF_INET, SOCK_STREAM, 0); |
|
|
|
|
|
_server = gethostbyname(_url.c_str()); |
|
|
if (_client_socket < 0) |
|
|
if (_client_socket < 0) |
|
|
{ |
|
|
{ |
|
|
std::cout << "ERROR opening socket" << std::endl; |
|
|
std::cout << "ERROR opening socket" << std::endl; |
|
@ -28,21 +38,26 @@ void Client::start() |
|
|
<< std::endl; |
|
|
<< std::endl; |
|
|
bzero((char *)&_server_address, sizeof(_server_address)); |
|
|
bzero((char *)&_server_address, sizeof(_server_address)); |
|
|
_server_address.sin_family = AF_INET; |
|
|
_server_address.sin_family = AF_INET; |
|
|
std::cout |
|
|
|
|
|
<< "AF_INT SET" |
|
|
|
|
|
<< std::endl; |
|
|
|
|
|
|
|
|
|
|
|
bcopy((char *)_server->h_addr, (char *)&_server_address.sin_addr.s_addr, _server->h_length); |
|
|
bcopy((char *)_server->h_addr, (char *)&_server_address.sin_addr.s_addr, _server->h_length); |
|
|
_server_address.sin_port = htons(_port); |
|
|
_server_address.sin_port = htons(_port); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Now connect to the server
|
|
|
// Now connect to the server
|
|
|
if (connect(_client_socket, (struct sockaddr *)&_server_address, sizeof(_server_address)) < 0) |
|
|
if (connect(_client_socket, (struct sockaddr *)&_server_address, sizeof(_server_address)) < 0) |
|
|
{ |
|
|
{ |
|
|
std::cout << "ERROR connecting" << std::endl; |
|
|
std::cout << "ERROR connecting" << std::endl; |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
this->_online = true; |
|
|
|
|
|
this->_running = true; |
|
|
|
|
|
std::thread listen_thread([this] { this->listener(); } ); |
|
|
|
|
|
listen_thread.detach(); |
|
|
|
|
|
|
|
|
std::cout |
|
|
std::cout |
|
|
<< "Client Connected" |
|
|
<< "Client Connected" |
|
|
<< std::endl; |
|
|
<< std::endl; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
void Client::stop() |
|
|
void Client::stop() |
|
|
{ |
|
|
{ |
|
@ -97,10 +112,13 @@ SHAPE Client::decode(const std::string &shape) |
|
|
std::string Client::crypt(const std::string &message) |
|
|
std::string Client::crypt(const std::string &message) |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
std::string output = message; |
|
|
|
|
|
for (int i = 0; i < message.size(); i++) |
|
|
|
|
|
output[i] = message[i] ^ key; |
|
|
|
|
|
return output; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// std::string output = std::string(message);
|
|
|
|
|
|
|
|
|
|
|
|
// for (int i = 0; i < message.size(); i++)
|
|
|
|
|
|
// output.at(i) = message[i] ^ key;
|
|
|
|
|
|
std::cout << "Crypt::" << message << " : " << lookup[message] << std::endl; |
|
|
|
|
|
return lookup[message]; |
|
|
} |
|
|
} |
|
|
std::string Client::encode(const SHAPE &shape) |
|
|
std::string Client::encode(const SHAPE &shape) |
|
|
{ |
|
|
{ |
|
@ -128,30 +146,43 @@ std::string Client::encode(const SHAPE &shape) |
|
|
void Client::send(bool encrypt, SHAPE shape) |
|
|
void Client::send(bool encrypt, SHAPE shape) |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
std::string message = "SHAPE:" + encrypt ? crypt(encode(shape)) : encode(shape) + ":END"; |
|
|
|
|
|
std::cout << "Sending Message: " << message << std::endl; |
|
|
|
|
|
char buffer[BUFFER_SIZE]; |
|
|
|
|
|
bzero(buffer, BUFFER_SIZE); |
|
|
|
|
|
strcpy(buffer, message.c_str()); |
|
|
|
|
|
if (write(_client_socket, buffer, strlen(buffer) < 0)) |
|
|
|
|
|
|
|
|
std::string message = "SHAPE:" ; |
|
|
|
|
|
message += encrypt ? crypt(encode(shape)) : encode(shape) ; |
|
|
|
|
|
message += ":END"; |
|
|
|
|
|
std::cout << "Sending Message: " << message << "\n" << std::endl; |
|
|
|
|
|
char buffer[1024]; |
|
|
|
|
|
bzero(buffer,1024); |
|
|
|
|
|
// for(int i=0; i<1024-1 && i < message.length(); i++){
|
|
|
|
|
|
// buffer[i]= message.at(i);
|
|
|
|
|
|
// }
|
|
|
|
|
|
strcpy(buffer,message.c_str()); |
|
|
|
|
|
buffer[1024-1]='\0'; |
|
|
|
|
|
int x =write(this->_client_socket, buffer, strlen(buffer)); |
|
|
|
|
|
if (x < 0) |
|
|
{ |
|
|
{ |
|
|
std::cout << "Failed send to server" << std::endl; |
|
|
std::cout << "Failed send to server" << std::endl; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void Client::listener() |
|
|
void Client::listener() |
|
|
{ |
|
|
{ |
|
|
|
|
|
std::cout << "listener" << std::endl; |
|
|
|
|
|
char buffer[1024]; |
|
|
while (_online) |
|
|
while (_online) |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
// Now read server response
|
|
|
// Now read server response
|
|
|
char buffer[BUFFER_SIZE]; |
|
|
|
|
|
bzero(buffer, BUFFER_SIZE); |
|
|
|
|
|
|
|
|
|
|
|
if (read(_client_socket, buffer, BUFFER_SIZE-1) < 0) |
|
|
|
|
|
|
|
|
bzero(buffer, 1024); |
|
|
|
|
|
std::cout << "Wating For message" << std::endl; |
|
|
|
|
|
if (read(_client_socket, buffer, 1024-1) < 0) |
|
|
{ |
|
|
{ |
|
|
std::cout << "ERROR reading from socket" << std::endl; |
|
|
std::cout << "ERROR reading from socket" << std::endl; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
std::string message(buffer); |
|
|
std::string message(buffer); |
|
|
|
|
|
std::cout << "Got Message: " << message << std::endl; |
|
|
SHAPE shape = parse(buffer); |
|
|
SHAPE shape = parse(buffer); |
|
|
_update(shape); |
|
|
_update(shape); |
|
|
} |
|
|
} |
|
|