From 0c29c50e2354e57e5a959a63396d8e0e6cb4321c Mon Sep 17 00:00:00 2001
From: iherman- <200969603+iherman-p@users.noreply.github.com>
Date: Thu, 7 May 2026 13:01:57 +0200
Subject: [PATCH 1/3] Created a functional basic constructor for Server class

---
 Server/Server.cpp | 44 +++++++++++++++++++++++++++++++++++---------
 Server/Server.hpp | 16 +++++++++++++---
 main.cpp          |  3 ++-
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/Server/Server.cpp b/Server/Server.cpp
index 47b424a..7d954a1 100644
--- a/Server/Server.cpp
+++ b/Server/Server.cpp
@@ -6,36 +6,62 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:19:12 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/06 18:22:36 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 13:00:56 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "Server.hpp"
 
-Server::Server()
+const int	Server::kConnectionQueueLimit = 10;
+
+Server::Server() : 
+	port_(PORT_DEFAULT),
+	password_("")
 {
-	std::cout << "Hello from server" << std::endl;
+	// std::cout << "Hello from server" << std::endl;
 }
 
-Server::Server(int port, const std::string& password)
+Server::Server(int port, const std::string& password) :
+	port_(port),
+	password_(password)
 {
-	if (port < 1 || port > 65535)
+	if (port_ < 1 || port_ > 65535)
 		throw std::runtime_error("Invalid port");
 	
-	std::cout << "Server port: " << port << "\nServer Password: " << password << std::endl;
+	if (password_.empty())
+		throw std::runtime_error("Empty password");
+
+	serverSocket_ = socket(AF_INET, SOCK_STREAM, 0);
+	if (serverSocket_ < 0)
+		throw std::runtime_error("Failed to create socket");
+
+	struct sockaddr_in addr;
+	std::memset(&addr, 0, sizeof(addr));
+
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons(port_);
+	addr.sin_addr.s_addr = INADDR_ANY;
+
+	bind(serverSocket_, (struct sockaddr*)&addr, sizeof(addr));
+
+	std::cout << "Server port: " << port_
+		<< "\nServer Password: " << password_
+		<< std::endl;
 }
 
 Server::~Server()
 {
-	
+	close(serverSocket_);
 }
 
 Server	&Server::operator=(const Server& other)
 {
 	if (this != &other)
 	{
-		std::cout << "operator= called" << std::endl;
+		port_ = other.port_;
+		serverSocket_ = other.serverSocket_;
+		password_ = other.password_;
 	}
 
 	return *this;
-}
\ No newline at end of file
+}
diff --git a/Server/Server.hpp b/Server/Server.hpp
index ddb87fa..09e9749 100644
--- a/Server/Server.hpp
+++ b/Server/Server.hpp
@@ -6,7 +6,7 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:18:11 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/06 17:41:04 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 13:00:39 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,14 +33,22 @@
 #include <poll.h>
 
 // C++ lib functions
-#include <iostream>
+# include <iostream>
 
 # include <string>
-# include <sstream>
+# include <cstring>
+
+# define PORT_DEFAULT 9898
 
 class Server
 {
 	private:
+		static const  int	kConnectionQueueLimit;
+
+		int	port_;
+		int	serverSocket_;
+
+		std::string	password_;
 
 	public:
 		Server();
@@ -48,6 +56,8 @@ class Server
 		~Server();
 
 		Server	&operator=(const Server& other);
+
+		void	run();
 };
 
 #endif // SERVER_HPP
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 8a2144d..077974f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,11 +6,12 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:57:53 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/06 17:57:58 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 12:44:36 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "Server/Server.hpp"
+#include <sstream>
 
 int	get_port(const char* arg)
 {

From 4beabead01e0308c63ac2bcd6f136b2ea4eb7be0 Mon Sep 17 00:00:00 2001
From: iherman- <200969603+iherman-p@users.noreply.github.com>
Date: Thu, 7 May 2026 13:52:42 +0200
Subject: [PATCH 2/3] Added a basic Server::run function which listens for one
 connection and sends the data back, added listen call to server constructor

---
 Server/Server.cpp | 31 +++++++++++++++++++++++++++++--
 Server/Server.hpp |  2 +-
 main.cpp          |  5 ++---
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/Server/Server.cpp b/Server/Server.cpp
index 7d954a1..39eecc9 100644
--- a/Server/Server.cpp
+++ b/Server/Server.cpp
@@ -6,7 +6,7 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:19:12 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/07 13:00:56 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 13:49:56 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -42,7 +42,11 @@ Server::Server(int port, const std::string& password) :
 	addr.sin_port = htons(port_);
 	addr.sin_addr.s_addr = INADDR_ANY;
 
-	bind(serverSocket_, (struct sockaddr*)&addr, sizeof(addr));
+	if (bind(serverSocket_, (struct sockaddr*)&addr, sizeof(addr)))
+		throw std::runtime_error("Failed to bind");
+
+	if (listen(serverSocket_, kConnectionQueueLimit))
+		throw std::runtime_error("Failed to listen");
 
 	std::cout << "Server port: " << port_
 		<< "\nServer Password: " << password_
@@ -65,3 +69,26 @@ Server	&Server::operator=(const Server& other)
 
 	return *this;
 }
