4 files changed, 20 insertions, 18 deletions

diff --git a/src/server.cpp b/src/server.cpp
index 9b5dae0..db92481 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1,27 +1,28 @@
 #include "server.hpp"
 #include "log.hpp"
 #include <cstring>
+#include <memory>
 #include <sys/socket.h>
 
 CServer::CServer(uint16_t port)
-	: m_sockfd(CFileDescriptor{socket(AF_INET, SOCK_STREAM, 0)}) {
-	if (!m_sockfd.isValid())
+	: m_sockfd(std::make_shared<CFileDescriptor>(socket(AF_INET, SOCK_STREAM, 0))) {
+	if (!m_sockfd->isValid())
 		throw std::runtime_error("Failed to create socket");
 
 	constexpr int opt  = 1;
 	constexpr int size = sizeof(opt);
-	if (setsockopt(m_sockfd.get(), SOL_SOCKET, SO_REUSEADDR, &opt, size) < 0)
+	if (setsockopt(m_sockfd->get(), SOL_SOCKET, SO_REUSEADDR, &opt, size) < 0)
 		log(stderr, WARN, "setsockopt(SO_REUSEADDR) failed");
 
-	if (setsockopt(m_sockfd.get(), SOL_SOCKET, SO_KEEPALIVE, &opt, size) < 0)
+	if (setsockopt(m_sockfd->get(), SOL_SOCKET, SO_KEEPALIVE, &opt, size) < 0)
 		log(stderr, WARN, "setsockopt(SO_KEEPALIVE) failed");
 
 	memset(&m_addr, 0, sizeof(m_addr));
 	m_addr.sin_family	   = AF_INET;
 	m_addr.sin_port		   = htons(port);
 	m_addr.sin_addr.s_addr = INADDR_ANY;
-	bind(m_sockfd.get(), reinterpret_cast<sockaddr *>(&m_addr), sizeof(m_addr)) ||
-			listen(m_sockfd.get(), 5)
+	bind(m_sockfd->get(), reinterpret_cast<sockaddr *>(&m_addr), sizeof(m_addr)) ||
+			listen(m_sockfd->get(), 5)
 		? throw std::runtime_error("Failed to bind or listen")
 		: log(LOG, "Server started on port: {}", port);
 
@@ -33,6 +34,6 @@ CServer::~CServer() {
 	log(SYS, "Server: bye");
 }
 
-const CFileDescriptor *CServer::getSocket() const {
-	return &m_sockfd;
+std::shared_ptr<CFileDescriptor> CServer::getSocket() const {
+	return m_sockfd;
 }
diff --git a/src/server.hpp b/src/server.hpp
index 5d12c97..ce375de 100644
--- a/src/server.hpp
+++ b/src/server.hpp
@@ -8,11 +8,11 @@ class CServer {
   public:
 	CServer(uint16_t port);
 	~CServer();
-	const CFileDescriptor *getSocket() const;
+	std::shared_ptr<CFileDescriptor> getSocket() const;
 
   private:
-	CFileDescriptor m_sockfd;
-	sockaddr_in		m_addr;
+	std::shared_ptr<CFileDescriptor> m_sockfd;
+	sockaddr_in						 m_addr;
 
 	mutable std::mutex m_mutex;
 };
diff --git a/src/session.cpp b/src/session.cpp
index 1259dbe..5434be6 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -9,12 +9,13 @@
 #include <arpa/inet.h>
 #include <cerrno>
 #include <cstring>
+#include <memory>
 #include <sys/socket.h>
 
 CSession::CSession() {
-	m_sockfd = CFileDescriptor{accept(g_pServer->getSocket()->get(), reinterpret_cast<sockaddr *>(&m_addr), &m_addrLen)}; // if this is in the init list, it will run before m_addrLen, so it won't work :/
+	m_sockfd = std::make_shared<CFileDescriptor>(accept(g_pServer->getSocket()->get(), reinterpret_cast<sockaddr *>(&m_addr), &m_addrLen)); // if this is in the init list, it will run before m_addrLen, so it won't work :/
 
-	if (!m_sockfd.isValid())
+	if (!m_sockfd->isValid())
 		throw std::runtime_error("session: Failed to create socket");
 
 	m_ip.resize(INET_ADDRSTRLEN);
@@ -114,7 +115,7 @@ std::unique_ptr<CSession::SRecvData> CSession::read() {
 	auto recvData = std::make_unique<SRecvData>();
 
 	recvData->data.resize(recvData->size);
-	ssize_t size = recv(m_sockfd.get(), &recvData->data[0], recvData->size, 0);
+	ssize_t size = recv(m_sockfd->get(), &recvData->data[0], recvData->size, 0);
 
 	if (size < 0) {
 		recvData->good = false;
@@ -204,12 +205,12 @@ bool CSession::registerSession() {
 }
 
 bool CSession::isValid() {
-	if (!m_sockfd.isValid() || m_name.empty())
+	if (!m_sockfd->isValid() || m_name.empty())
 		return false;
 
 	int		  err  = 0;
 	socklen_t size = sizeof(err);
-	return getsockopt(m_sockfd.get(), SOL_SOCKET, SO_ERROR, &err, &size) >= 0 && err == 0;
+	return getsockopt(m_sockfd->get(), SOL_SOCKET, SO_ERROR, &err, &size) >= 0 && err == 0;
 }
 
 template <typename... Args>
@@ -230,7 +231,7 @@ bool CSession::write(eFormatType type, std::format_string<Args...> fmt, Args &&.
 		msg.append(*m_szReading);
 	}
 
-	if (send(m_sockfd.get(), msg.c_str(), msg.size(), 0) < 0) {
+	if (send(m_sockfd->get(), msg.c_str(), msg.size(), 0) < 0) {
 		onErrno(WRITE);
 		return false;
 	}
diff --git a/src/session.hpp b/src/session.hpp
index 2558774..af5d9ee 100644
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -57,7 +57,7 @@ class CSession {
 	};
 
 	std::pair<std::jthread, std::shared_ptr<CSession>> *self;
-	CFileDescriptor										m_sockfd;
+	std::shared_ptr<CFileDescriptor>					m_sockfd;
 	sockaddr_in											m_addr;
 	socklen_t											m_addrLen = sizeof(m_addr);
 	std::string											m_name;