diff --git a/client.hpp b/client.hpp deleted file mode 100644 index 6708b66..0000000 --- a/client.hpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "easysock.h" -#include - -/* -Client class - Defines a TCP/UDP client. -- The constructor takes in a **remote** address and port, and connects the client to that address/port. -*/ - -class Client { -private: - int ip_ver; - char protocol; - int port; - int sock_fd; - std::string address; - - void create_socket() { - struct sockaddr* dest = (struct sockaddr *)malloc(sizeof(struct sockaddr)); - this->sock_fd = create_remote(this->ip_ver, this->protocol, this->address.data(), this->port, dest); - } - -public: - Client(int ip_ver, char protocol, const char* address, int port) { - /* Error checking */ - if (ip_ver != 4 && ip_ver != 6) { - throw std::invalid_argument("Invalid IP address type"); - } - if (port < 1024 || port > 65535) { - throw std::invalid_argument("Invalid port"); - } - if (protocol != 'T' && protocol != 'U') { - throw std::invalid_argument("Invalid protocol"); - } - - this->ip_ver = ip_ver; - this->protocol = protocol; - this->port = port; - this->address = std::string(address); - create_socket(); - } - - void sendAll(std::string to_send) { - int str_length = to_send.length(); - int num_bytes_sent = 0; /* Number of bytes sent in one call to send */ - int total_bytes_sent = 0; /* Total number of bytes sent */ - - while (total_bytes_sent < str_length) { - num_bytes_sent = send(this->getSockFD(), to_send.substr(total_bytes_sent).data(), str_length - total_bytes_sent, 0); - total_bytes_sent += num_bytes_sent; - } - - return; - } - - int getSockFD() { - return sock_fd; - } - -}; diff --git a/easysock.c b/easysock.c deleted file mode 100644 index 7553a9b..0000000 --- a/easysock.c +++ /dev/null @@ -1,170 +0,0 @@ -#include "easysock.h" - - -int create_socket(int network, char transport) { - int domain; - int type; - - if (network == 4) { - domain = AF_INET; - } else if (network == 6) { - domain = AF_INET6; - } else { - return -1; - } - - if (transport == 'T') { - type = SOCK_STREAM; - } else if (transport == 'U') { - type = SOCK_DGRAM; - } else { - return -1; - } - - int newSock = socket(domain,type,0); - return newSock; -} - - -int create_addr(int network, char* address, int port,struct sockaddr* dest) { - if (network == 4) { - struct sockaddr_in listen_address; - - listen_address.sin_family = AF_INET; - listen_address.sin_port = htons(port); - inet_pton(AF_INET,address,&listen_address.sin_addr); - memcpy(dest,&listen_address,sizeof(listen_address)); - return 0; - - } else if (network == 6) { - struct sockaddr_in6 listen_ipv6; - listen_ipv6.sin6_family = AF_INET6; - listen_ipv6.sin6_port = htons(port); - inet_pton(AF_INET6,address,&listen_ipv6.sin6_addr); - memcpy(dest,&listen_ipv6,sizeof(listen_ipv6)); - return 0; - - } else { - return -202; - } - -} - -int create_local (int network, char transport, char* address, int port,struct sockaddr* addr_struct) { - int socket = create_socket(network,transport); - if (socket < 0) { - return (-1 * errno); - } - create_addr(network,address,port,addr_struct); - int addrlen; - if (network == 4) { - addrlen = sizeof(struct sockaddr_in); - } else if (network == 6) { - addrlen = sizeof(struct sockaddr_in6); - } else { - return -202; - } - - /* The value of addrlen should be the size of the 'sockaddr'. - This should be set to the size of 'sockaddr_in' for IPv4, and 'sockaddr_in6' for IPv6. - See https://stackoverflow.com/questions/73707162/socket-bind-failed-with-invalid-argument-error-for-program-running-on-macos */ - - int i = bind (socket,addr_struct,(socklen_t)addrlen); - if (i < 0) { - return (-1 * errno); - } - return socket; -} - -int create_remote (int network,char transport,char* address,int port,struct sockaddr* remote_addr_struct) { - - struct addrinfo hints; /* Used to tell getaddrinfo what kind of address we want */ - struct addrinfo* results; /* Used by getaddrinfo to store the addresses */ - - - if (check_ip_ver(address) < 0) { /* If the address is a domain name */ - int err_code; - char* port_str = (char *)malloc(10 * sizeof(char)); - - sprintf(port_str,"%d",port); /* getaddrinfo expects a string for its port */ - - - memset(&hints,'\0',sizeof(hints)); - hints.ai_socktype = char_to_socktype(transport); - - err_code = getaddrinfo(address,port_str,&hints,&results); - if (err_code != 0) { - return (-1 * err_code); - } - remote_addr_struct = results->ai_addr; - network = inet_to_int(results->ai_family); - } else { - create_addr(network,address,port,remote_addr_struct); - } - - int socket = create_socket(network,transport); - if (socket < 0) { - return (-1 * errno); - } - - int addrlen; - if (network == 4) { - addrlen = sizeof(struct sockaddr_in); - } else if (network == 6) { - addrlen = sizeof(struct sockaddr_in6); - } else { - return (-202); - } - - /* The value of addrlen should be the size of the 'sockaddr'. - This should be set to the size of 'sockaddr_in' for IPv4, and 'sockaddr_in6' for IPv6. - See https://stackoverflow.com/questions/73707162/socket-bind-failed-with-invalid-argument-error-for-program-running-on-macos */ - - int i = connect(socket,remote_addr_struct,(socklen_t)addrlen); - if (i < 0) { - return (-1 * errno); - } - return socket; -} - - -int check_ip_ver(char* address) { - char buffer[16]; /* 16 chars - 128 bits - is enough to hold an ipv6 address */ - if (inet_pton(AF_INET,address,buffer) == 1) { - return 4; - } else if (inet_pton(AF_INET6,address,buffer) == 1) { - return 6; - } else { - return -1; - } -} - -int int_to_inet(int network) { - if (network == 4) { - return AF_INET; - } else if (network == 6) { - return AF_INET6; - } else { - return -202; - } -} - -int inet_to_int(int af_type) { - if (af_type == AF_INET) { - return 4; - } else if (af_type == AF_INET6) { - return 6; - } else { - return -207; - } -} - -int char_to_socktype(char transport) { - if (transport == 'T') { - return SOCK_STREAM; - } else if (transport == 'U') { - return SOCK_DGRAM; - } else { - return -250; - } -} diff --git a/easysock.h b/easysock.h deleted file mode 100644 index 1bb81bb..0000000 --- a/easysock.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef EASYSOCK_H_ -#define EASYSOCK_H_ - -#include -#include -#include -#include -#include -#include -#include -#include - - -/* This function takes: -a layer 3 - network layer - integer, which must be '4' for IPv4 -and 6 for IPv6; and -a layer 4 - transport layer - character, which must be 'T' for -TCP or 'U' for UDP. - -It returns the created socket, or -1 if the socket creation failed.*/ - -int create_socket(int network, char transport); - - -/* This function fills in the sockaddr struct 'dest' based on the given information. -'network' is an integer that contains '4' for IPv4 or '6' for IPv6; -'address' is the address that is filled into the struct; -port is self-explanatory; -and dest is a pointer to the sockaddr struct that will be filled in. - -The function returns with -202 if the network parameter contained neither '4' -nor '6'. */ - -int create_addr(int network, char* address, int port,struct sockaddr* dest); - - - -/* This function utilizes the above two functions; it creates the socket and -_binds_ the addresses. It is used for local sockets (server sockets). Parameters are -same as above. - -It prints the error returned by 'bind' if something went wrong, and returns ( -1 * errno ).*/ - -int create_local (int network, char transport, char* address, int port,struct sockaddr* addr_struct); - - -/* This function utilizes the same functions as 'create_local' but _connects_ to the -requested address. It is used for remote sockets (client sockets). The paramters are same -as above. This function needs an empty 'sockaddr *' structure passed to it, which it will fill. - -If something goes wrong, this function returns with ( -1 * errno ). */ - -int create_remote (int network,char transport,char* address,int port,struct sockaddr* remote_addr_struct); - -/* check_ip_ver - This function checks if the given string is an IPv4 address (returns 4), -IPv6 address (returns 6) or neither (returns -1). */ - -int check_ip_ver(char* address); - -/* int_to_inet - Takes an int value (4 for IPv4, 6 for IPv6) and returns AF_INET or -AF_INET6 respectively. */ - -int int_to_inet(int network); - -/* char_to_socktype - Takes a character that represents a transport-layer protocol -(currently only supports 'T' for TCP or 'U' for UDP - it returns -250 if -the given characters is neither of these) and return the appropriate SOCKTYPE value. */ - -int char_to_socktype(char transport); - -/* inet_to_int - Takes an int value that corresponds to AF_INET or AF_INET6, -and returns the appropriate int value. */ -int inet_to_int(int af_type); - - -#endif diff --git a/math-helpers.hpp b/math-helpers.hpp deleted file mode 100644 index d3daaf6..0000000 --- a/math-helpers.hpp +++ /dev/null @@ -1,6 +0,0 @@ -int signum(int num) { - int retval = 0; - (num > 0) ? retval = 1 : retval = -1; - return retval; -} - diff --git a/paddle.hpp b/paddle.hpp deleted file mode 100644 index 9f6dae8..0000000 --- a/paddle.hpp +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef PADDLE_H -#define PADDLE_H - -class Paddle { -private: - /* Variables */ - raylib::Rectangle rectangle; - raylib::Color color; - int points; - raylib::Vector2 initial_pos; - -public: - /* Variables */ - raylib::Vector2 velocity; /* This variable is made public to allow easy modification (no need for getters/setters) */ - - /* Functions */ - Paddle(int pos_x, int pos_y, int width, int height) { - this->rectangle = raylib::Rectangle(pos_x, pos_y, width, height); - this->initial_pos = raylib::Vector2(pos_x, pos_y); - this->color = raylib::Color::White(); - this->velocity = raylib::Vector2(0,0); - points = 0; - return; - } - - raylib::Rectangle getRect() { - return this->rectangle; - } - - int getPoints() { - return points; - } - void incrementPoints() { - points++; - return; - } - - void reset() { - this->rectangle.x = this->initial_pos.x; - this->rectangle.y = this->initial_pos.y; - this->velocity = raylib::Vector2(0,0); - return; - } - - void updatePosition() { - this->rectangle.x += this->velocity.x; - this->rectangle.y += this->velocity.y; - return; - } - void draw() { - this->rectangle.Draw(this->color); - return; - } -}; - -#endif diff --git a/server.hpp b/server.hpp deleted file mode 100644 index 0890351..0000000 --- a/server.hpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "easysock.h" -#include - -/* -Server class - Defines a TCP/UDP server. -- The constructor takes in a **local** address and port, on which the server listens. -*/ - -class Server { -private: - int ip_ver; - char protocol; - int port; - int sock_fd; - std::string address; - - void create_socket() { - struct sockaddr* dest = (struct sockaddr *)malloc(sizeof(struct sockaddr)); - this->sock_fd = create_local(this->ip_ver, this->protocol, this->address.data(), this->port, dest); - } - -public: - Server(int ip_ver, char protocol, int port) { - /* Error checking */ - if (ip_ver != 4 && ip_ver != 6) { - throw std::invalid_argument("Invalid IP address type"); - } - if (port < 1024 || port > 65535) { - throw std::invalid_argument("Invalid port"); - } - if (protocol != 'T' && protocol != 'U') { - throw std::invalid_argument("Invalid protocol"); - } - - this->ip_ver = ip_ver; - this->protocol = protocol; - this->port = port; - if (ip_ver == 4) { - this->address = "127.0.0.1"; - } else if (ip_ver == 6) { - this->address = "::1"; - } - - create_socket(); - } - - - std::string recvAll() { - std::string string = std::string(); - char* buffer = (char *)malloc(100); - while (recv(this->getSockFD(), buffer, 100, 0) != 0) { - string.append(std::string(buffer)); - } - - return string; - } - - int getSockFD() { - return sock_fd; - } - -};