Kinou/ft_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add commands files

Browse Source
This commit is contained in:
kinou-p 2023-02-12 13:29:48 +01:00
parent 2ae3844245
commit 9874d3d7e9
14 changed files with 208 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -6,7 +6,7 @@
# By: apommier <apommier@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/12/01 17:27:29 by apommier #+# #+# #
# Updated: 2023/02/11 10:41:15 by apommier ### ########.fr #
# Updated: 2023/02/11 20:18:32 by apommier ### ########.fr #
# #
# **************************************************************************** #
@ -18,15 +18,29 @@ SRCS := main.cpp\
client_request.cpp\
new_connection.cpp\
server_loop.cpp\
\
commands/cmd_utils.cpp\
commands/parse_commands.cpp\
\
commands/auth/nick.cpp\
commands/auth/pass.cpp\
commands/auth/user.cpp\
commands/auth/auth_utils.cpp\
\
commands/channel/channel_utils.cpp\
commands/channel/join.cpp\
commands/channel/privmsg.cpp\
\
commands/other/quit.cpp\
commands/other/squit.cpp\
\
commands/channel_op/invite.cpp\
commands/channel_op/kick.cpp\
commands/channel_op/mode.cpp\
commands/channel_op/topic.cpp\
\
commands/operator/oper.cpp\
\
commands/not_done_cmd.cpp #special (temporary)
CC = c++

2
includes/ft_irc.hpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/01 17:27:37 by apommier #+# #+# */
/* Updated: 2023/02/11 14:48:19 by apommier ### ########.fr */
/* Updated: 2023/02/11 22:49:29 by apommier ### ########.fr */
/* */
/* ************************************************************************** */

2
srcs/client_request.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/09 22:34:36 by apommier #+# #+# */
/* Updated: 2023/02/11 13:20:49 by apommier ### ########.fr */
/* Updated: 2023/02/11 23:53:10 by apommier ### ########.fr */
/* */
/* ************************************************************************** */

