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

fix(cmd): now fixing the infinte loop on invalid message

Browse source
This commit is contained in:
Raphael 2025-06-03 16:58:14 +02:00
parent a955a426ba
commit 97103ac852
4 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -6,7 +6,7 @@
# By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ # # By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2025/05/02 15:40:00 by rparodi #+# #+# # # Created: 2025/05/02 15:40:00 by rparodi #+# #+# #
# Updated: 2025/06/02 01:18:57 by rparodi ### ########.fr # # Updated: 2025/06/03 16:50:01 by rparodi ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -32,6 +32,8 @@ SRC = sources/channel/channel.cpp \
sources/commands/notice.cpp \ sources/commands/notice.cpp \
sources/commands/part.cpp \ sources/commands/part.cpp \
sources/commands/pass.cpp \ sources/commands/pass.cpp \
sources/commands/ping.cpp \
sources/commands/pong.cpp \
sources/commands/privmsg.cpp \ sources/commands/privmsg.cpp \
sources/core/PollManager.cpp \ sources/core/PollManager.cpp \
sources/core/Server.cpp \ sources/core/Server.cpp \
@ -80,7 +82,7 @@ re: header fclean all
$(NAME): $(OBJ) $(NAME): $(OBJ)
@mkdir -p $(OBJDIRNAME) @mkdir -p $(OBJDIRNAME)
@printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n' @printf '$(GREY) Creating $(END)$(GREEN)$(OBJDIRNAME)$(END)\n'
@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJ) -fuse-ld=lld @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJ) #-fuse-ld=lld
# Creating the objects # Creating the objects
$(OBJDIRNAME)/%.o: %.cpp $(OBJDIRNAME)/%.o: %.cpp

16
sources/commands/commands.cpp
View file

@ -6,13 +6,14 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */ /* Created: 2025/05/24 16:11:56 by rparodi #+# #+# */
/* Updated: 2025/05/29 12:48:13 by rparodi ### ########.fr */ /* Updated: 2025/06/03 16:46:58 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "commands.hpp" #include "commands.hpp"
#include "logs.hpp" #include "logs.hpp"
#include "pass.hpp" #include "pass.hpp"
#include "ping.hpp"
/** /**
* @brief To send the line where a command is invoqued to execute * @brief To send the line where a command is invoqued to execute
@ -24,6 +25,8 @@
std::vector<std::string> cmd::split(const std::string &line) { std::vector<std::string> cmd::split(const std::string &line) {
std::vector<std::string> args; std::vector<std::string> args;
std::string arg; std::string arg;
if (line.empty())
return args;
size_t pos = line.find(' '); size_t pos = line.find(' ');
while (pos != std::string::npos) { while (pos != std::string::npos) {
arg = line.substr(0, pos); arg = line.substr(0, pos);
@ -47,7 +50,13 @@ std::vector<std::string> cmd::split(const std::string &line) {
* @param line input line from the user * @param line input line from the user
*/ */
void cmd::dispatch(::User *user, Channel *channel, Server *server, const std::string &line) { void cmd::dispatch(::User *user, Channel *channel, Server *server, const std::string &line) {
std::string command_name = cmd::split(line).at(0); DEBUG_MSG("in dispatch");
std::vector<std::string> args = cmd::split(line);
if (args.empty()) {
ERROR_MSG("Empty line");
return;
}
std::string command_name = args[0];
if (command_name.empty()) { if (command_name.empty()) {
WARNING_MSG("No command found in line: " << line); WARNING_MSG("No command found in line: " << line);
return; return;
@ -95,6 +104,9 @@ void cmd::dispatch(::User *user, Channel *channel, Server *server, const std::st
if (command_name == "pass") { if (command_name == "pass") {
Pass(user, channel, server, line).execute(); Pass(user, channel, server, line).execute();
} }
if (command_name == "ping") {
Ping(user, channel, server, line).execute();
}
// if (command_name == "part") { // if (command_name == "part") {
// Part(user, channel, server, line).execute(); // Part(user, channel, server, line).execute();
// } // }

2
sources/commands/pass.cpp
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */
/* Updated: 2025/06/02 22:41:12 by rparodi ### ########.fr */ /* Updated: 2025/06/03 15:04:10 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
sources/core/Server.cpp
View file

@ -6,12 +6,13 @@
/* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */ /* By: omoudni <omoudni@student.42paris.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */ /* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */
/* Updated: 2025/05/29 12:17:15 by rparodi ### ########.fr */ /* Updated: 2025/06/03 14:56:06 by rparodi ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
#include "color.hpp" #include "color.hpp"
#include "server.hpp" #include "server.hpp"
#include "commands.hpp"
#include "core.hpp" #include "core.hpp"
#include "PollManager.hpp" #include "PollManager.hpp"
#include "logs.hpp" #include "logs.hpp"
@ -107,6 +108,7 @@ void Server::start()
{ {
// This prints every command/message received from any client // This prints every command/message received from any client
std::cout << "Client " << fd << " says: " << cmd << std::endl; std::cout << "Client " << fd << " says: " << cmd << std::endl;
cmd::dispatch(_users[fd], NULL, this, cmd);
} }
} }
} }