Skip to content

Update EasySocket.hpp #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update EasySocket.hpp #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions include/masesk/EasySocket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@ namespace masesk {
const int BUFF_SIZE = 4096;
struct socket_error_exception : public std::exception
{
const char * what() const throw ()
const char* what() const throw ()
{
return "Can't start socket!";
}
};
struct invalid_socket_exception : public std::exception
{
const char * what() const throw ()
const char* what() const throw ()
{
return "Can't create a socket!";
}
};
struct data_size_exception : public std::exception
{
const char * what() const throw ()
const char* what() const throw ()
{
return "Data size is above the maximum allowed by the buffer";
}
};
class EasySocket {
public:
void socketListen(const std::string &channelName, int port, std::function<void (const std::string &data)> callback) {
void socketListen(const std::string& channelName, int port, std::function<void(const std::string& data)> callback) {

if (sockInit() != 0) {
throw masesk::socket_error_exception();
Expand Down Expand Up @@ -75,8 +75,8 @@ namespace masesk {
#endif
SOCKET clientSocket = accept(listening, (sockaddr*)&client, &clientSize);
server_sockets[channelName] = clientSocket;
char host[NI_MAXHOST];
char service[NI_MAXSERV];
char host[NI_MAXHOST];
char service[NI_MAXSERV];

memset(host, 0, NI_MAXHOST);
memset(service, 0, NI_MAXSERV);
Expand Down Expand Up @@ -110,29 +110,45 @@ namespace masesk {
else {
break;
}


}
sockClose(clientSocket);
sockQuit();
}

void socketSend(const std::string &channelName, const std::string &data) {
void socketSend(const std::string& channelName, const std::string& data) {
if (data.size() > BUFF_SIZE) {
throw masesk::data_size_exception();
}

if (client_sockets.find(channelName) != client_sockets.end()) {
SOCKET sock = client_sockets.at(channelName);
int sendResult = send(sock, data.c_str(), data.size() + 1, 0);
int sendResult = send(sock, data.c_str(), data.size(), 0); //if you get errors add + 1 to end of data.size()
if (sendResult == SOCKET_ERROR)
{
throw masesk::socket_error_exception();
}
}
}

void socketConnect(const std::string &channelName, const std::string &ip, std::uint16_t port) {
void socketRecv(const std::string& channelName, void* buffer, UINT len) {
if (len > BUFF_SIZE) {
throw masesk::data_size_exception();
}

if (client_sockets.find(channelName) != client_sockets.end()) {
SOCKET sock = client_sockets.at(channelName);
int recvResult = recv(sock, (char*)buffer, len, NULL);
if (recvResult == SOCKET_ERROR)
{
throw masesk::socket_error_exception();
}
}

}

void socketConnect(const std::string& channelName, const std::string& ip, std::uint16_t port) {
if (sockInit() != 0) {
throw masesk::socket_error_exception();
return;
Expand All @@ -155,9 +171,10 @@ namespace masesk {
throw socket_error_exception();
}
client_sockets[channelName] = sock;


}
void closeConnection(const std::string &channelName) {
void closeConnection(const std::string& channelName) {
if (client_sockets.find(channelName) != client_sockets.end()) {
SOCKET s = client_sockets.at(channelName);
sockClose(s);
Expand Down