diff --git a/Makefile b/Makefile index 23cad93..475eeeb 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ # ::: :::::::: # # Makefile :+: :+: :+: # # +:+ +:+ +:+ # -# By: omoudni +#+ +:+ +#+ # +# By: sben-tay +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/05/02 15:40:00 by rparodi #+# #+# # -# Updated: 2025/05/19 15:13:05 by omoudni ### ########.fr # +# Updated: 2025/05/20 00:09:16 by sben-tay ### ########.fr # # # # **************************************************************************** # @@ -25,9 +25,10 @@ SESSION = test-irc # Sources SRC = sources/core/main.cpp \ - sources/core/server.cpp \ + sources/core/Server.cpp \ sources/core/check.cpp \ sources/core/parser.cpp \ + sources/core/PollManager.cpp \ INC_DIR = include/core \ diff --git a/diagram.puml b/diagram.puml index 4621615..2f89a8b 100644 --- a/diagram.puml +++ b/diagram.puml @@ -1,98 +1,154 @@ -@startuml +@startuml "IRC Server - Detailed UML" ' ======================== -' CLASS: Server +' ENTRY: main() +' ======================== +class "main()" + +' ======================== +' CLASS: Server ' ======================== class Server { - _port : int - _password : string - - _clients : List - _server_fd : int + - _poll : PollManager - + showInfo() : void - + getPort() : int + + Server(port : int, password : string) + start() : void + + getPort() : int + + showInfo() : void +} + +' ============================ +' CLASS: PollManager +' ============================ +class PollManager { + - _fds : vector + - _users : map + + + addUser(fd : int) : void + + removeUser(fd : int) : void + + updateUser(fd : int, events : short) : void + + pollLoop(server_fd : int) : void + + readFromUser(fd : int) : void + + writeToUser(fd : int) : void } ' ======================== -' CLASS: Client +' CLASS: User ' ======================== -class Client { - - _id : int - - _name : string +class User { + - _fd : int + - _nickname : string + - _username : string + - _hostname : string + - _readBuffer : string + - _writeBuffer : string - _registered : bool - - _channels : List - - _banned : List - + getId() : int - + getName() : string + + getFd() : int + + getNickname() : string + + setNickname(name : string) : void + + appendToReadBuffer(data : string) : void + + appendToWriteBuffer(data : string) : void + + extractFullCommand() : string + + isReadyToSend() : bool + isRegistered() : bool - + joinChannel(channel : Channel) : void - + leaveChannel(channel : Channel) : void - + sendMessage(to : Client, message : string) : void } ' ======================== -' CLASS: Channel +' CLASS: Channel ' ======================== class Channel { - _name : string - _password : string - - _owner : Client - - _operators : List - - _socket_id : int + - _owner : User + - _operators : List - _topic : string + getName() : string + setTopic(newTopic : string) : void - + addOperator(client : Client) : void - + removeOperator(client : Client) : void + + addOperator(user : User) : void + + removeOperator(user : User) : void + + isOperator(user : User) : bool } -' ======================== -' CLASS: Commandes -' ======================== -class Commandes { - - _form_user : Client - - _to_user : Client - - _channel : Channel - - + MODE() : void - + KICK() : void - + INVITE() : void - + TOPIC() : void - + JOIN() : void - + PRIVMSG() : void - + LIST() : void - + PASS() : void - + NICK() : void - + USERNAME() : void +' ==================================== +' NAMESPACE: CommandDispatcher (static) +' ==================================== +package "CommandDispatcher" <> { + class CommandDispatcher { + + dispatchCommand(user : User, line : string) : void + + splitCommand(line : string) : vector + } } -' ======================== -' CLASS: Parser -' ======================== -class Parser { - - _port : int - - _password : string - - _valid : bool - - _errorMsg : string - - + Parser(argc : int, argv : char**) - + isValid() : bool - + getPort() : int - + getPassword() : string - + getErrorMsg() : string +' ============================= +' NAMESPACE: Command +' ============================= +package "Command" <> { + class PASS { + + execute(user : User, args : vector) : void + } + class NICK { + + execute(user : User, args : vector) : void + } + class USER { + + execute(user : User, args : vector) : void + } + class JOIN { + + execute(user : User, args : vector) : void + } + class PART { + + execute(user : User, args : vector) : void + } + class PRIVMSG { + + execute(user : User, args : vector) : void + } + class NOTICE { + + execute(user : User, args : vector) : void + } + class PING { + + execute(user : User, args : vector) : void + } + class PONG { + + execute(user : User, args : vector) : void + } + class QUIT { + + execute(user : User, args : vector) : void + } + class TOPIC { + + execute(user : User, args : vector) : void + } + class MODE { + + execute(user : User, args : vector) : void + } + class INVITE { + + execute(user : User, args : vector) : void + } + class KICK { + + execute(user : User, args : vector) : void + } + class LIST { + + execute(user : User, args : vector) : void + } + class UNKNOWN { + + execute(user : User, args : vector) : void + } } ' ======================== ' RELATIONS ' ======================== - -Server "1" o-- "*" Client : _clients -Client "1" o-- "*" Channel : _channels -Channel "1" *-- "1" Client : _owner -Channel "1" o-- "*" Client : _operators -main ..> Parser : uses +"main()" --> Server : creates +Server "1" *-- "1" PollManager : _poll +PollManager "1" o-- "*" User : _users +User "1" o-- "*" Channel : _channels +Channel "1" *-- "1" User : _owner +Channel "1" o-- "*" User : _operators +PollManager --> CommandDispatcher.CommandDispatcher : calls +CommandDispatcher.CommandDispatcher --> Command : dispatches +CommandDispatcher.CommandDispatcher --> User : parses commands @enduml \ No newline at end of file diff --git a/include/core/PollManager.hpp b/include/core/PollManager.hpp new file mode 100644 index 0000000..8939e02 --- /dev/null +++ b/include/core/PollManager.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include +#include +#include + +class PollManager { +public: + PollManager(); + ~PollManager(); + + void addClient(int fd); + void removeClient(int fd); + void updateServer(int fd); + void pollLoop(int server_fd); + +private: + + std::vector _fds; + std::map _buffers; + +}; diff --git a/include/core/server.hpp b/include/core/server.hpp index e29640d..c1fa9ae 100644 --- a/include/core/server.hpp +++ b/include/core/server.hpp @@ -3,28 +3,33 @@ /* ::: :::::::: */ /* server.hpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: omoudni +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/13 11:06:56 by rparodi #+# #+# */ -/* Updated: 2025/05/14 23:23:13 by omoudni ### ########.fr */ +/* Updated: 2025/05/19 23:46:07 by sben-tay ### ########.fr */ /* */ /* ************************************************************************** */ #pragma once #include +#include "PollManager.hpp" class Server { - private: - unsigned short int _port; - std::string _password; - int server_fd; - public: - Server(); - Server(int port, const std::string &password); - ~Server(); - void showInfo() const; - unsigned short int getPort() const; - void setServerFd(int fd); - void start(); +public: + Server(); + Server(int port, const std::string &password); + ~Server(); + + unsigned short int getPort() const; + void showInfo() const; + void setServerFd(int fd); + void start(); + +private: + unsigned short int _port; + int _serverFd; + std::string _password; + PollManager _poll; }; + diff --git a/sources/core/PollManager.cpp b/sources/core/PollManager.cpp new file mode 100644 index 0000000..5331876 --- /dev/null +++ b/sources/core/PollManager.cpp @@ -0,0 +1,80 @@ +#include "PollManager.hpp" +#include +#include +#include +#include +#include +#include +#include + +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; +} diff --git a/sources/core/server.cpp b/sources/core/Server.cpp similarity index 61% rename from sources/core/server.cpp rename to sources/core/Server.cpp index a43d6df..e556db3 100644 --- a/sources/core/server.cpp +++ b/sources/core/Server.cpp @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* server.cpp :+: :+: :+: */ +/* Server.cpp :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: omoudni +#+ +:+ +#+ */ +/* By: sben-tay +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 #include #include +#include +#include + /** * @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; -} - -