jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whitespace and pointer cleanup.

Browse source
This commit is contained in:
jmsgrogan 2021-03-29 21:31:24 +01:00
parent 6fc0b8dca8
commit a03eb9599f
32 changed files with 441 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/network/sockets/UnixSocketInterface.cpp
View file

@ -1,86 +1,82 @@
#include "UnixSocketInterface.h"
#include "HttpResponse.h"
#include <iostream>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include "HttpResponse.h"
UnixSocketInterface::UnixSocketInterface()
: mOpeningHandles(),
mBufferSize(1024)
: mBufferSize(1024)
{
}
UnixSocketInterface::~UnixSocketInterface()
std::unique_ptr<UnixSocketInterface> UnixSocketInterface::Create()
{
return std::make_unique<UnixSocketInterface>();
}
std::shared_ptr<UnixSocketInterface> UnixSocketInterface::Create()
void UnixSocketInterface::InitializeSocket(const SocketPtr& socketPtr)
{
return std::make_shared<UnixSocketInterface>();
auto handle = socket(AF_INET, SOCK_STREAM, 0);
socketPtr->SetHandle(handle);
}
void UnixSocketInterface::CreateSocket(SocketPtr socketPtr)
void UnixSocketInterface::Listen(const SocketPtr& socket)
{
mOpeningHandles[socketPtr] = socket(AF_INET, SOCK_STREAM, 0);
}
void UnixSocketInterface::Listen(SocketPtr socket)
{
if(mOpeningHandles[socket] < 0)
if(socket->GetHandle() < 0)
{
std::cerr << "Error opening socket" << std::endl;
return;
std::cerr << "Error opening socket" << std::endl;
return;
}
int port = static_cast<int>(socket->GetPort());
int port = static_cast<int>(socket->GetPort());
struct sockaddr_in serv_addr;
memset(&serv_addr, 0, sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = INADDR_ANY;
serv_addr.sin_port = htons(port);
int result = bind(mOpeningHandles[socket], (struct sockaddr *)&serv_addr, sizeof(serv_addr));
int result = bind(socket->GetHandle(), (struct sockaddr *)&serv_addr, sizeof(serv_addr));
if(result< 0)
{
std::cerr << "Error binding socket" << std::endl;
return;
std::cerr << "Error binding socket" << std::endl;
return;
}
listen(mOpeningHandles[socket], 5);
listen(socket->GetHandle(), 5);
}
void UnixSocketInterface::Run(SocketPtr socket)
void UnixSocketInterface::Run(const SocketPtr& socket)
{
if(mOpeningHandles[socket] < 0)
if(socket->GetHandle() < 0)
{
std::cerr << "Error opening socket" << std::endl;
return;
std::cerr << "Error opening socket" << std::endl;
return;
}
struct sockaddr_in cli_addr;
socklen_t clilen = sizeof(cli_addr);
while(true)
{
SocketHandle new_socket_handle = accept(mOpeningHandles[socket],
(struct sockaddr *) &cli_addr, &clilen);
auto new_socket_handle = accept(socket->GetHandle(),
(struct sockaddr *) &cli_addr, &clilen);
if (new_socket_handle < 0)
{
std::cerr << "Error on accept" << std::endl;
return;
std::cerr << "Error on accept" << std::endl;
return;
}
char buffer[mBufferSize] = {0};
int n = read(new_socket_handle, buffer, mBufferSize);
if (n < 0)
{
std::cerr << "Error on read" << std::endl;
return;
std::cerr << "Error on read" << std::endl;
return;
}
socket->SetMessage(buffer);
std::cout << "Here is the message: " << buffer << std::endl;
@ -88,12 +84,12 @@ void UnixSocketInterface::Run(SocketPtr socket)
HttpResponse response;
response.SetBody("Hello world!");
std::string response_message = response.ToString();
auto response_message = response.ToString();
n = write(new_socket_handle, response_message.c_str(), response_message.length());
if (n < 0)
{
std::cerr << "Error on write" << std::endl;
return;
std::cerr << "Error on write" << std::endl;
return;
}
close(new_socket_handle);
}