beta/shape-game
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

working tcp comm

Browse Source
This commit is contained in:
beta
2019-04-27 22:29:33 -05:00
parent 3ad3d73a2f
commit 3f2d84e8d4
10 changed files with 166 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/client.cpp
+55 -24
View File
@@ -2,22 +2,32 @@
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();
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()
{
std::cout
<< "Start"
<< "\nConnecting to: " << _address << ":" <<_port
<< "\nConnecting to: " << _url << ":" <<_port
<< std::endl;
//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)
{
std::cout << "ERROR opening socket" << std::endl;
@@ -28,21 +38,26 @@ void Client::start()
<< std::endl;
bzero((char *)&_server_address, sizeof(_server_address));
_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);
_server_address.sin_port = htons(_port);
// Now connect to the server
if (connect(_client_socket, (struct sockaddr *)&_server_address, sizeof(_server_address)) < 0)
{
std::cout << "ERROR connecting" << std::endl;
return;
}
this->_online = true;
this->_running = true;
std::thread listen_thread([this] { this->listener(); } );
listen_thread.detach();
std::cout
<< "Client Connected"
<< std::endl;
}
void Client::stop()
{
@@ -97,10 +112,13 @@ SHAPE Client::decode(const std::string &shape)
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)
{
@@ -128,30 +146,43 @@ std::string Client::encode(const 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;
}
}
void Client::listener()
{
std::cout << "listener" << std::endl;
char buffer[1024];
while (_online)
{
// 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::string message(buffer);
std::cout << "Got Message: " << message << std::endl;
SHAPE shape = parse(buffer);
_update(shape);
}
source/client_driver.cpp
+8 -1
View File
@@ -2,7 +2,7 @@
#include <iostream>
void test(betacore::SHAPE &s){
std::cout << "It worked" << std::endl;
std::cout << "It worked\n" << std::endl;
}
int main(int argc, char * argv[]){
std::function<void(betacore::SHAPE &S)> fn= test;
@@ -11,5 +11,12 @@ int main(int argc, char * argv[]){
client.send(true, betacore::TRIANGLE);
//s.off();
//while(client.running()){}
std::string a;
while(client.running()){
std::cin >> a;
client.send(false, betacore::TRIANGLE);
if (a == "q") client.kill();
}
return 0;
}
source/game.cpp
+1 -7
View File
@@ -111,7 +111,7 @@ int Game::initGL()
if (error != GL_NO_ERROR)
{
printf("OpenGL Error %s\n", gluErrorString(error));
printf("OpenGL Error %s\n");
result = -1;
return result;
}
@@ -123,11 +123,6 @@ int Game::initGL()
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(
45.0f,
(GLfloat)this->SCREEN_WIDTH / (GLfloat)this->SCREEN_HEIGHT,
0.1f,
100.0f);
glMatrixMode(GL_MODELVIEW);
return result;
@@ -487,7 +482,6 @@ void Game::resize(int width, int height)
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(45.0f, (GLfloat)width / (GLfloat)height, 0.1f, 100.0f);
glMatrixMode(GL_MODELVIEW);
}
source/server.cpp
+25 -24
View File
@@ -1,11 +1,5 @@
#include "../includes/server.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
namespace betacore
{
@@ -41,21 +35,27 @@ void Server::start()
online = true;
server_running=true;
std::cout << "Server is online"<< std::endl;
signal(SIGPIPE,SIG_IGN);
std::thread listen_thread([this] { this->listener(); } );
listen_thread.detach();
}
void Server::listener()
{
std::cout << "Listener "<< online << std::endl;
struct sockaddr_in client_address;
listen(this->server_socket, 10);
while (online) {
struct sockaddr_in client_address;
listen(this->server_socket, 5);
socklen_t client_socket_length = sizeof(client_address);
int client_number =
accept(server_socket, (struct sockaddr *)&client_address, &client_socket_length);
this->client_socket_collection.push_back(client_address);
this->clients.push_back(client_number);
std::cout << "New Conenction"<< std::endl;
if (client_number < 0)
{
std::cout << "ERROR on accept"<< std::endl;
continue;
}
std::thread socket_thread([this,client_number]{this->read_socket(client_number);});
socket_thread.detach();
}
@@ -68,40 +68,40 @@ void Server::read_socket(int client)
<< client
<< std::endl;
int n;
while (online)
{
if (client < 0)
{
std::cout << "ERROR on accept"<< std::endl;
}
bzero(buffer, 256);
n = read(client, buffer, 1024);
char buffer[1024];
while (online &&
std::find(clients.begin(), clients.end(), client) != clients.end())
{
bzero(buffer, 1024);
n = read(client, buffer, 1024-1);
if (n < 0)
{
std::cout << "ERROR reading from socket"<< std::endl;
break;
}
printf("Here is the message: %s\n", buffer);
n = write(client, "I got your mesage\n", 18);
if (n < 0)
{
std::cout << "ERROR Writing socket"<< std::endl;
break;
}
}
clients.erase(
std::remove(clients.begin(), clients.end(), client), clients.end());
close(client);
}
void Server::shutdown()
{
std::cout << "Server is shuting down"<< std::endl;
for (auto socket : clients){
std::cout
<< "Closing new socket :: "
<< socket
<< std::endl;
close(socket);
}
std::cout << "Closing server socket" << std::endl;
close(this->server_socket);
server_running = false;
@@ -112,4 +112,5 @@ void Server::off(){
bool Server::running(){
return this->server_running;
}
} // namespace betacore