nickorlow/anthracite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

polished up event loop changes
Some checks failed
Docker Build & Publish / build (push) Failing after 55m49s
Details

Browse source
This commit is contained in:
Nicholas Orlowsky 2025-02-21 18:24:28 -05:00
parent 058c395095
commit 409024e04a
18 changed files with 354 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/socket/openssl_socket.cpp
View file

@ -1,18 +1,18 @@
#include <exception>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "./openssl_socket.hpp"
#include "../log/log.hpp"
#include <arpa/inet.h>
#include <array>
#include <exception>
#include <iostream>
#include <malloc.h>
#include <netinet/in.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <string>
#include <sys/socket.h>
#include <sys/time.h>
#include <unistd.h>
#include <vector>
#include <iostream>
#include "../log/log.hpp"
namespace anthracite::socket {
@ -21,7 +21,7 @@ SSL_CTX* openssl_socket::_context = nullptr;
openssl_socket::openssl_socket(int port, int max_queue)
: anthracite_socket(port, max_queue)
{
const SSL_METHOD *method = TLS_server_method();
const SSL_METHOD* method = TLS_server_method();
if (_context == nullptr) {
_context = SSL_CTX_new(method);
@ -37,7 +37,7 @@ openssl_socket::openssl_socket(int port, int max_queue)
throw std::exception();
}
if (SSL_CTX_use_PrivateKey_file(_context, "key.pem", SSL_FILETYPE_PEM) <= 0 ) {
if (SSL_CTX_use_PrivateKey_file(_context, "key.pem", SSL_FILETYPE_PEM) <= 0) {
log::err << "Unable to open key.pem" << std::endl;
throw std::exception();
}
@ -48,11 +48,11 @@ openssl_socket::~openssl_socket() = default;
bool openssl_socket::wait_for_conn()
{
client_ip = "";
struct timeval tv = {.tv_sec = 1, .tv_usec = 0};
struct timeval tv = { .tv_sec = 1, .tv_usec = 0 };
fd_set read_fd;
FD_ZERO(&read_fd);
FD_SET(server_socket, &read_fd);
if (select(server_socket+1, &read_fd, NULL, NULL, &wait_timeout)) {
if (select(server_socket + 1, &read_fd, NULL, NULL, &wait_timeout)) {
client_socket = accept(server_socket, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_len);
std::array<char, INET_ADDRSTRLEN> ip_str { 0 };
inet_ntop(AF_INET, &client_addr.sin_addr, ip_str.data(), INET_ADDRSTRLEN);
@ -70,8 +70,6 @@ bool openssl_socket::wait_for_conn()
} else {
return false;
}
}
void openssl_socket::close_conn()
@ -98,7 +96,7 @@ std::string openssl_socket::recv_message(int buffer_size)
setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &timeout_tv, sizeof timeout_tv);
std::vector<char> response(buffer_size + 1);
ssize_t result = SSL_read(_ssl, response.data(), buffer_size+1);
ssize_t result = SSL_read(_ssl, response.data(), buffer_size + 1);
if (result < 1) {
return "";

6
lib/socket/socket.cpp
View file

@ -11,7 +11,7 @@
namespace anthracite::socket {
const struct timeval anthracite_socket::timeout_tv = { .tv_sec = 5, .tv_usec = 0};
const struct timeval anthracite_socket::timeout_tv = { .tv_sec = 5, .tv_usec = 0 };
anthracite_socket::anthracite_socket(int port, int max_queue)
: server_socket(::socket(AF_INET, SOCK_STREAM, 0))
@ -32,11 +32,11 @@ anthracite_socket::anthracite_socket(int port, int max_queue)
bool anthracite_socket::wait_for_conn()
{
client_ip = "";
struct timeval tv = {.tv_sec = 1, .tv_usec = 0};
struct timeval tv = { .tv_sec = 1, .tv_usec = 0 };
fd_set read_fd;
FD_ZERO(&read_fd);
FD_SET(server_socket, &read_fd);
if (select(server_socket+1, &read_fd, NULL, NULL, &wait_timeout)) {
if (select(server_socket + 1, &read_fd, NULL, NULL, &wait_timeout)) {
client_socket = accept(server_socket, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_len);
std::array<char, INET_ADDRSTRLEN> ip_str { 0 };
inet_ntop(AF_INET, &client_addr.sin_addr, ip_str.data(), INET_ADDRSTRLEN);

2
lib/socket/socket.hpp
View file

@ -32,6 +32,8 @@ public:
virtual void close_conn();
virtual void send_message(std::string& msg);
virtual std::string recv_message(int buffer_size);
int csock() { return client_socket; }
};
};