This commit is contained in:
Samy Ben Tayeb 2025-05-20 16:57:35 +02:00
parent 53a83308de
commit 005995fac2
6 changed files with 270 additions and 118 deletions

View file

@ -0,0 +1,80 @@
#include "PollManager.hpp"
#include <iostream>
#include <unistd.h>
#include <cstring>
#include <netinet/in.h>
#include <sys/socket.h>
#include <poll.h>
#include <cstdlib>
PollManager::PollManager() {}
PollManager::~PollManager() {
for (size_t i = 0; i < _fds.size(); ++i) {
close(_fds[i].fd);
}
}
void PollManager::pollLoop(int server_fd) {
struct pollfd server_pollfd;
server_pollfd.fd = server_fd;
server_pollfd.events = POLLIN;
_fds.push_back(server_pollfd);
std::cout << "Serveur prêt à accepter des connexions..." << std::endl;
while (true) {
int poll_count = poll(&_fds[0], _fds.size(), -1);
if (poll_count == -1) {
std::cerr << "poll error\n" << std::endl;
continue;
}
for (size_t i = 0; i < _fds.size(); ++i) {
int fd = _fds[i].fd;
if ((fd == server_fd) && (_fds[i].revents & POLLIN)) {
int client_fd = accept(server_fd, NULL, NULL);
if (client_fd == -1) {
std::cerr << "Error accept()" << std::endl;
continue;
}
addClient(client_fd);
}
else if (_fds[i].revents & POLLIN) {
char buffer[1024];
ssize_t bytes = recv(fd, buffer, sizeof(buffer) -1, 0);
if (bytes > 0) {
buffer[bytes] = '\0';
_buffers[fd] += buffer;
std::cout << "Client " << fd << " send : " << buffer;
} else {
std::cout << "Client " << fd << " disconected." << std::endl;
// removeClient(fd);
--i;
}
}
}
}
}
void PollManager::addClient(int fd) {
struct pollfd pfd;
pfd.fd = fd;
pfd.events = POLLIN;
_fds.push_back(pfd);
_buffers[fd] = "";
std::cout << "Client connecté (fd " << fd << ")" << std::endl;
}
void PollManager::removeClient(int fd) {
for (size_t i = 0; i < _fds.size(); ++i) {
if (_fds[i].fd == fd) {
_fds.erase(_fds.begin() + i);
break;
}
}
_buffers.erase(fd);
close(fd);
std::cout << "Client retiré (fd " << fd << ")" << std::endl;
}

View file

@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* server.cpp :+: :+: :+: */
/* Server.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: omoudni <omoudni@student.42.fr> +#+ +:+ +#+ */
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */
/* Updated: 2025/05/14 23:32:21 by omoudni ### ########.fr */
/* Updated: 2025/05/19 23:58:53 by sben-tay ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,6 +17,9 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <unistd.h>
#include <cstdlib>
#include <cstring>
/**
* @brief The default constructor of the Server class.
*/
@ -47,39 +50,29 @@ Server::~Server() {
void Server::start() {
int fd = socket(AF_INET, SOCK_STREAM, 0);
if (server_fd == -1) {
std::cerr << CLR_RED << "Error: Failed to create socket" << CLR_RESET << std::endl;
return;
}
setServerFd(fd);
struct sockaddr_in server_addr;
server_addr.sin_family = AF_INET;
server_addr.sin_addr.s_addr = INADDR_ANY;
server_addr.sin_port = htons(this->_port);
if (bind(server_fd, (struct sockaddr *)&server_addr, sizeof(server_addr)) == -1) {
std::cerr << CLR_RED << "Error: Failed to bind socket" << CLR_RESET << std::endl;
close(server_fd);
return;
}
if (listen(server_fd, 5) == -1) {
std::cerr << CLR_RED << "Error: Failed to listen on socket" << CLR_RESET << std::endl;
close(server_fd);
return;
}
std::cout << CLR_GREEN << "Server started on port " << this->_port << CLR_RESET << std::endl;
std::cout << CLR_GREEN << "Waiting for clients..." << CLR_RESET << std::endl;
while (true) {
int client_fd = accept(server_fd, NULL, NULL);
if (client_fd == -1) {
std::cerr << CLR_RED << "Error: Failed to accept client" << CLR_RESET << std::endl;
continue;
}
std::cout << CLR_GREEN << "Client connected" << CLR_RESET << std::endl;
close(client_fd);
}
close(server_fd);
std::cout << CLR_GREEN << "Server stopped" << CLR_RESET << std::endl;
_serverFd = socket(AF_INET, SOCK_STREAM, 0);
if (_serverFd == -1) {
std::cerr << "Erreur socket" << std::endl;
return;
}
sockaddr_in addr;
std::memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_port = htons(_port);
if (bind(_serverFd, (sockaddr*)&addr, sizeof(addr)) == -1 ||
listen(_serverFd, 10) == -1) {
std::cerr << "Erreur bind/listen" << std::endl;
close(_serverFd);
return;
}
std::cout << "Serveur lancé sur le port " << _port << std::endl;
_poll.pollLoop(_serverFd);
close(_serverFd);
}
/**
@ -106,8 +99,3 @@ unsigned short int Server::getPort() const {
return this->_port;
}
void Server::setServerFd(int fd) {
this->server_fd = fd;
}