+
+void	Server::run()
+{
+	const std::size_t	kBufferSize = 1024;
+	char				buffer[kBufferSize] = {0};
+
+	struct sockaddr_in	client_addr;
+	socklen_t			client_addr_size = 0;
+	int					clientSocket = accept(serverSocket_, (struct sockaddr*)&client_addr, &client_addr_size);
+
+	std::size_t	recv_amount = 0;
+	while (true)
+	{
+		recv_amount += recv(clientSocket, buffer, kBufferSize, 0);
+		if (buffer[recv_amount - 1] == '\n')
+			break ;
+	}
+
+	std::string to_send(buffer);
+	to_send = "Server received: " + to_send;
+	send(clientSocket, to_send.c_str(), to_send.size(), 0);
+	close(clientSocket);
+}
\ No newline at end of file
diff --git a/Server/Server.hpp b/Server/Server.hpp
index 09e9749..05760c6 100644
--- a/Server/Server.hpp
+++ b/Server/Server.hpp
@@ -6,7 +6,7 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:18:11 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/07 13:00:39 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 13:29:00 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/main.cpp b/main.cpp
index 077974f..015361c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,7 +6,7 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:57:53 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/07 12:44:36 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 13:28:09 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -39,12 +39,11 @@ int main(int argc, char *argv[])
 	{
 		int		port = get_port(argv[1]);
 		Server	server(port, argv[2]);
+		server.run();
 	}
 	catch (std::exception& e)
 	{
 		std::cerr << e.what() << std::endl;
 		return 1;
 	}
-
-	// run server
 }
\ No newline at end of file

From 752eb89e72c79d4e521dbdd727e3676319a0fe1c Mon Sep 17 00:00:00 2001
From: iherman- <200969603+iherman-p@users.noreply.github.com>
Date: Thu, 7 May 2026 14:18:52 +0200
Subject: [PATCH 3/3] Improved Server::run to now properly handle multiple
 packets

---
 Server/Server.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Server/Server.cpp b/Server/Server.cpp
index 39eecc9..9f982cb 100644
--- a/Server/Server.cpp
+++ b/Server/Server.cpp
@@ -6,7 +6,7 @@
 /*   By: iherman- <iherman-@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/05/06 17:19:12 by iherman-          #+#    #+#             */
-/*   Updated: 2026/05/07 13:49:56 by iherman-         ###   ########.fr       */
+/*   Updated: 2026/05/07 14:08:48 by iherman-         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -76,19 +76,24 @@ void	Server::run()
 	char				buffer[kBufferSize] = {0};
 
 	struct sockaddr_in	client_addr;
-	socklen_t			client_addr_size = 0;
+	socklen_t			client_addr_size = sizeof(client_addr);
 	int					clientSocket = accept(serverSocket_, (struct sockaddr*)&client_addr, &client_addr_size);
 
-	std::size_t	recv_amount = 0;
+	std::string	message;
 	while (true)
 	{
-		recv_amount += recv(clientSocket, buffer, kBufferSize, 0);
-		if (buffer[recv_amount - 1] == '\n')
+		int recv_amount = recv(clientSocket, buffer, kBufferSize, 0);
+	
+		if (recv_amount <= 0)
+			break ;
+
+		message.append(buffer, recv_amount);
+
+		if (message.find('\n') != std::string::npos)
 			break ;
 	}
 
-	std::string to_send(buffer);
-	to_send = "Server received: " + to_send;
-	send(clientSocket, to_send.c_str(), to_send.size(), 0);
+	message = "Server received: " +  message;
+	send(clientSocket, message.c_str(), message.size(), 0);
 	close(clientSocket);
 }
\ No newline at end of file