raphael/ft_irc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I broke something with displaying the clients input plainly

Browse source
This commit is contained in:
ouafabulous 2025-05-21 21:52:20 +02:00
parent b2c5e0f5d7
commit bfe88daf3e
10 changed files with 292 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

96
sources/core/PollManager.cpp
View file

@ -10,72 +10,86 @@
PollManager::PollManager() {}
PollManager::~PollManager() {
for (size_t i = 0; i < _fds.size(); ++i) {
close(_fds[i].fd);
}
PollManager::~PollManager()
{
for (size_t i = 0; i < _fds.size(); ++i)
{
close(_fds[i].fd);
}
}
void PollManager::pollLoop(int server_fd) {
void PollManager::pollLoop(int server_fd, std::vector<int> &newClients, std::vector<int> &disconnected, std::vector<std::pair<int, std::string> > &readyClients)
{
struct pollfd server_pollfd;
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;
// while (true) {
int poll_count = poll(&_fds[0], _fds.size(), -1);
if (poll_count == -1)
{
std::cerr << "poll error\n"
<< std::endl;
return;
}
for (size_t i = 0; i < _fds.size(); ++i)
{
short unsigned 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);
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;
}
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;
}
addClient(client_fd);
newClients.push_back(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';
readyClients.push_back(std::make_pair(fd, std::string(buffer)));
}
else
{
removeClient(fd);
disconnected.push_back(fd);
--i;
}
}
}
// }
}
void PollManager::addClient(int fd) {
void PollManager::addClient(short unsigned fd)
{
struct pollfd pfd;
pfd.fd = fd;
pfd.events = POLLIN;
_fds.push_back(pfd);
_buffers[fd] = "";
std::cout << "Client connecté (fd " << fd << ")" << std::endl;
std::cout << "Client connected (fd " << fd << ")" << std::endl;
}
void PollManager::removeClient(int fd) {
for (size_t i = 0; i < _fds.size(); ++i) {
if (_fds[i].fd == fd) {
void PollManager::removeClient(short unsigned 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;
std::cout << "Client disconnected (fd " << fd << ")" << std::endl;
}

52
sources/core/Server.cpp
View file

@ -1,14 +1,14 @@
/* ************************************************************************** */
/******************************************************************************/
/* */
/* ::: :::::::: */
/* Server.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */
/* Updated: 2025/05/21 13:03:51 by rparodi ### ########.fr */
/* Updated: 2025/05/21 21:50:03 by omoudni ### ########.fr */
/* */
/* ************************************************************************** */
/******************************************************************************/
#include "color.hpp"
#include "server.hpp"
@ -37,6 +37,9 @@ Server::Server(int port, const std::string &password) : _port(port), _password(p
*/
Server::~Server() {
std::cout << CLR_GREY << "Info: Server destructor called" << CLR_RESET << std::endl;
if (_serverFd != -1) {
close(_serverFd);
}
}
@ -61,8 +64,47 @@ void Server::start() {
}
std::cout << "Serveur lancé sur le port " << _port << std::endl;
std::vector<int> newClients;
std::vector<int> disconnected;
std::vector<std::pair<int, std::string> > readyClients;
while (true)
{
newClients.clear();
disconnected.clear();
readyClients.clear();
_pollManager.pollLoop(_serverFd, newClients, disconnected, readyClients);
_pollManager.pollLoop(_serverFd);
// Handle new clients
for (size_t i = 0; i < newClients.size(); ++i)
_users[newClients[i]] = new User(newClients[i]);
// Handle disconnected clients
for (size_t i = 0; i < disconnected.size(); ++i)
{
delete _users[disconnected[i]];
_users.erase(disconnected[i]);
}
for (size_t i = 0; i < readyClients.size(); ++i)
{
int fd = readyClients[i].first;
const std::string &data = readyClients[i].second;
if (_users.count(fd))
{
_users[fd]->appendToReadBuffer(data);
//print users
std::cout << "User " << fd << " is registered: " << _users[fd]->isRegistered() << std::endl;
std::cout << "Received data from fd " << fd << ": " << data << std::endl;
std::string cmd;
while (!(cmd = _users[fd]->extractFullCommand()).empty())
{
// This prints every command/message received from any client
std::cout << "Client " << fd << " says: " << cmd << std::endl;
}
}
}
// Optionally: handle server shutdown, signals, etc.
}
close(_serverFd);
}

108
sources/core/user.cpp Normal file
View file

@ -0,0 +1,108 @@
/******************************************************************************/
/* */
/* ::: :::::::: */
/* user.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/21 20:37:12 by omoudni #+# #+# */
/* Updated: 2025/05/21 21:44:58 by omoudni ### ########.fr */
/* */
/******************************************************************************/
#include "core.hpp"
// Constructor
User::User(short unsigned int fd) : _fd(fd), _registered(false), _hasNick(false), _hasUser(false) {}
// Getter for fd
short unsigned int User::getFd() const
{
return _fd;
}
// Getter for nickname
std::string User::getNickname() const
{
return _nickname;
}
void User::setUsername(const std::string &username)
{
_username = username;
_hasUser = true;
checkRegistration();
}
// Setter for nickname (with basic checks)
void User::setNickname(const std::string &nickname)
{
if (nickname.empty())
{
throw std::invalid_argument("Nickname cannot be empty");
}
else if (nickname == "anonymous")
{
throw std::invalid_argument("Nickname cannot be 'anonymous'");
}
else if (nickname.length() > 9)
{
throw std::length_error("Nickname is too long");
}
else if (nickname == _nickname)
{
throw std::invalid_argument("The nickname is the same");
}
else
{
_nickname = nickname;
_hasNick = true;
checkRegistration();
}
}
// Registration state
bool User::isRegistered() const
{
return _registered;
}
// Append to read buffer
void User::appendToReadBuffer(const std::string &data)
{
_read_buffer += data;
}
// Append to write buffer
void User::appendToWriteBuffer(const std::string &data)
{
_write_buffer += data;
}
// Check registration
void User::checkRegistration()
{
if (!_registered && _hasNick && _hasUser)
{
_registered = true;
}
}
// Check if the user is ready to send
bool User::isReadyToSend() const
{
return !_write_buffer.empty();
}
// Extract full command from read buffer
std::string User::extractFullCommand()
{
std::string command;
size_t pos = _read_buffer.find("\r\n");
if (pos != std::string::npos)
{
command = _read_buffer.substr(0, pos);
_read_buffer.erase(0, pos + 2);
}
return command;
}