From 56fde134e06a76306f5387e56a387cb0c603f337 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Tue, 30 Jan 2024 16:51:19 +0100 Subject: [PATCH] pipi --- srcs/main.cpp | 2 +- srcs/server.cpp | 7 +++++-- srcs/server_functions.cpp | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/srcs/main.cpp b/srcs/main.cpp index e7ff0d8..ff08980 100644 --- a/srcs/main.cpp +++ b/srcs/main.cpp @@ -6,7 +6,7 @@ /* By: vvaas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/20 09:27:04 by maldavid #+# #+# */ -/* Updated: 2024/01/30 00:43:49 by maldavid ### ########.fr */ +/* Updated: 2024/01/30 16:46:49 by maldavid ### ########.fr */ /* */ /******************************************************************************/ diff --git a/srcs/server.cpp b/srcs/server.cpp index 09231a4..0c5c90d 100644 --- a/srcs/server.cpp +++ b/srcs/server.cpp @@ -6,7 +6,7 @@ /* By: vvaas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */ -/* Updated: 2024/01/30 02:41:02 by vvaas ### ########.fr */ +/* Updated: 2024/01/30 16:49:33 by maldavid ### ########.fr */ /* */ /******************************************************************************/ @@ -118,7 +118,10 @@ namespace irc tmp = select(MAX_USERS, &_fd_set, NULL, NULL, NULL); // SELECT blocks till a connection or message is received, and let only those in _fd_set if(tmp < 0 && _main_socket != NULL_SOCKET) - logs::report(log_fatal_error, "select fd error"); + { + logs::report(log_error, "select fd error"); + return; + } if(FD_ISSET(_main_socket, &_fd_set)) // if it's a new connection { diff --git a/srcs/server_functions.cpp b/srcs/server_functions.cpp index e121bb6..8b48cb3 100644 --- a/srcs/server_functions.cpp +++ b/srcs/server_functions.cpp @@ -6,7 +6,7 @@ /* By: vvaas +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */ -/* Updated: 2024/01/30 02:32:17 by vvaas ### ########.fr */ +/* Updated: 2024/01/30 16:37:16 by maldavid ### ########.fr */ /* */ /******************************************************************************/ @@ -194,7 +194,7 @@ namespace irc _channels.push_back(Channel(msg.getTokens()[1])); _channels.back().addClient(client, true); logs::report(log_message, "channel '%s' has been created", msg.getTokens()[1].c_str()); - return ; + return; } if((msg.getTokens().size() == 3 && msg.getTokens()[2] != it->getPassword()) || (msg.getTokens().size() == 2 && it->getPassword().size() > 0)) client->sendCode(ERR_BADCHANNELKEY, "Invalid password");