54
srcs/commands/auth/user.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/06 14:40:39 by apommier #+# #+# */
/* Updated: 2023/02/11 12:57:50 by apommier ### ########.fr */
/* Updated: 2023/02/11 22:44:06 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,34 +22,34 @@ void USER(std::string buffer, fdList &allFds, int userNbr)
(void)buffer;
(void)allFds;
(void)userNbr;
// if (allFds.userData[userNbr].registered == 1)
// {
// cmd_error(allFds, allFds.userData[userNbr].fd, "462 * USER :You may not reregister\n");
// return ;
// }
if (allFds.userData[userNbr].registered == 1)
{
cmd_error(allFds, allFds.userData[userNbr].fd, "462 * USER :You may not reregister\n");
return ;
}
// std::string realName = buffer.substr(buffer.find_first_of(":") + 1 , buffer.npos);
// std::vector<std::string> splitBuff;
std::string realName = buffer.substr(buffer.find_first_of(":") + 1 , buffer.npos);
std::vector<std::string> splitBuff;
// buffer.resize(buffer.size() - realName.size());
// std::cout << "Buffer in userNbr = ---" << buffer << "---" << std::endl;
// std::cout << "realname in userNbr = ---" << realName << "---" << std::endl;
// split(buffer, ' ', splitBuff);
// if (splitBuff.size() < 4)
// {
// cmd_error(allFds, allFds.userData[userNbr].fd, "461 * USER :Not enough parameters\n");
// //write(allFds.userData[userNbr].fd, "ERR_NEEDMOREPARAMS", 18);
// return ;
// }
// allFds.userData[userNbr].userName = splitBuff[1];
// allFds.userData[userNbr].hostName = splitBuff[2];
// allFds.userData[userNbr].serverName = splitBuff[3];
buffer.resize(buffer.size() - realName.size());
std::cout << "Buffer in userNbr = ---" << buffer << "---" << std::endl;
std::cout << "realname in userNbr = ---" << realName << "---" << std::endl;
split(buffer, ' ', splitBuff);
if (splitBuff.size() < 4)
{
cmd_error(allFds, allFds.userData[userNbr].fd, "461 * USER :Not enough parameters\n");
//write(allFds.userData[userNbr].fd, "ERR_NEEDMOREPARAMS", 18);
return ;
}
allFds.userData[userNbr].userName = splitBuff[1];
allFds.userData[userNbr].hostName = splitBuff[2];
allFds.userData[userNbr].serverName = splitBuff[3];
// allFds.userData[userNbr].realName = realName;
// if (!allFds.userData[userNbr].nickname.empty())
// {
// allFds.userData[userNbr].registered = 1;
// print_registered_msg(allFds, userNbr);
// }
allFds.userData[userNbr].realName = realName;
if (!allFds.userData[userNbr].nickname.empty())
{
allFds.userData[userNbr].registered = 1;
print_registered_msg(allFds, userNbr);
}
}

21
srcs/commands/channel_op/invite.cpp Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* invite.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:19:56 by apommier #+# #+# */
/* Updated: 2023/02/11 20:06:47 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void INVITE(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}

21
srcs/commands/channel_op/kick.cpp Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* kick.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:19:32 by apommier #+# #+# */
/* Updated: 2023/02/11 20:06:32 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void KICK(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}

21
srcs/commands/channel_op/mode.cpp Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* mode.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:19:30 by apommier #+# #+# */
/* Updated: 2023/02/11 20:05:40 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void MODE(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}

21
srcs/commands/channel_op/topic.cpp Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* topic.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:19:52 by apommier #+# #+# */
/* Updated: 2023/02/11 20:05:50 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void TOPIC(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}

63
srcs/commands/not_done_cmd.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/09 22:04:11 by apommier #+# #+# */
/* Updated: 2023/02/11 08:53:59 by apommier ### ########.fr */
/* Updated: 2023/02/11 20:06:45 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,29 +20,13 @@ void SERVER(std::string buffer, fdList &allFds, int userNbr)
return ;
}
void OPER(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
void QUIT(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
void SQUIT(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
// void OPER(std::string buffer, fdList &allFds, int userNbr)
// {
// (void)buffer;
// (void)allFds;
// (void)userNbr;
// return ;
// }
void PART(std::string buffer, fdList &allFds, int userNbr)
{
@ -52,21 +36,8 @@ void PART(std::string buffer, fdList &allFds, int userNbr)
return ;
}
void MODE(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
void TOPIC(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
void NAMES(std::string buffer, fdList &allFds, int userNbr)
{
@ -84,21 +55,9 @@ void LIST(std::string buffer, fdList &allFds, int userNbr)
return ;
}
void INVITE(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
void KICK(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}
void VERSION(std::string buffer, fdList &allFds, int userNbr)
{

24
srcs/commands/operator/oper.cpp Normal file
View File

@ -0,0 +1,24 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* oper.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:04:47 by apommier #+# #+# */
/* Updated: 2023/02/11 20:04:53 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void OPER(std::string buffer, fdList &allFds, int userNbr)
{
std::vector<std::string> splitBuff;
split(buffer, ' ', splitBuff);
if (splitBuff.size() < 2)
{
/*change error*/cmd_error(allFds, allFds.userData[userNbr].fd, "431 * OPER :No nickname given\n");
return ;
}
}

21
srcs/commands/other/quit.cpp Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* quit.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:10:26 by apommier #+# #+# */
/* Updated: 2023/02/11 19:10:44 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void QUIT(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}

21
srcs/commands/other/squit.cpp Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* squit.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/11 19:11:03 by apommier #+# #+# */
/* Updated: 2023/02/11 19:11:22 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../../includes/ft_irc.hpp"
void SQUIT(std::string buffer, fdList &allFds, int userNbr)
{
(void)buffer;
(void)allFds;
(void)userNbr;
return ;
}

2
srcs/commands/parse_commands.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 22:01:25 by apommier #+# #+# */
/* Updated: 2023/02/11 15:11:24 by apommier ### ########.fr */
/* Updated: 2023/02/11 22:51:59 by apommier ### ########.fr */
/* */
/* ************************************************************************** */

3
srcs/server_loop.cpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 21:58:13 by apommier #+# #+# */
/* Updated: 2023/02/11 14:06:49 by apommier ### ########.fr */
/* Updated: 2023/02/11 23:51:32 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,6 +24,7 @@ void start_loop(fdList &allFds)
std::cout << "serverFd: " << allFds.serverFd << std::endl;
while (alive)
{
std::cout << "loop" << std::endl;
//std::cout << "\n\n\nwhile alive event loop" << std::endl;
//std::cout << "in loop nbr user = " << allFds.nbrUser << std::endl;
eventNbr = epoll_wait(allFds.epollFd, allFds.events, MAX_EVENTS, 5000);